mirror of
https://github.com/spaam/svtplay-dl.git
synced 2024-11-24 04:05:39 +01:00
dash: support resolution in the representation element
This commit is contained in:
parent
6bb0b5d065
commit
3c3ed9f63c
@ -134,7 +134,7 @@ def adaptionset(attributes, elements, url, baseurl=None):
|
|||||||
if role_elemets:
|
if role_elemets:
|
||||||
role = role_elemets[0].attrib["value"]
|
role = role_elemets[0].attrib["value"]
|
||||||
|
|
||||||
resolution = None
|
resolution = ""
|
||||||
if "maxWidth" in element.attrib and "maxHeight" in element.attrib:
|
if "maxWidth" in element.attrib and "maxHeight" in element.attrib:
|
||||||
resolution = f'{element.attrib["maxWidth"]}x{element.attrib["maxHeight"]}'
|
resolution = f'{element.attrib["maxWidth"]}x{element.attrib["maxHeight"]}'
|
||||||
|
|
||||||
@ -163,7 +163,9 @@ def adaptionset(attributes, elements, url, baseurl=None):
|
|||||||
else:
|
else:
|
||||||
codec = codecs
|
codec = codecs
|
||||||
if not resolution and "maxWidth" in i.attrib and "maxHeight" in i.attrib:
|
if not resolution and "maxWidth" in i.attrib and "maxHeight" in i.attrib:
|
||||||
resolution = f'{element.attrib["maxWidth"]}x{element.attrib["maxHeight"]}'
|
resolution = f'{i.attrib["maxWidth"]}x{i.attrib["maxHeight"]}'
|
||||||
|
elif not resolution and "width" in i.attrib and "height" in i.attrib:
|
||||||
|
resolution = f'{i.attrib["width"]}x{i.attrib["height"]}'
|
||||||
if i.find("{urn:mpeg:dash:schema:mpd:2011}AudioChannelConfiguration") is not None:
|
if i.find("{urn:mpeg:dash:schema:mpd:2011}AudioChannelConfiguration") is not None:
|
||||||
chan = i.find("{urn:mpeg:dash:schema:mpd:2011}AudioChannelConfiguration").attrib["value"]
|
chan = i.find("{urn:mpeg:dash:schema:mpd:2011}AudioChannelConfiguration").attrib["value"]
|
||||||
if chan == "6":
|
if chan == "6":
|
||||||
@ -199,7 +201,7 @@ def adaptionset(attributes, elements, url, baseurl=None):
|
|||||||
"role": role,
|
"role": role,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
resolution = ""
|
||||||
return streams
|
return streams
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user