aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorRemita Amine <remitamine@gmail.com>2016-07-13 17:39:56 +0100
committerRemita Amine <remitamine@gmail.com>2016-07-13 18:01:14 +0100
commit35ec86689c95fdded47ea65352392516951315c3 (patch)
tree70935fa51e3f3633d5f67402cbe90bcc6f01890c /youtube_dl
parentc485959034485f529985c0bea933951af3f4a63e (diff)
[bbc] extract only the original Unified Streaming Platform m3u8 manifests
https://github.com/rg3/youtube-dl/commit/0385aa6199206e4ba7745efec73be26c5826286a#commitcomment-18233275 manifests with higher birate require more time to check formats
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/bbc.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/youtube_dl/extractor/bbc.py b/youtube_dl/extractor/bbc.py
index 50c1da185..23c6e505b 100644
--- a/youtube_dl/extractor/bbc.py
+++ b/youtube_dl/extractor/bbc.py
@@ -44,8 +44,6 @@ class BBCCoUkIE(InfoExtractor):
_MEDIASELECTION_NS = 'http://bbc.co.uk/2008/mp/mediaselection'
_EMP_PLAYLIST_NS = 'http://bbc.co.uk/2008/emp/playlist'
- # Unified Streaming Platform
- _USP_RE = r'/([^/]+)\.ism(?:\.hlsv2\.ism)?/[^/]+\.m3u8'
_NAMESPACES = (
_MEDIASELECTION_NS,
@@ -246,15 +244,9 @@ class BBCCoUkIE(InfoExtractor):
elif transfer_format == 'dash':
pass
elif transfer_format == 'hls':
- is_unified_streaming = re.search(self._USP_RE, href)
- if is_unified_streaming:
- href = re.sub(self._USP_RE, r'/\1.ism/\1.m3u8', href)
- m3u8_formats = self._extract_m3u8_formats(
- href, programme_id, ext='mp4', entry_protocol='m3u8_native',
- m3u8_id=supplier, fatal=False)
- if is_unified_streaming:
- self._check_formats(m3u8_formats, programme_id)
- formats.extend(m3u8_formats)
+ formats.extend(self._extract_m3u8_formats(
+ href, programme_id, 'mp4', 'm3u8_native',
+ m3u8_id=supplier, fatal=False))
# Direct link
else:
formats.append({