Compare commits

..

No commits in common. "17d7861d6fe51d35fdadd9d2c259e0891721617b" and "6011c24f99fec3f4dd55506cdc43761c91da332f" have entirely different histories.

View File

@ -2644,7 +2644,8 @@ class InfoExtractor:
'timescale': 1, 'timescale': 1,
}) })
for adaptation_set in period.findall(_add_ns('AdaptationSet')): for adaptation_set in period.findall(_add_ns('AdaptationSet')):
role = try_call(lambda: adaptation_set.find(_add_ns('Role')).attrib['value']) role_node = adaptation_set.find(_add_ns('Role'))
adaption_set_ms_info = extract_multisegment_info(adaptation_set, period_ms_info) adaption_set_ms_info = extract_multisegment_info(adaptation_set, period_ms_info)
for representation in adaptation_set.findall(_add_ns('Representation')): for representation in adaptation_set.findall(_add_ns('Representation')):
representation_attrib = adaptation_set.attrib.copy() representation_attrib = adaptation_set.attrib.copy()
@ -2713,14 +2714,14 @@ class InfoExtractor:
'filesize': filesize, 'filesize': filesize,
'container': mimetype2ext(mime_type) + '_dash', 'container': mimetype2ext(mime_type) + '_dash',
**codecs, **codecs,
'role': role, 'role': role_node.attrib.get('value') if role_node is not None else None,
} }
elif content_type == 'text': elif content_type == 'text':
f = { f = {
'ext': mimetype2ext(mime_type), 'ext': mimetype2ext(mime_type),
'manifest_url': mpd_url, 'manifest_url': mpd_url,
'filesize': filesize, 'filesize': filesize,
'role': role, 'role': role_node.attrib.get('value') if role_node is not None else None,
} }
elif content_type == 'image/jpeg': elif content_type == 'image/jpeg':
# See test case in VikiIE # See test case in VikiIE