Skip to content

Fix parsing of senc box #33

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

Open
paroga wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −4
Open

Fix parsing of senc box #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions src/pymp4/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,14 +725,16 @@ def _encode(self, obj, context):
"has_subsample_encryption_info" / Flag,
Padding(1)
),
"sample_encryption_info" / PrefixedArray(Int32ub, Struct(
"sample_encryption_info" / IfThenElse(this.flags.has_subsample_encryption_info, PrefixedArray(Int32ub, Struct(
"iv" / Bytes(8),
# include the sub sample encryption information
"subsample_encryption_info" / Default(If(this.flags.has_subsample_encryption_info, PrefixedArray(Int16ub, Struct(
"subsample_encryption_info" / PrefixedArray(Int16ub, Struct(
"clear_bytes" / Int16ub,
"cipher_bytes" / Int32ub
))), None)
))
)),
)), PrefixedArray(Int32ub, Struct(
"iv" / Bytes(8),
))),
)

OriginalFormatBox = Struct(
Expand Down
23 changes: 23 additions & 0 deletions tests/test_box.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,29 @@ def test_moov_build(self):
b'\x00\x00\x00\x20trex\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
)

def test_senc_parse(self):
in_bytes = b'\x00\x00\x00\x18senc\x00\x00\x00\x00\x00\x00\x00\x01abcdefgh'
self.assertEqual(
Box.parse(in_bytes + b'padding'),
Container(offset=0)
(type=b"senc")(version=0)(flags=Container(has_subsample_encryption_info=False))
(sample_encryption_info=[
Container(iv=b'abcdefgh')
])(end=len(in_bytes))
)

in_bytes = b'\x00\x00\x00\x20senc\x00\x00\x00\x02\x00\x00\x00\x01abcdefgh\x00\x01\x99\x88\x77\x66\x55\x44'
self.assertEqual(
Box.parse(in_bytes + b'padding'),
Container(offset=0)
(type=b"senc")(version=0)(flags=Container(has_subsample_encryption_info=True))
(sample_encryption_info=[
Container(iv=b'abcdefgh', subsample_encryption_info=[
Container(clear_bytes=0x9988, cipher_bytes=0x77665544)
])
])(end=len(in_bytes))
)

def test_smhd_parse(self):
in_bytes = b'\x00\x00\x00\x10smhd\x00\x00\x00\x00\x00\x00\x00\x00'
self.assertEqual(
Expand Down