Skip to content

stream.dash: various SegmentList/SegmentTemplate fixes #5247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 14, 2023
Merged

stream.dash: various SegmentList/SegmentTemplate fixes #5247

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d99b96
stream.dash: fix SegmentList child nodes
bastimeyer Mar 14, 2023
eb9779e
stream.dash: inherit SegmentList attributes
bastimeyer Mar 14, 2023
724cd9d
stream.dash: make SegmentList.SegmentURL optional
bastimeyer Mar 14, 2023
ab7de68
stream.dash: find ancestor SegmentTimeline nodes
bastimeyer Mar 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 35 additions & 17 deletions src/streamlink/stream/dash_manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,32 +523,46 @@ def __init__(self, *args, **kwargs) -> None:
class SegmentList(MPDNode):
__tag__ = "SegmentList"

parent: Union["Period", "AdaptationSet", "Representation"]

def __init__(self, *args, period: "Period", **kwargs) -> None:
super().__init__(*args, **kwargs)

self.period = period

self.presentation_time_offset = self.attr("presentationTimeOffset")
self.timescale = self.attr(
"timescale",
parser=int,
)
self.defaultSegmentList = self.walk_back_get_attr("segmentList")

self.duration = self.attr(
"duration",
parser=int,
default=self.defaultSegmentList.duration if self.defaultSegmentList else None,
)
self.timescale: int = self.attr(
"timescale",
parser=int,
default=self.defaultSegmentList.timescale if self.defaultSegmentList else 1,
)
self.start_number = self.attr(
self.startNumber: int = self.attr(
"startNumber",
parser=int,
default=1,
default=self.defaultSegmentList.startNumber if self.defaultSegmentList else 1,
)
self.presentationTimeOffset = self.attr(
"presentationTimeOffset",
parser=MPDParsers.timedelta(self.timescale),
default=self.defaultSegmentList.presentationTimeOffset if self.defaultSegmentList else timedelta(),
)

self.duration_seconds = self.duration / self.timescale if self.duration and self.timescale else None

# children
self.initialization = self.only_child(Initialization)
self.segment_urls = self.children(SegmentURL, minimum=1)
self.segmentTimeline = (
self.only_child(SegmentTimeline)
or (self.defaultSegmentList.segmentTimeline if self.defaultSegmentList else None)
)
self.segmentURLs = self.children(SegmentURL)

@property
def segments(self) -> Iterator[Segment]:
if self.initialization: # pragma: no branch
yield Segment(
Expand All @@ -560,7 +574,7 @@ def segments(self) -> Iterator[Segment]:
content=False,
byterange=self.initialization.range,
)
for number, segment_url in enumerate(self.segment_urls, self.start_number):
for number, segment_url in enumerate(self.segmentURLs, self.startNumber):
yield Segment(
url=self.make_url(segment_url.media),
number=number,
Expand Down Expand Up @@ -636,6 +650,8 @@ def __init__(self, *args, **kwargs) -> None:
)

self.baseURLs = self.children(BaseURL)
self.segmentBase = self.only_child(SegmentBase, period=self.parent)
self.segmentList = self.only_child(SegmentList, period=self.parent)
self.segmentTemplate = self.only_child(SegmentTemplate, period=self.parent)
self.representations = self.children(Representation, minimum=1, period=self.parent)
self.contentProtection = self.children(ContentProtection)
Expand Down Expand Up @@ -679,13 +695,16 @@ def __init__(self, *args, period: "Period", **kwargs) -> None:
self.presentationTimeOffset = self.attr(
"presentationTimeOffset",
parser=MPDParsers.timedelta(self.timescale),
default=timedelta(),
default=self.defaultSegmentTemplate.presentationTimeOffset if self.defaultSegmentTemplate else timedelta(),
)

self.duration_seconds = self.duration / self.timescale if self.duration and self.timescale else None

# children
self.segmentTimeline = self.only_child(SegmentTimeline)
self.segmentTimeline = (
self.only_child(SegmentTimeline)
or (self.defaultSegmentTemplate.segmentTimeline if self.defaultSegmentTemplate else None)
)

def segments(self, ident: TTimelineIdent, base_url: str, **kwargs) -> Iterator[Segment]:
if kwargs.pop("init", True): # pragma: no branch
Expand Down Expand Up @@ -894,7 +913,7 @@ def __init__(self, *args, period: "Period", **kwargs) -> None:
self.baseURLs = self.children(BaseURL)
self.subRepresentation = self.children(SubRepresentation)
self.segmentBase = self.only_child(SegmentBase, period=self.period)
self.segmentList = self.children(SegmentList, period=self.period)
self.segmentList = self.only_child(SegmentList, period=self.period)
self.segmentTemplate = self.only_child(SegmentTemplate, period=self.period)
self.contentProtection = self.children(ContentProtection)

Expand All @@ -914,7 +933,7 @@ def segments(self, **kwargs) -> Iterator[Segment]:
"""

# segmentBase = self.segmentBase or self.walk_back_get_attr("segmentBase")
segmentLists = self.segmentList or self.walk_back_get_attr("segmentList")
segmentList = self.segmentList or self.walk_back_get_attr("segmentList")
segmentTemplate = self.segmentTemplate or self.walk_back_get_attr("segmentTemplate")

if segmentTemplate:
Expand All @@ -925,9 +944,8 @@ def segments(self, **kwargs) -> Iterator[Segment]:
Bandwidth=int(self.bandwidth * 1000),
**kwargs,
)
elif segmentLists:
for segmentList in segmentLists:
yield from segmentList.segments
elif segmentList:
yield from segmentList.segments()
else:
yield Segment(
url=self.base_url,
Expand Down