blackicedbear/devine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass save path to DRM decrypt functions directly

Browse Source 
This is required in segmented scenarios when multi-threaded where the same `track.path` would be get and set from possibly at the same time. It's also just better logically to do it this way.
This commit is contained in:
rlaphoenix
2023-02-21 16:09:35 +00:00
parent 8268825ba8
commit 314079c75f
5 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -414,12 +414,9 @@ class DASH:
session.headers,
proxy
))
# TODO: More like `segment.path`, but this will do for now
# Needed for the drm.decrypt() call couple lines down
track.path = segment_save_path
if isinstance(track, Audio) or init_data:
with open(track.path, "rb+") as f:
with open(segment_save_path, "rb+") as f:
segment_data = f.read()
if isinstance(track, Audio):
# fix audio decryption on ATVP by fixing the sample description index
@@ -437,7 +434,8 @@ class DASH:
if drm:
# TODO: What if the manifest does not mention DRM, but has DRM
drm.decrypt(track)
drm.decrypt(segment_save_path)
track.drm = None
if callable(track.OnDecrypted):
track.OnDecrypted(track)
elif segment_list is not None:
@@ -485,12 +483,9 @@ class DASH:
proxy,
byte_range=segment_url.get("mediaRange")
))
# TODO: More like `segment.path`, but this will do for now
# Needed for the drm.decrypt() call couple lines down
track.path = segment_save_path
if isinstance(track, Audio) or init_data:
with open(track.path, "rb+") as f:
with open(segment_save_path, "rb+") as f:
segment_data = f.read()
if isinstance(track, Audio):
# fix audio decryption on ATVP by fixing the sample description index
@@ -508,7 +503,8 @@ class DASH:
if drm:
# TODO: What if the manifest does not mention DRM, but has DRM
drm.decrypt(track)
drm.decrypt(segment_save_path)
track.drm = None
if callable(track.OnDecrypted):
track.OnDecrypted(track)
elif segment_base is not None or base_url: