Skip to content

fix: Correctly set Data in mp4.NewPsshBox #498

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
kralewitz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Correctly set Data in mp4.NewPsshBox #498

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
2 changes: 1 addition & 1 deletion mp4/pssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func NewPsshBox(systemID string, KIDs []string, data []byte) (*PsshBox, error) {
Flags: 0,
SystemID: sysIdUUID,
KIDs: nil,
Data: nil,
Data: data,
}
if len(KIDs) > 0 {
b.Version = 1
Expand Down
28 changes: 24 additions & 4 deletions mp4/pssh_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,14 @@ func TestNewPsshBox(t *testing.T) {
systemID string
kIDs []string
data []byte
version byte
err bool
}{
{"only UUID", "9a04f079-9840-4286-ab92-e65be0885f95", nil, []byte("data"), false},
{"bad UUID", "invalid-uuid", nil, []byte("data"), true},
{"bad KID", "9a04f079-9840-4286-ab92-e65be0885f95", []string{"invalid-uuid"}, []byte("data"), true},
{"only UUID", "9a04f079-9840-4286-ab92-e65be0885f95", nil, []byte("data"), 0, false},
{"bad UUID", "invalid-uuid", nil, []byte("data"), 0, true},
{"bad KID", "9a04f079-9840-4286-ab92-e65be0885f95", []string{"invalid-uuid"}, []byte("data"), 0, true},
{"v1 with KID", "9a04f079-9840-4286-ab92-e65be0885f95",
[]string{"00112233445566778899aabbccddeeff"}, []byte("data"), false},
[]string{"00112233445566778899aabbccddeeff"}, []byte("data"), 1, false},
}

for _, c := range cases {
Expand All @@ -108,6 +109,25 @@ func TestNewPsshBox(t *testing.T) {
t.Errorf("Expected no error, got: %v", err)
case !c.err && err == nil:
boxDiffAfterEncodeAndDecode(t, pssh)

if c.version != pssh.Version {
t.Errorf("Expected version to be %v, got %v", c.version, pssh.Version)
}

if !bytes.Equal(c.data, pssh.Data) {
t.Errorf("Expected data to be %v, got %v", c.data, pssh.Data)
}

if len(pssh.KIDs) != len(c.kIDs) {
t.Errorf("Expected %d KIDs, got %v", len(c.kIDs), len(pssh.KIDs))
}

for i, kid := range pssh.KIDs {
gotKid := strings.ReplaceAll(kid.String(), "-", "")
if gotKid != c.kIDs[0] {
t.Errorf("Expected KID %d to be %q, got %q", i, c.kIDs[i], gotKid)
}
}
}
})
}
Expand Down