mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-29 18:51:24 +01:00
Compare commits
2 Commits
8e6e365172
...
4d9dc0abe2
Author | SHA1 | Date | |
---|---|---|---|
|
4d9dc0abe2 | ||
|
014cb5774d |
|
@ -93,7 +93,7 @@ class AENetworksBaseIE(ThePlatformIE): # XXX: Do not subclass from concrete IE
|
||||||
resource = self._get_mvpd_resource(
|
resource = self._get_mvpd_resource(
|
||||||
requestor_id, theplatform_metadata['title'],
|
requestor_id, theplatform_metadata['title'],
|
||||||
theplatform_metadata.get('AETN$PPL_pplProgramId') or theplatform_metadata.get('AETN$PPL_pplProgramId_OLD'),
|
theplatform_metadata.get('AETN$PPL_pplProgramId') or theplatform_metadata.get('AETN$PPL_pplProgramId_OLD'),
|
||||||
theplatform_metadata['ratings'][0]['rating'])
|
traverse_obj(theplatform_metadata, ('ratings', 0, 'rating')))
|
||||||
auth = self._extract_mvpd_auth(
|
auth = self._extract_mvpd_auth(
|
||||||
url, video_id, requestor_id, resource)
|
url, video_id, requestor_id, resource)
|
||||||
info.update(self._extract_aen_smil(media_url, video_id, auth))
|
info.update(self._extract_aen_smil(media_url, video_id, auth))
|
||||||
|
|
|
@ -46,15 +46,18 @@ class CloudflareStreamIE(InfoExtractor):
|
||||||
video_id.split('.')[1] + '==='), video_id)['sub']
|
video_id.split('.')[1] + '==='), video_id)['sub']
|
||||||
manifest_base_url = base_url + 'manifest/video.'
|
manifest_base_url = base_url + 'manifest/video.'
|
||||||
|
|
||||||
formats = self._extract_m3u8_formats(
|
formats, subtitles = self._extract_m3u8_formats_and_subtitles(
|
||||||
manifest_base_url + 'm3u8', video_id, 'mp4',
|
manifest_base_url + 'm3u8', video_id, 'mp4',
|
||||||
'm3u8_native', m3u8_id='hls', fatal=False)
|
'm3u8_native', m3u8_id='hls', fatal=False)
|
||||||
formats.extend(self._extract_mpd_formats(
|
fmts, subs = self._extract_mpd_formats_and_subtitles(
|
||||||
manifest_base_url + 'mpd', video_id, mpd_id='dash', fatal=False))
|
manifest_base_url + 'mpd', video_id, mpd_id='dash', fatal=False)
|
||||||
|
formats.extend(fmts)
|
||||||
|
self._merge_subtitles(subs, target=subtitles)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'title': video_id,
|
'title': video_id,
|
||||||
'thumbnail': base_url + 'thumbnails/thumbnail.jpg',
|
'thumbnail': base_url + 'thumbnails/thumbnail.jpg',
|
||||||
'formats': formats,
|
'formats': formats,
|
||||||
|
'subtitles': subtitles,
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user