mirrors/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #7851 from remitamine/kaltura

Browse Source 
[kaltura] extract more formats
This commit is contained in:
remitamine 2015-12-27 10:34:36 +01:00
commit 46124a49b2
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
youtube_dl/extractor/ellentv.py
View File

@ -13,12 +13,12 @@ class EllenTVIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?(?:ellentv|ellentube)\.com/videos/(?P<id>[a-z0-9_-]+)' _VALID_URL = r'https?://(?:www\.)?(?:ellentv|ellentube)\.com/videos/(?P<id>[a-z0-9_-]+)'
_TEST = { _TEST = {
'url': 'http://www.ellentv.com/videos/0-ipq1gsai/', 'url': 'http://www.ellentv.com/videos/0-ipq1gsai/',
'md5': '8e3c576bf2e9bfff4d76565f56f94c9c', 'md5': '4294cf98bc165f218aaa0b89e0fd8042',
'info_dict': { 'info_dict': {
'id': '0_ipq1gsai', 'id': '0_ipq1gsai',
'ext': 'mp4', 'ext': 'mov',
'title': 'Fast Fingers of Fate', 'title': 'Fast Fingers of Fate',
'description': 'md5:587e79fbbd0d73b148bc596d99ce48e6', 'description': 'md5:3539013ddcbfa64b2a6d1b38d910868a',
'timestamp': 1428035648, 'timestamp': 1428035648,
'upload_date': '20150403', 'upload_date': '20150403',
'uploader_id': 'batchUser', 'uploader_id': 'batchUser',

24
youtube_dl/extractor/kaltura.py
View File

@ -45,7 +45,7 @@ class KalturaIE(InfoExtractor):
'info_dict': { 'info_dict': {
'id': '1_1jc2y3e4', 'id': '1_1jc2y3e4',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Track 4', 'title': 'Straight from the Heart',
'upload_date': '20131219', 'upload_date': '20131219',
'uploader_id': 'mlundberg@wolfgangsvault.com', 'uploader_id': 'mlundberg@wolfgangsvault.com',
'description': 'The Allman Brothers Band, 12/16/1981', 'description': 'The Allman Brothers Band, 12/16/1981',
@ -115,12 +115,9 @@ class KalturaIE(InfoExtractor):
'version': '-1', 'version': '-1',
}, },
{ {
'action': 'getContextData', 'action': 'getbyentryid',
'contextDataParams:objectType': 'KalturaEntryContextDataParams',
'contextDataParams:referrer': 'http://www.kaltura.com/',
'contextDataParams:streamerType': 'http',
'entryId': video_id, 'entryId': video_id,
'service': 'baseentry', 'service': 'flavorAsset',
}, },
] ]
return self._kaltura_api_call( 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') 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') 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') source_url = smuggled_data.get('source_url')
if source_url: if source_url:
@ -144,7 +141,10 @@ class KalturaIE(InfoExtractor):
referrer = None referrer = None
formats = [] 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']) video_url = '%s/flavorId/%s' % (info['dataUrl'], f['id'])
if referrer: if referrer:
video_url += '?referrer=%s' % referrer video_url += '?referrer=%s' % referrer
@ -160,6 +160,14 @@ class KalturaIE(InfoExtractor):
'width': int_or_none(f.get('width')), 'width': int_or_none(f.get('width')),
'url': video_url, 'url': video_url,
}) })
m3u8_url = info['dataUrl'].replace('format/url', 'format/applehttp')
if referrer:
m3u8_url += '?referrer=%s' % referrer
m3u8_formats = self._extract_m3u8_formats(
m3u8_url, entry_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False)
if m3u8_formats:
formats.extend(m3u8_formats)
self._check_formats(formats, entry_id) self._check_formats(formats, entry_id)
self._sort_formats(formats) self._sort_formats(formats)