mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2025-05-01 08:16:17 +02:00
[ie/panopto] Fix formats extraction (#12925)
Closes #11042 Authored by: seproDev
This commit is contained in:
parent
73a26f9ee6
commit
9d26daa04a
@ -14,8 +14,9 @@ from ..utils import (
|
|||||||
int_or_none,
|
int_or_none,
|
||||||
parse_qs,
|
parse_qs,
|
||||||
srt_subtitles_timecode,
|
srt_subtitles_timecode,
|
||||||
traverse_obj,
|
url_or_none,
|
||||||
)
|
)
|
||||||
|
from ..utils.traversal import traverse_obj
|
||||||
|
|
||||||
|
|
||||||
class PanoptoBaseIE(InfoExtractor):
|
class PanoptoBaseIE(InfoExtractor):
|
||||||
@ -345,21 +346,16 @@ class PanoptoIE(PanoptoBaseIE):
|
|||||||
subtitles = {}
|
subtitles = {}
|
||||||
for stream in streams or []:
|
for stream in streams or []:
|
||||||
stream_formats = []
|
stream_formats = []
|
||||||
http_stream_url = stream.get('StreamHttpUrl')
|
for stream_url in set(traverse_obj(stream, (('StreamHttpUrl', 'StreamUrl'), {url_or_none}))):
|
||||||
stream_url = stream.get('StreamUrl')
|
|
||||||
|
|
||||||
if http_stream_url:
|
|
||||||
stream_formats.append({'url': http_stream_url})
|
|
||||||
|
|
||||||
if stream_url:
|
|
||||||
media_type = stream.get('ViewerMediaFileTypeName')
|
media_type = stream.get('ViewerMediaFileTypeName')
|
||||||
if media_type in ('hls', ):
|
if media_type in ('hls', ):
|
||||||
m3u8_formats, stream_subtitles = self._extract_m3u8_formats_and_subtitles(stream_url, video_id)
|
fmts, subs = self._extract_m3u8_formats_and_subtitles(stream_url, video_id, m3u8_id='hls', fatal=False)
|
||||||
stream_formats.extend(m3u8_formats)
|
stream_formats.extend(fmts)
|
||||||
subtitles = self._merge_subtitles(subtitles, stream_subtitles)
|
self._merge_subtitles(subs, target=subtitles)
|
||||||
else:
|
else:
|
||||||
stream_formats.append({
|
stream_formats.append({
|
||||||
'url': stream_url,
|
'url': stream_url,
|
||||||
|
'ext': media_type,
|
||||||
})
|
})
|
||||||
for fmt in stream_formats:
|
for fmt in stream_formats:
|
||||||
fmt.update({
|
fmt.update({
|
||||||
|
Loading…
x
Reference in New Issue
Block a user