midgard/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[francetv] Improve formats extraction

Browse source
This commit is contained in:
Sergey M․ 2015-04-04 23:02:04 +06:00
parent f05d0e73c6
commit bc03228ab5
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
youtube_dl/extractor/francetv.py
View file

@ -16,6 +16,7 @@ from ..utils import (
int_or_none, int_or_none,
float_or_none, float_or_none,
parse_duration, parse_duration,
determine_ext,
) )
@ -51,7 +52,8 @@ class FranceTVBaseInfoExtractor(InfoExtractor):
if not video_url: if not video_url:
continue continue
format_id = video['format'] format_id = video['format']
if video_url.endswith('.f4m'): ext = determine_ext(video_url)
if ext == 'f4m':
if georestricted: if georestricted:
# See https://github.com/rg3/youtube-dl/issues/3963 # See https://github.com/rg3/youtube-dl/issues/3963
# m3u8 urls work fine # m3u8 urls work fine
@ -61,12 +63,9 @@ class FranceTVBaseInfoExtractor(InfoExtractor):
'http://hdfauth.francetv.fr/esi/urltokengen2.html?url=%s' % video_url_parsed.path, 'http://hdfauth.francetv.fr/esi/urltokengen2.html?url=%s' % video_url_parsed.path,
video_id, 'Downloading f4m manifest token', fatal=False) video_id, 'Downloading f4m manifest token', fatal=False)
if f4m_url: if f4m_url:
f4m_formats = self._extract_f4m_formats(f4m_url, video_id) formats.extend(self._extract_f4m_formats(f4m_url, video_id, 1, format_id))
for f4m_format in f4m_formats: elif ext == 'm3u8':
f4m_format['preference'] = 1 formats.extend(self._extract_m3u8_formats(video_url, video_id, 'mp4', m3u8_id=format_id))
formats.extend(f4m_formats)
elif video_url.endswith('.m3u8'):
formats.extend(self._extract_m3u8_formats(video_url, video_id, 'mp4'))
elif video_url.startswith('rtmp'): elif video_url.startswith('rtmp'):
formats.append({ formats.append({
'url': video_url, 'url': video_url,