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 script] Fix invalid hex_16_bytes error on lower case input 

Change-Id: I274634f9076500156527c04bc9cbb9f86da3c6bd
This commit is contained in:
Kongqun Yang 2016-07-25 11:54:07 -07:00
parent ad95b9d8de
commit 01e53ee946
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -266,11 +266,15 @@ def _parse_boxes(data):
def _create_argument_parser(): def _create_argument_parser():
"""Creates an argument parser.""" """Creates an argument parser."""
def hex_16_bytes(string): def hex_16_bytes(string):
if not string or len(string) != 32: if not string or len(string) != 32:
raise argparse.ArgumentTypeError( raise argparse.ArgumentTypeError(
'Must be a 32-character hex string, %d given' % len(string)) 'Must be a 32-character hex string, %d given' % len(string))
return base64.b16decode(string) return base64.b16decode(string.upper())
def hex_bytes(string):
return base64.b16decode(string.upper())
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
formatter_class=argparse.RawDescriptionHelpFormatter, formatter_class=argparse.RawDescriptionHelpFormatter,
@ -317,7 +321,7 @@ generate a v0 PSSH box for compatibility reasons.""")
inputs.add_argument('--from-hex', inputs.add_argument('--from-hex',
metavar='<hex-string>', metavar='<hex-string>',
dest='input', dest='input',
type=base64.b16decode, type=hex_bytes,
help='Parse the given hexadecimal encoded PSSH box') help='Parse the given hexadecimal encoded PSSH box')
system_ids = parser.add_mutually_exclusive_group() system_ids = parser.add_mutually_exclusive_group()
@ -349,7 +353,7 @@ generate a v0 PSSH box for compatibility reasons.""")
help='Sets the extra data') help='Sets the extra data')
extra.add_argument('--content-id', extra.add_argument('--content-id',
metavar='<hex-string>', metavar='<hex-string>',
type=base64.b16decode, type=hex_bytes,
help='Sets the content ID of the Widevine PSSH data') help='Sets the content ID of the Widevine PSSH data')
extra.add_argument('--provider', extra.add_argument('--provider',
metavar='<string>', metavar='<string>',