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

[brightcove] Extract m3u8 formats (#3541)

Browse source
This commit is contained in:
Naglis Jonaitis 2014-11-06 00:14:33 +02:00
parent 6110bbbfdd
commit 37aab27808
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
youtube_dl/extractor/brightcove.py
View file

@ -14,6 +14,7 @@ from ..utils import (
compat_str, compat_str,
compat_urllib_request, compat_urllib_request,
compat_parse_qs, compat_parse_qs,
compat_urllib_parse_urlparse,
determine_ext, determine_ext,
ExtractorError, ExtractorError,
@ -263,8 +264,14 @@ class BrightcoveIE(InfoExtractor):
if not url: if not url:
continue continue
if rend['remote']: if rend['remote']:
# This type of renditions are served through akamaihd.net, url_comp = compat_urllib_parse_urlparse(url)
# but they don't use f4m manifests 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' url = url.replace('control/', '') + '?&v=3.3.0&fp=13&r=FEEFJ&g=RTSJIMBMPFPB'
ext = 'flv' ext = 'flv'
else: else:

6
youtube_dl/extractor/generic.py
View file

@ -101,17 +101,19 @@ class GenericIE(InfoExtractor):
}, },
}, },
{ {
# https://github.com/rg3/youtube-dl/issues/3541
'add_ie': ['Brightcove'], 'add_ie': ['Brightcove'],
'url': 'http://www.kijk.nl/sbs6/leermijvrouwenkennen/videos/jqMiXKAYan2S/aflevering-1', 'url': 'http://www.kijk.nl/sbs6/leermijvrouwenkennen/videos/jqMiXKAYan2S/aflevering-1',
'info_dict': { 'info_dict': {
'id': '3866516442001', 'id': '3866516442001',
'ext': 'flv', 'ext': 'mp4',
'title': 'Leer mij vrouwen kennen: Aflevering 1', 'title': 'Leer mij vrouwen kennen: Aflevering 1',
'description': 'Leer mij vrouwen kennen: Aflevering 1', 'description': 'Leer mij vrouwen kennen: Aflevering 1',
'uploader': 'SBS Broadcasting', 'uploader': 'SBS Broadcasting',
}, },
'skip': 'Restricted to Netherlands',
'params': { 'params': {
'skip_download': True, 'skip_download': True, # m3u8 download
}, },
}, },
# Direct link to a video # Direct link to a video