aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2016-05-26 21:57:06 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2016-05-26 21:57:06 +0800
commit761052db922a525d6ccaf250f9914841c9d3d66f (patch)
tree1bdba06f2168d5375f06f0269346c40559f2b077 /youtube_dl/extractor
parent240b60453e1237473dfd8deff40c9dc54661668c (diff)
[playwire] Add the test (closed #9531)
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/playwire.py14
1 files changed, 13 insertions, 1 deletions
diff --git a/youtube_dl/extractor/playwire.py b/youtube_dl/extractor/playwire.py
index 7580e4a85..2ee5c5aa3 100644
--- a/youtube_dl/extractor/playwire.py
+++ b/youtube_dl/extractor/playwire.py
@@ -22,6 +22,18 @@ class PlaywireIE(InfoExtractor):
'duration': 145.94,
},
}, {
+ # m3u8 in f4m
+ 'url': 'http://config.playwire.com/21772/videos/v2/4840492/zeus.json',
+ 'info_dict': {
+ 'id': '4840492',
+ 'ext': 'mp4',
+ 'title': 'ITV EL SHOW FULL',
+ },
+ 'params': {
+ # m3u8 download
+ 'skip_download': True,
+ },
+ }, {
# Multiple resolutions while bitrates missing
'url': 'http://cdn.playwire.com/11625/embed/85228.html',
'only_matching': True,
@@ -48,7 +60,7 @@ class PlaywireIE(InfoExtractor):
thumbnail = content.get('poster')
src = content['media']['f4m']
- formats = self._extract_f4m_formats(src, video_id, assume_f4mv2=True)
+ formats = self._extract_f4m_formats(src, video_id, assume_f4mv2=True, m3u8_id='hls')
for a_format in formats:
if not dict_get(a_format, ['tbr', 'width', 'height']):
a_format['quality'] = 1 if '-hd.' in a_format['url'] else 0