ninjajiraiya
/
devine
forked from DRMTalks/devine
1
0
Fork 0
Code Pull Requests Activity

refactor(DASH): Change how Video FPS is gotten to remove FutureWarning log

This commit is contained in:
rlaphoenix 2024-03-01 05:15:47 +00:00
parent 289808b80c
commit c516f54a07
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devine/core/manifests/dash.py
View File

@ -114,6 +114,7 @@ class DASH:
for rep in adaptation_set.findall("Representation"): for rep in adaptation_set.findall("Representation"):
get = partial(self._get, adaptation_set=adaptation_set, representation=rep) get = partial(self._get, adaptation_set=adaptation_set, representation=rep)
findall = partial(self._findall, adaptation_set=adaptation_set, representation=rep, both=True) findall = partial(self._findall, adaptation_set=adaptation_set, representation=rep, both=True)
segment_base = rep.find("SegmentBase")
codecs = get("codecs") codecs = get("codecs")
content_type = get("contentType") content_type = get("contentType")
@ -141,6 +142,10 @@ class DASH:
if content_type == "video": if content_type == "video":
track_type = Video track_type = Video
track_codec = Video.Codec.from_codecs(codecs) track_codec = Video.Codec.from_codecs(codecs)
track_fps = get("frameRate")
if not track_fps and segment_base is not None:
track_fps = segment_base.get("timescale")
track_args = dict( track_args = dict(
range_=self.get_video_range( range_=self.get_video_range(
codecs, codecs,
@ -150,7 +155,7 @@ class DASH:
bitrate=get("bandwidth") or None, bitrate=get("bandwidth") or None,
width=get("width") or 0, width=get("width") or 0,
height=get("height") or 0, height=get("height") or 0,
fps=get("frameRate") or (rep.find("SegmentBase") or {}).get("timescale") or None fps=track_fps or None
) )
elif content_type == "audio": elif content_type == "audio":
track_type = Audio track_type = Audio