dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[vimeo] extract both mixed and separated dash formats

This commit is contained in:
Remita Amine 2017-01-31 14:47:56 +01:00
parent dadb836139
commit ae9a173b64
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
youtube_dl/extractor/vimeo.py
View File

@ -142,10 +142,19 @@ class VimeoBaseInfoExtractor(InfoExtractor):
note='Downloading %s m3u8 information' % cdn_name, note='Downloading %s m3u8 information' % cdn_name,
fatal=False)) fatal=False))
elif files_type == 'dash': elif files_type == 'dash':
formats.extend(self._extract_mpd_formats( mpd_pattern = r'/%s/(?:sep/)?video/' % video_id
manifest_url.replace('/master.json', '/master.mpd'), video_id, format_id, mpd_manifest_urls = []
'Downloading %s MPD information' % cdn_name, if re.search(mpd_pattern, manifest_url):
fatal=False)) for suffix, repl in (('', 'video'), ('_sep', 'sep/video')):
mpd_manifest_urls.append((format_id + suffix, re.sub(
mpd_pattern, '/%s/%s/' % (video_id, repl), manifest_url)))
else:
mpd_manifest_urls = [(format_id, manifest_url)]
for f_id, m_url in mpd_manifest_urls:
formats.extend(self._extract_mpd_formats(
m_url.replace('/master.json', '/master.mpd'), video_id, f_id,
'Downloading %s MPD information' % cdn_name,
fatal=False))
subtitles = {} subtitles = {}
text_tracks = config['request'].get('text_tracks') text_tracks = config['request'].get('text_tracks')