diff options
| author | Sergey M․ <dstftw@gmail.com> | 2018-02-28 22:55:09 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2018-02-28 22:55:09 +0700 |
| commit | 949faa15e8a1192eef14356522afdca2741746b9 (patch) | |
| tree | 0403c83577bf2d9d9b4257d04831e53431951959 | |
| parent | 0c3e5f4921760f0d5c743c47a1205f734b67fcb7 (diff) | |
| download | youtube-dl-949faa15e8a1192eef14356522afdca2741746b9.tar.gz youtube-dl-949faa15e8a1192eef14356522afdca2741746b9.tar.xz youtube-dl-949faa15e8a1192eef14356522afdca2741746b9.zip | |
[toggle] Extract DASH and ISM formats (closes #15721)
| -rw-r--r-- | youtube_dl/extractor/toggle.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/youtube_dl/extractor/toggle.py b/youtube_dl/extractor/toggle.py index 348d6ecdf..5e5efda0f 100644 --- a/youtube_dl/extractor/toggle.py +++ b/youtube_dl/extractor/toggle.py @@ -132,7 +132,7 @@ class ToggleIE(InfoExtractor): formats = [] for video_file in info.get('Files', []): video_url, vid_format = video_file.get('URL'), video_file.get('Format') - if not video_url or not vid_format: + if not video_url or video_url == 'NA' or not vid_format: continue ext = determine_ext(video_url) vid_format = vid_format.replace(' ', '') @@ -143,6 +143,18 @@ class ToggleIE(InfoExtractor): note='Downloading %s m3u8 information' % vid_format, errnote='Failed to download %s m3u8 information' % vid_format, fatal=False)) + elif ext == 'mpd': + formats.extend(self._extract_mpd_formats( + video_url, video_id, mpd_id=vid_format, + note='Downloading %s MPD manifest' % vid_format, + errnote='Failed to download %s MPD manifest' % vid_format, + fatal=False)) + elif ext == 'ism': + formats.extend(self._extract_ism_formats( + video_url, video_id, ism_id=vid_format, + note='Downloading %s ISM manifest' % vid_format, + errnote='Failed to download %s ISM manifest' % vid_format, + fatal=False)) elif ext in ('mp4', 'wvm'): # wvm are drm-protected files formats.append({ |