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

Specify DASH Track Key IDs to prepare_drm

This commit is contained in:
rlaphoenix 2023-03-08 22:41:58 +00:00
parent 923cb71f81
commit a549cc6afb
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

@ -330,6 +330,7 @@ class DASH:
track.descriptor = track.Descriptor.URL track.descriptor = track.Descriptor.URL
else: else:
segments: list[tuple[str, Optional[str]]] = [] segments: list[tuple[str, Optional[str]]] = []
track_kid: Optional[UUID] = None
if segment_template is not None: if segment_template is not None:
segment_template = copy(segment_template) segment_template = copy(segment_template)
@ -357,6 +358,7 @@ class DASH:
)) ))
res.raise_for_status() res.raise_for_status()
init_data = res.content init_data = res.content
track_kid = track.get_key_id(init_data)
if segment_timeline is not None: if segment_timeline is not None:
seg_time_list = [] seg_time_list = []
@ -408,6 +410,7 @@ class DASH:
res = session.get(source_url) res = session.get(source_url)
res.raise_for_status() res.raise_for_status()
init_data = res.content init_data = res.content
track_kid = track.get_key_id(init_data)
segment_urls = segment_list.findall("SegmentURL") segment_urls = segment_list.findall("SegmentURL")
for segment_url in segment_urls: for segment_url in segment_urls:
@ -432,12 +435,14 @@ class DASH:
log.warning("No Widevine PSSH was found for this track, is it DRM free?") log.warning("No Widevine PSSH was found for this track, is it DRM free?")
if track.drm: if track.drm:
# last chance to find the KID
track_kid = track_kid or track.get_key_id(url=segments[0], session=session)
# license and grab content keys # license and grab content keys
drm = track.drm[0] # just use the first supported DRM system for now drm = track.drm[0] # just use the first supported DRM system for now
if isinstance(drm, Widevine): if isinstance(drm, Widevine):
if not license_widevine: if not license_widevine:
raise ValueError("license_widevine func must be supplied to use Widevine DRM") raise ValueError("license_widevine func must be supplied to use Widevine DRM")
license_widevine(drm) license_widevine(drm, track_kid=track_kid)
else: else:
drm = None drm = None