diff options
| author | Naglis Jonaitis <njonaitis@gmail.com> | 2014-11-06 00:14:33 +0200 |
|---|---|---|
| committer | Naglis Jonaitis <njonaitis@gmail.com> | 2014-11-06 00:14:33 +0200 |
| commit | 37aab27808b15bb7818d383dddbe165fe24be5d1 (patch) | |
| tree | dc01d449d3910e30a0c7c41057001aef28ea3323 /youtube_dl | |
| parent | 6110bbbfdd6418950beaf487e5a384cc7c483498 (diff) | |
[brightcove] Extract m3u8 formats (#3541)
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/brightcove.py | 15 | ||||
| -rw-r--r-- | youtube_dl/extractor/generic.py | 6 |
2 files changed, 15 insertions, 6 deletions
diff --git a/youtube_dl/extractor/brightcove.py b/youtube_dl/extractor/brightcove.py index cc94e596c..a6920685e 100644 --- a/youtube_dl/extractor/brightcove.py +++ b/youtube_dl/extractor/brightcove.py @@ -14,6 +14,7 @@ from ..utils import ( compat_str, compat_urllib_request, compat_parse_qs, + compat_urllib_parse_urlparse, determine_ext, ExtractorError, @@ -263,10 +264,16 @@ class BrightcoveIE(InfoExtractor): if not url: continue if rend['remote']: - # This type of renditions are served through akamaihd.net, - # but they don't use f4m manifests - url = url.replace('control/', '') + '?&v=3.3.0&fp=13&r=FEEFJ&g=RTSJIMBMPFPB' - ext = 'flv' + url_comp = compat_urllib_parse_urlparse(url) + if url_comp.path.endswith('.m3u8'): + formats.extend( + self._extract_m3u8_formats(url, info['id'], 'mp4')) + continue + elif 'akamaihd.net' in url_comp.netloc: + # This type of renditions are served through + # akamaihd.net, but they don't use f4m manifests + url = url.replace('control/', '') + '?&v=3.3.0&fp=13&r=FEEFJ&g=RTSJIMBMPFPB' + ext = 'flv' else: ext = determine_ext(url) size = rend.get('size') diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 286f95b18..8dd11e202 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -101,17 +101,19 @@ class GenericIE(InfoExtractor): }, }, { + # https://github.com/rg3/youtube-dl/issues/3541 'add_ie': ['Brightcove'], 'url': 'http://www.kijk.nl/sbs6/leermijvrouwenkennen/videos/jqMiXKAYan2S/aflevering-1', 'info_dict': { 'id': '3866516442001', - 'ext': 'flv', + 'ext': 'mp4', 'title': 'Leer mij vrouwen kennen: Aflevering 1', 'description': 'Leer mij vrouwen kennen: Aflevering 1', 'uploader': 'SBS Broadcasting', }, + 'skip': 'Restricted to Netherlands', 'params': { - 'skip_download': True, + 'skip_download': True, # m3u8 download }, }, # Direct link to a video |