projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
240b604
)
[playwire] Add the test (closed #9531)
author
Yen Chi Hsuan
<yan12125@gmail.com>
Thu, 26 May 2016 13:57:06 +0000
(21:57 +0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Thu, 26 May 2016 13:57:06 +0000
(21:57 +0800)
youtube_dl/extractor/playwire.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/playwire.py
b/youtube_dl/extractor/playwire.py
index 7580e4a856be076b1f36b31c910019cafb4d2ff8..2ee5c5aa37c0674a798b179d5c3fe3fa90631941 100644
(file)
--- a/
youtube_dl/extractor/playwire.py
+++ b/
youtube_dl/extractor/playwire.py
@@
-21,6
+21,18
@@
class PlaywireIE(InfoExtractor):
'thumbnail': 're:^https?://.*\.png$',
'duration': 145.94,
},
'thumbnail': 're:^https?://.*\.png$',
'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',
}, {
# Multiple resolutions while bitrates missing
'url': 'http://cdn.playwire.com/11625/embed/85228.html',
@@
-48,7
+60,7
@@
class PlaywireIE(InfoExtractor):
thumbnail = content.get('poster')
src = content['media']['f4m']
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
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