diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-11-10 15:43:51 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-11-10 15:43:51 -0500 |
| commit | b0e23e79e72b7892b826fabea4f9e02c421d2861 (patch) | |
| tree | 26f20aea660514c213a3ae942eab222e5ccebde3 /media/psshparser/gtest | |
| parent | 03590a6711d601ef3ddb48787e9f3f556705b5db (diff) | |
| parent | b00601953bade944cd6df9cde6fcdd1f10d76feb (diff) | |
| download | UXP-b0e23e79e72b7892b826fabea4f9e02c421d2861.tar UXP-b0e23e79e72b7892b826fabea4f9e02c421d2861.tar.gz UXP-b0e23e79e72b7892b826fabea4f9e02c421d2861.tar.lz UXP-b0e23e79e72b7892b826fabea4f9e02c421d2861.tar.xz UXP-b0e23e79e72b7892b826fabea4f9e02c421d2861.zip | |
Merge branch 'master' into mailnews-work
Diffstat (limited to 'media/psshparser/gtest')
| -rw-r--r-- | media/psshparser/gtest/TestPsshParser.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/media/psshparser/gtest/TestPsshParser.cpp b/media/psshparser/gtest/TestPsshParser.cpp index 972cc3e7d..5372c7598 100644 --- a/media/psshparser/gtest/TestPsshParser.cpp +++ b/media/psshparser/gtest/TestPsshParser.cpp @@ -113,15 +113,6 @@ const uint8_t g2xGoogleWPTCencInitData[] = { 0x00, 0x00, 0x00, 0x00 // datasize }; -const uint8_t gPrimetimePSSH[] = { - 0x00, 0x00, 0x00, 0x00, // size = 0 - 0x70, 0x73, 0x73, 0x68, // 'pssh' - 0x01, // version = 1 - 0x00, 0x00, 0x00, // flags - 0xf2, 0x39, 0xe7, 0x69, 0xef, 0xa3, 0x48, 0x50, // Primetime system Id - 0x9c, 0x16, 0xa9, 0x03, 0xc6, 0x93, 0x2e, 0xfb -}; - TEST(PsshParser, ParseCencInitData) { std::vector<std::vector<uint8_t>> keyIds; bool rv; @@ -162,8 +153,4 @@ TEST(PsshParser, ParseCencInitData) { EXPECT_EQ(16u, keyIds[1].size()); EXPECT_EQ(0, memcmp(&keyIds[0].front(), &g2xGoogleWPTCencInitData[32], 16)); EXPECT_EQ(0, memcmp(&keyIds[1].front(), &g2xGoogleWPTCencInitData[84], 16)); - - rv = ParseCENCInitData(gPrimetimePSSH, MOZ_ARRAY_LENGTH(gPrimetimePSSH), keyIds); - EXPECT_TRUE(rv); - EXPECT_EQ(0u, keyIds.size()); } |