Mirroring
/
yt-dlp
mirror of https://github.com/yt-dlp/yt-dlp
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge 95c46e32f0 into 74e90dd9b8

Browse Source
pull/12426/merge
bashonly 2 days ago committed by GitHub
parent 74e90dd9b8 95c46e32f0
commit b7a001921b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File

46
test/test_InfoExtractor.py
Unescape Escape View File

@ -1066,7 +1066,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'manifest_url': 'http://unknown/manifest.mpd',
'ext': 'm4a',
'format_id': '318597',
'format_note': 'DASH audio',
'format_note': 'DASH audio, set 0',
'protocol': 'http_dash_segments',
'acodec': 'mp4a.40.2',
'vcodec': 'none',
@ -1075,7 +1075,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'manifest_url': 'http://unknown/manifest.mpd',
'ext': 'mp4',
'format_id': '318597',
'format_note': 'DASH video',
'format_note': 'DASH video, set 1',
'protocol': 'http_dash_segments',
'acodec': 'none',
'vcodec': 'avc1.42001f',
@ -1086,7 +1086,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'manifest_url': 'http://unknown/manifest.mpd',
'ext': 'mp4',
'format_id': '638590',
'format_note': 'DASH video',
'format_note': 'DASH video, set 1',
'protocol': 'http_dash_segments',
'acodec': 'none',
'vcodec': 'avc1.42001f',
@ -1097,7 +1097,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'manifest_url': 'http://unknown/manifest.mpd',
'ext': 'mp4',
'format_id': '1022565',
'format_note': 'DASH video',
'format_note': 'DASH video, set 1',
'protocol': 'http_dash_segments',
'acodec': 'none',
'vcodec': 'avc1.4d001f',
@ -1108,7 +1108,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'manifest_url': 'http://unknown/manifest.mpd',
'ext': 'mp4',
'format_id': '2046506',
'format_note': 'DASH video',
'format_note': 'DASH video, set 1',
'protocol': 'http_dash_segments',
'acodec': 'none',
'vcodec': 'avc1.4d001f',
@ -1119,7 +1119,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'manifest_url': 'http://unknown/manifest.mpd',
'ext': 'mp4',
'format_id': '3998017',
'format_note': 'DASH video',
'format_note': 'DASH video, set 1',
'protocol': 'http_dash_segments',
'acodec': 'none',
'vcodec': 'avc1.640029',
@ -1130,7 +1130,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'manifest_url': 'http://unknown/manifest.mpd',
'ext': 'mp4',
'format_id': '5997485',
'format_note': 'DASH video',
'format_note': 'DASH video, set 1',
'protocol': 'http_dash_segments',
'acodec': 'none',
'vcodec': 'avc1.640032',
@ -1148,7 +1148,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'manifest_url': 'http://unknown/manifest.mpd',
'ext': 'mp4',
'format_id': 'h264_aac_144p_m4s',
'format_note': 'DASH video',
'format_note': 'DASH video, set 0',
'protocol': 'http_dash_segments',
'acodec': 'mp4a.40.2',
'vcodec': 'avc3.42c01e',
@ -1159,7 +1159,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'manifest_url': 'http://unknown/manifest.mpd',
'ext': 'mp4',
'format_id': 'h264_aac_240p_m4s',
'format_note': 'DASH video',
'format_note': 'DASH video, set 0',
'protocol': 'http_dash_segments',
'acodec': 'mp4a.40.2',
'vcodec': 'avc3.42c01e',
@ -1170,7 +1170,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'manifest_url': 'http://unknown/manifest.mpd',
'ext': 'mp4',
'format_id': 'h264_aac_360p_m4s',
'format_note': 'DASH video',
'format_note': 'DASH video, set 0',
'protocol': 'http_dash_segments',
'acodec': 'mp4a.40.2',
'vcodec': 'avc3.42c01e',
@ -1181,7 +1181,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'manifest_url': 'http://unknown/manifest.mpd',
'ext': 'mp4',
'format_id': 'h264_aac_480p_m4s',
'format_note': 'DASH video',
'format_note': 'DASH video, set 0',
'protocol': 'http_dash_segments',
'acodec': 'mp4a.40.2',
'vcodec': 'avc3.42c01e',
@ -1192,7 +1192,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'manifest_url': 'http://unknown/manifest.mpd',
'ext': 'mp4',
'format_id': 'h264_aac_576p_m4s',
'format_note': 'DASH video',
'format_note': 'DASH video, set 0',
'protocol': 'http_dash_segments',
'acodec': 'mp4a.40.2',
'vcodec': 'avc3.42c01e',
@ -1203,7 +1203,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'manifest_url': 'http://unknown/manifest.mpd',
'ext': 'mp4',
'format_id': 'h264_aac_720p_m4s',
'format_note': 'DASH video',
'format_note': 'DASH video, set 0',
'protocol': 'http_dash_segments',
'acodec': 'mp4a.40.2',
'vcodec': 'avc3.42c01e',
@ -1214,7 +1214,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'manifest_url': 'http://unknown/manifest.mpd',
'ext': 'mp4',
'format_id': 'h264_aac_1080p_m4s',
'format_note': 'DASH video',
'format_note': 'DASH video, set 0',
'protocol': 'http_dash_segments',
'acodec': 'mp4a.40.2',
'vcodec': 'avc3.42c01e',
@ -1235,7 +1235,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'manifest_url': 'https://v.redd.it/hw1x7rcg7zl21/DASHPlaylist.mpd',
'ext': 'm4a',
'format_id': 'AUDIO-1',
'format_note': 'DASH audio',
'format_note': 'DASH audio, set 1',
'container': 'm4a_dash',
'acodec': 'mp4a.40.2',
'vcodec': 'none',
@ -1247,7 +1247,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'manifest_url': 'https://v.redd.it/hw1x7rcg7zl21/DASHPlaylist.mpd',
'ext': 'mp4',
'format_id': 'VIDEO-2',
'format_note': 'DASH video',
'format_note': 'DASH video, set 0',
'container': 'mp4_dash',
'acodec': 'none',
'vcodec': 'avc1.4d401e',
@ -1260,7 +1260,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'manifest_url': 'https://v.redd.it/hw1x7rcg7zl21/DASHPlaylist.mpd',
'ext': 'mp4',
'format_id': 'VIDEO-1',
'format_note': 'DASH video',
'format_note': 'DASH video, set 0',
'container': 'mp4_dash',
'acodec': 'none',
'vcodec': 'avc1.4d401e',
@ -1280,7 +1280,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'ext': 'm4a',
'tbr': 128.001,
'asr': 48000,
'format_note': 'DASH audio',
'format_note': 'DASH audio, set 1',
'container': 'm4a_dash',
'vcodec': 'none',
'acodec': 'mp4a.40.2',
@ -1297,7 +1297,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'width': 336,
'height': 144,
'tbr': 100,
'format_note': 'DASH video',
'format_note': 'DASH video, set 3',
'container': 'mp4_dash',
'vcodec': 'avc1.4D401F',
'acodec': 'none',
@ -1314,7 +1314,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'width': 562,
'height': 240,
'tbr': 326,
'format_note': 'DASH video',
'format_note': 'DASH video, set 3',
'container': 'mp4_dash',
'vcodec': 'avc1.4D401F',
'acodec': 'none',
@ -1331,7 +1331,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'width': 844,
'height': 360,
'tbr': 698,
'format_note': 'DASH video',
'format_note': 'DASH video, set 3',
'container': 'mp4_dash',
'vcodec': 'avc1.4D401F',
'acodec': 'none',
@ -1348,7 +1348,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'width': 1126,
'height': 480,
'tbr': 1493,
'format_note': 'DASH video',
'format_note': 'DASH video, set 3',
'container': 'mp4_dash',
'vcodec': 'avc1.4D401F',
'acodec': 'none',
@ -1365,7 +1365,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
'width': 1688,
'height': 720,
'tbr': 4482,
'format_note': 'DASH video',
'format_note': 'DASH video, set 3',
'container': 'mp4_dash',
'vcodec': 'avc1.4D401F',
'acodec': 'none',

8
yt_dlp/extractor/common.py
Unescape Escape View File

@ -2826,8 +2826,9 @@ class InfoExtractor:
'start_number': 1,
'timescale': 1,
})
for adaptation_set in period.findall(_add_ns('AdaptationSet')):
for adaptation_idx, adaptation_set in enumerate(period.findall(_add_ns('AdaptationSet'))):
adaption_set_ms_info = extract_multisegment_info(adaptation_set, period_ms_info)
adaptation_set_label = try_call(lambda: adaptation_set.find(_add_ns('Label')).text)
for representation in adaptation_set.findall(_add_ns('Representation')):
representation_attrib = adaptation_set.attrib.copy()
representation_attrib.update(representation.attrib)
@ -2891,7 +2892,10 @@ class InfoExtractor:
'asr': int_or_none(representation_attrib.get('audioSamplingRate')),
'fps': int_or_none(representation_attrib.get('frameRate')),
'language': lang if lang not in ('mul', 'und', 'zxx', 'mis') else None,
'format_note': f'DASH {content_type}',
# AdaptationSet ID/index must be included to prevent improper merging as periods
'format_note': join_nonempty(
f'DASH {content_type}', adaptation_set_label,
f'set {adaptation_set.get("id", adaptation_idx)}', delim=', '),
'filesize': filesize,
'container': mimetype2ext(mime_type) + '_dash',
**codecs,

Write Preview
Loading…
Cancel
Save