diff options
| author | remitamine <remitamine@gmail.com> | 2015-12-11 23:40:12 +0100 |
|---|---|---|
| committer | remitamine <remitamine@gmail.com> | 2015-12-11 23:40:12 +0100 |
| commit | bb4b8c57b986ce9aa1f21f437c8e1de98f8cb7bf (patch) | |
| tree | cdf788bc4721be86d87c82fd5fe694b9ef0106eb /youtube_dl/extractor/kaltura.py | |
| parent | f377f44dae78ff6837d9301e7a086dfb1e601df2 (diff) | |
[kaltura] extract more formats
Diffstat (limited to 'youtube_dl/extractor/kaltura.py')
| -rw-r--r-- | youtube_dl/extractor/kaltura.py | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/youtube_dl/extractor/kaltura.py b/youtube_dl/extractor/kaltura.py index 583b1a5ad..353e960b0 100644 --- a/youtube_dl/extractor/kaltura.py +++ b/youtube_dl/extractor/kaltura.py @@ -45,7 +45,7 @@ class KalturaIE(InfoExtractor): 'info_dict': { 'id': '1_1jc2y3e4', 'ext': 'mp4', - 'title': 'Track 4', + 'title': 'Straight from the Heart', 'upload_date': '20131219', 'uploader_id': 'mlundberg@wolfgangsvault.com', 'description': 'The Allman Brothers Band, 12/16/1981', @@ -115,12 +115,9 @@ class KalturaIE(InfoExtractor): 'version': '-1', }, { - 'action': 'getContextData', - 'contextDataParams:objectType': 'KalturaEntryContextDataParams', - 'contextDataParams:referrer': 'http://www.kaltura.com/', - 'contextDataParams:streamerType': 'http', + 'action': 'getbyentryid', 'entryId': video_id, - 'service': 'baseentry', + 'service': 'flavorAsset', }, ] return self._kaltura_api_call( @@ -133,7 +130,7 @@ class KalturaIE(InfoExtractor): partner_id = mobj.group('partner_id_s') or mobj.group('partner_id') or mobj.group('partner_id_html5') entry_id = mobj.group('id_s') or mobj.group('id') or mobj.group('id_html5') - info, source_data = self._get_video_info(entry_id, partner_id) + info, flavor_assets = self._get_video_info(entry_id, partner_id) source_url = smuggled_data.get('source_url') if source_url: @@ -144,7 +141,10 @@ class KalturaIE(InfoExtractor): referrer = None formats = [] - for f in source_data['flavorAssets']: + for f in flavor_assets: + # Continue if asset is not ready + if f['status'] != 2: + continue video_url = '%s/flavorId/%s' % (info['dataUrl'], f['id']) if referrer: video_url += '?referrer=%s' % referrer @@ -160,6 +160,13 @@ class KalturaIE(InfoExtractor): 'width': int_or_none(f.get('width')), 'url': video_url, }) + + m3u8_formats = self._extract_m3u8_formats( + info['dataUrl'].replace('format/url', 'format/applehttp'), + entry_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False) + if m3u8_formats: + formats.extend(m3u8_formats) + self._check_formats(formats, entry_id) self._sort_formats(formats) |