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

Merge pull request #7833 from remitamine/ooyala

Browse source 
[ooyala] improve extraction
This commit is contained in:
remitamine 2015-12-11 17:55:32 +01:00
commit 1fe248a51b
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
youtube_dl/extractor/ooyala.py
View file

@ -27,6 +27,7 @@ class OoyalaBaseIE(InfoExtractor):
'duration': float_or_none(metadata.get('duration'), 1000), 'duration': float_or_none(metadata.get('duration'), 1000),
} }
urls = []
formats = [] formats = []
for supported_format in ('mp4', 'm3u8', 'hds', 'rtmp'): for supported_format in ('mp4', 'm3u8', 'hds', 'rtmp'):
auth_data = self._download_json( auth_data = self._download_json(
@ -38,20 +39,28 @@ class OoyalaBaseIE(InfoExtractor):
if cur_auth_data['authorized']: if cur_auth_data['authorized']:
for stream in cur_auth_data['streams']: for stream in cur_auth_data['streams']:
url = base64.b64decode(stream['url']['data'].encode('ascii')).decode('utf-8') url = base64.b64decode(stream['url']['data'].encode('ascii')).decode('utf-8')
if url in urls:
continue
urls.append(url)
delivery_type = stream['delivery_type'] delivery_type = stream['delivery_type']
if delivery_type == 'remote_asset': if delivery_type == 'hls' or '.m3u8' in url:
video_info['url'] = url m3u8_formats = self._extract_m3u8_formats(url, embed_code, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False)
return video_info if m3u8_formats:
if delivery_type == 'hls': formats.extend(m3u8_formats)
formats.extend(self._extract_m3u8_formats(url, embed_code, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False)) elif delivery_type == 'hds' or '.f4m' in url:
elif delivery_type == 'hds': f4m_formats = self._extract_f4m_formats(url, embed_code, f4m_id='hds', fatal=False)
formats.extend(self._extract_f4m_formats(url, embed_code, -1, 'hds', fatal=False)) if f4m_formats:
formats.extend(f4m_formats)
elif '.smil' in url:
smil_formats = self._extract_smil_formats(url, embed_code, fatal=False)
if smil_formats:
formats.extend(smil_formats)
else: else:
formats.append({ formats.append({
'url': url, 'url': url,
'ext': stream.get('delivery_type'), 'ext': stream.get('delivery_type'),
'vcodec': stream.get('video_codec'), 'vcodec': stream.get('video_codec'),
'format_id': '%s-%s-%sp' % (stream.get('profile'), delivery_type, stream.get('height')), 'format_id': delivery_type,
'width': int_or_none(stream.get('width')), 'width': int_or_none(stream.get('width')),
'height': int_or_none(stream.get('height')), 'height': int_or_none(stream.get('height')),
'abr': int_or_none(stream.get('audio_bitrate')), 'abr': int_or_none(stream.get('audio_bitrate')),