diff options
author | Jesús <heckyel@hyperbola.info> | 2022-02-12 21:05:27 -0500 |
---|---|---|
committer | Jesús <heckyel@hyperbola.info> | 2022-02-12 21:05:27 -0500 |
commit | af4847e22e81d05177f92c712983ab3f2f20184b (patch) | |
tree | 6b749333494ffe379df3e1a060660e4b1afcdf85 /yt_dlp/extractor/kaltura.py | |
parent | c4b763b19f54ed5dfc2fd408adb9ed74126f6740 (diff) | |
parent | 29448350808619262d6a9ddd393a2c28df1720fe (diff) | |
download | hypervideo-pre-af4847e22e81d05177f92c712983ab3f2f20184b.tar.lz hypervideo-pre-af4847e22e81d05177f92c712983ab3f2f20184b.tar.xz hypervideo-pre-af4847e22e81d05177f92c712983ab3f2f20184b.zip |
updated from upstream | 12/02/2022 at 21:05
Diffstat (limited to 'yt_dlp/extractor/kaltura.py')
-rw-r--r-- | yt_dlp/extractor/kaltura.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/yt_dlp/extractor/kaltura.py b/yt_dlp/extractor/kaltura.py index c58216458..f6dfc9caa 100644 --- a/yt_dlp/extractor/kaltura.py +++ b/yt_dlp/extractor/kaltura.py @@ -301,6 +301,7 @@ class KalturaIE(InfoExtractor): data_url = re.sub(r'/flvclipper/.*', '/serveFlavor', data_url) formats = [] + subtitles = {} for f in flavor_assets: # Continue if asset is not ready if f.get('status') != 2: @@ -344,13 +345,14 @@ class KalturaIE(InfoExtractor): if '/playManifest/' in data_url: m3u8_url = sign_url(data_url.replace( 'format/url', 'format/applehttp')) - formats.extend(self._extract_m3u8_formats( + fmts, subs = self._extract_m3u8_formats_and_subtitles( m3u8_url, entry_id, 'mp4', 'm3u8_native', - m3u8_id='hls', fatal=False)) + m3u8_id='hls', fatal=False) + formats.extend(fmts) + self._merge_subtitles(subs, target=subtitles) self._sort_formats(formats) - subtitles = {} if captions: for caption in captions.get('objects', []): # Continue if caption is not ready |