[bloomberg] Improve formats extraction

This commit is contained in:
Sergey M․ 2015-11-28 22:45:19 +06:00
parent 4191fdf147
commit b7faebbac8

View File

@ -37,10 +37,19 @@ def _real_extract(self, url):
'http://www.bloomberg.com/api/embed?id=%s' % video_id, video_id) 'http://www.bloomberg.com/api/embed?id=%s' % video_id, video_id)
formats = [] formats = []
for stream in embed_info['streams']: for stream in embed_info['streams']:
stream_url = stream.get('url')
if not stream_url:
continue
if stream['muxing_format'] == 'TS': if stream['muxing_format'] == 'TS':
formats.extend(self._extract_m3u8_formats(stream['url'], video_id)) m3u8_formats = self._extract_m3u8_formats(
stream_url, video_id, 'mp4', m3u8_id='hls', fatal=False)
if m3u8_formats:
formats.extend(m3u8_formats)
else: else:
formats.extend(self._extract_f4m_formats(stream['url'], video_id)) f4m_formats = self._extract_f4m_formats(
stream_url, video_id, f4m_id='hds', fatal=False)
if f4m_formats:
formats.extend(f4m_formats)
self._sort_formats(formats) self._sort_formats(formats)
return { return {