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

Fix CRC for PMT and PAT 

- CRC for PMT and PAT should be CRC-32/MPEG2.

Change-Id: I9fafdbd6df46fc960c4f0e205f70be701bf7629f
This commit is contained in:
Rintaro Kuroiwa 2016-04-13 21:25:15 -07:00
parent 49e87a34a3
commit 4391f247ac
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packager/media/formats/mp2t/ts_writer.cc
View File

@ -60,7 +60,7 @@ const uint8_t kPat[] = {
0xE0, // first 3 bits is reserved. 0xE0, // first 3 bits is reserved.
kPmtPid, kPmtPid,
// CRC32. // CRC32.
0xAB, 0xB9, 0x9E, 0x9D, 0xF9, 0x62, 0xF5, 0x8B,
}; };
// Like PAT, with encryption different PMTs are required. // Like PAT, with encryption different PMTs are required.
@ -81,7 +81,7 @@ const uint8_t kPmtH264[] = {
kStreamTypeH264, 0xE0, kElementaryPid, // stream_type -> PID. kStreamTypeH264, 0xE0, kElementaryPid, // stream_type -> PID.
0xF0, 0x00, // Es_info_length is 0. 0xF0, 0x00, // Es_info_length is 0.
// CRC32. // CRC32.
0x56, 0x90, 0xF4, 0xEB, 0x43, 0x49, 0x97, 0xBE,
}; };
const uint8_t kPmtAac[] = { const uint8_t kPmtAac[] = {
@ -100,7 +100,7 @@ const uint8_t kPmtAac[] = {
kStreamTypeAdtsAac, 0xE0, kElementaryPid, // stream_type -> PID. kStreamTypeAdtsAac, 0xE0, kElementaryPid, // stream_type -> PID.
0xF0, 0x00, // Es_info_length is 0. 0xF0, 0x00, // Es_info_length is 0.
// CRC32. // CRC32.
0xC3, 0xF0, 0xC5, 0xA9, 0xE0, 0x6F, 0x1A, 0x31,
}; };
const bool kHasPcr = true; const bool kHasPcr = true;

4
packager/media/formats/mp2t/ts_writer_unittest.cc
View File

@ -170,7 +170,7 @@ TEST_F(TsWriterTest, NewSegment) {
0xE0, // first 3 bits is reserved. 0xE0, // first 3 bits is reserved.
0x20, // PMT PID. 0x20, // PMT PID.
// CRC32. // CRC32.
0xAB, 0xB9, 0x9E, 0x9D, 0xf9, 0x62, 0xf5, 0x8b,
}; };
EXPECT_NO_FATAL_FAILURE(ExpectTsPacketEqual( EXPECT_NO_FATAL_FAILURE(ExpectTsPacketEqual(
@ -202,7 +202,7 @@ TEST_F(TsWriterTest, NewSegment) {
0x1B, 0xE0, 0x50, // stream_type -> PID. 0x1B, 0xE0, 0x50, // stream_type -> PID.
0xF0, 0x00, // Es_info_length is 0. 0xF0, 0x00, // Es_info_length is 0.
// CRC32. // CRC32.
0x56, 0x90, 0xF4, 0xEB, 0x43, 0x49, 0x97, 0xbe,
}; };
EXPECT_NO_FATAL_FAILURE(ExpectTsPacketEqual( EXPECT_NO_FATAL_FAILURE(ExpectTsPacketEqual(