Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[pssh-box] Support generating Widevine PSSH without content-id 

Widevine PSSH with key-id and without content-id is now be supported.

Change-Id: I356590b79f79ff4c0310b22e5dc19b6d24ec4cee
This commit is contained in:
KongQun Yang 2017-09-12 11:03:44 -07:00
parent c9cc68ba82
commit 27c1900f12
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packager/tools/pssh/pssh-box.py
View File

@ -162,7 +162,9 @@ def _generate_widevine_data(key_ids, content_id, provider, protection_scheme):
"""Generate widevine pssh data.""" """Generate widevine pssh data."""
wv = widevine_pssh_data_pb2.WidevinePsshData() wv = widevine_pssh_data_pb2.WidevinePsshData()
wv.key_id.extend(key_ids) wv.key_id.extend(key_ids)
wv.provider = provider or '' if provider:
wv.provider = provider
if content_id:
wv.content_id = content_id wv.content_id = content_id
# 'cenc' is the default, so omitted to save bytes. # 'cenc' is the default, so omitted to save bytes.
if protection_scheme and protection_scheme != 'cenc': if protection_scheme and protection_scheme != 'cenc':
@ -404,16 +406,22 @@ def main(all_args):
if ns.content_id: if ns.content_id:
if ns.system_id != WIDEVINE_SYSTEM_ID: if ns.system_id != WIDEVINE_SYSTEM_ID:
raise Exception('--content-id only valid with Widevine system ID') raise Exception('--content-id only valid with Widevine system ID')
pssh_data = _generate_widevine_data(ns.key_id, ns.content_id, ns.provider,
ns.protection_scheme)
# Ignore if we have no data. # Ignore if we have no data.
if not pssh_data and not ns.key_id and not ns.system_id: if not pssh_data and not ns.key_id and not ns.system_id:
continue continue
if not ns.system_id: if not ns.system_id:
raise Exception('System ID is required') raise Exception('System ID is required')
if ns.system_id == WIDEVINE_SYSTEM_ID:
version = 1 if ns.key_id and not ns.content_id else 0 # Always generate version 0 for Widevine for backward compatibility.
version = 0
if not pssh_data:
if not ns.key_id and not ns.content_id:
raise Exception('Widevine system needs key-id or content-id or both')
pssh_data = _generate_widevine_data(ns.key_id, ns.content_id,
ns.provider, ns.protection_scheme)
else:
version = 1 if ns.key_id else 0
boxes.append(Pssh(version, ns.system_id, ns.key_id, pssh_data)) boxes.append(Pssh(version, ns.system_id, ns.key_id, pssh_data))
if output_format == 'human' or not output_format: if output_format == 'human' or not output_format: