fenix
/
ytdl-nightly
mirror of https://github.com/ytdl-org/ytdl-nightly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ted] extract all http formats

This commit is contained in:
remitamine 2016-04-30 15:41:22 +01:00
parent d41ee7b774
commit 11fa3d7f99
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
youtube_dl/extractor/ted.py
View File

@ -102,9 +102,9 @@ class TEDIE(InfoExtractor):
}] }]
_NATIVE_FORMATS = { _NATIVE_FORMATS = {
'low': {'preference': 1, 'width': 320, 'height': 180}, 'low': {'width': 320, 'height': 180},
'medium': {'preference': 2, 'width': 512, 'height': 288}, 'medium': {'width': 512, 'height': 288},
'high': {'preference': 3, 'width': 854, 'height': 480}, 'high': {'width': 854, 'height': 480},
} }
def _extract_info(self, webpage): def _extract_info(self, webpage):
@ -171,15 +171,21 @@ class TEDIE(InfoExtractor):
if finfo: if finfo:
f.update(finfo) f.update(finfo)
http_url = None
for format_id, resources in talk_info['resources'].items(): for format_id, resources in talk_info['resources'].items():
if format_id == 'h264': if format_id == 'h264':
for resource in resources: for resource in resources:
h264_url = resource.get('file')
if not h264_url:
continue
bitrate = int_or_none(resource.get('bitrate')) bitrate = int_or_none(resource.get('bitrate'))
formats.append({ formats.append({
'url': resource['file'], 'url': h264_url,
'format_id': '%s-%sk' % (format_id, bitrate), 'format_id': '%s-%sk' % (format_id, bitrate),
'tbr': bitrate, 'tbr': bitrate,
}) })
if re.search('\d+k', h264_url):
http_url = h264_url
elif format_id == 'rtmp': elif format_id == 'rtmp':
streamer = talk_info.get('streamer') streamer = talk_info.get('streamer')
if not streamer: if not streamer:
@ -195,16 +201,24 @@ class TEDIE(InfoExtractor):
'tbr': int_or_none(resource.get('bitrate')), 'tbr': int_or_none(resource.get('bitrate')),
}) })
elif format_id == 'hls': elif format_id == 'hls':
hls_formats = self._extract_m3u8_formats( formats.extend(self._extract_m3u8_formats(
resources.get('stream'), video_name, 'mp4', m3u8_id=format_id) resources.get('stream'), video_name, 'mp4', m3u8_id=format_id, fatal=False))
for f in hls_formats:
if f.get('format_id') == 'hls-meta': m3u8_formats = list(filter(
continue lambda f: f.get('protocol') == 'm3u8' and f.get('vcodec') != 'none' and f.get('resolution') != 'multiple',
if not f.get('height'): formats))
f['vcodec'] = 'none' if http_url:
else: for m3u8_format in m3u8_formats:
f['acodec'] = 'none' bitrate = self._search_regex(r'(\d+k)', m3u8_format['url'], 'bitrate', default=None)
formats.extend(hls_formats) if not bitrate:
continue
f = m3u8_format.copy()
f.update({
'url': re.sub(r'\d+k', bitrate, http_url),
'format_id': m3u8_format['format_id'].replace('hls', 'http'),
'protocol': 'http',
})
formats.append(f)
audio_download = talk_info.get('audioDownload') audio_download = talk_info.get('audioDownload')
if audio_download: if audio_download:
@ -212,10 +226,9 @@ class TEDIE(InfoExtractor):
'url': audio_download, 'url': audio_download,
'format_id': 'audio', 'format_id': 'audio',
'vcodec': 'none', 'vcodec': 'none',
'preference': -0.5,
}) })
self._sort_formats(formats) self._sort_formats(formats, ('width', 'height', 'tbr', 'format_id'))
video_id = compat_str(talk_info['id']) video_id = compat_str(talk_info['id'])