w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[vgtv] fix f4m downloading(fixes #7843)

Browse source
This commit is contained in:
remitamine 2015-12-27 17:44:55 +01:00
parent c71d2e2087
commit 97f18fac3a
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
youtube_dl/extractor/vgtv.py
View file

@ -86,9 +86,10 @@ class VGTVIE(XstreamIE):
{ {
# streamType: wasLive # streamType: wasLive
'url': 'http://www.vgtv.no/#!/live/113063/direkte-v75-fra-solvalla', 'url': 'http://www.vgtv.no/#!/live/113063/direkte-v75-fra-solvalla',
'md5': '458f4841239dab414343b50e5af8869c',
'info_dict': { 'info_dict': {
'id': '113063', 'id': '113063',
'ext': 'mp4', 'ext': 'flv',
'title': 'V75 fra Solvalla 30.05.15', 'title': 'V75 fra Solvalla 30.05.15',
'description': 'md5:b3743425765355855f88e096acc93231', 'description': 'md5:b3743425765355855f88e096acc93231',
'thumbnail': 're:^https?://.*\.jpg', 'thumbnail': 're:^https?://.*\.jpg',
@ -97,10 +98,6 @@ class VGTVIE(XstreamIE):
'upload_date': '20150530', 'upload_date': '20150530',
'view_count': int, 'view_count': int,
}, },
'params': {
# m3u8 download
'skip_download': True,
},
}, },
{ {
'url': 'http://www.aftenposten.no/webtv/#!/video/21039/trailer-sweatshop-i-can-t-take-any-more', 'url': 'http://www.aftenposten.no/webtv/#!/video/21039/trailer-sweatshop-i-can-t-take-any-more',
@ -160,12 +157,15 @@ class VGTVIE(XstreamIE):
formats.extend(m3u8_formats) formats.extend(m3u8_formats)
hds_url = streams.get('hds') hds_url = streams.get('hds')
# wasLive hds are always 404 if hds_url:
if hds_url and stream_type != 'wasLive': hdcore_sign = 'hdcore=3.7.0'
f4m_formats = self._extract_f4m_formats( f4m_formats = self._extract_f4m_formats(
hds_url + '?hdcore=3.2.0&plugin=aasp-3.2.0.77.18', video_id, f4m_id='hds', fatal=False) hds_url + '?%s' % hdcore_sign, video_id, f4m_id='hds', fatal=False)
if f4m_formats: if f4m_formats:
formats.extend(f4m_formats) for entry in f4m_formats:
# URLs without the extra param induce an 404 error
entry.update({'extra_param_to_segment_url': hdcore_sign})
formats.append(entry)
mp4_urls = streams.get('pseudostreaming') or [] mp4_urls = streams.get('pseudostreaming') or []
mp4_url = streams.get('mp4') mp4_url = streams.get('mp4')