[MPEG-TS] Fix PCR reserved bits not being set correctly

Fixes #893.
shaka-project · Feb 3, 2021 · 36ef7ec · 36ef7ec
1 parent 449945d
commit 36ef7ec
Show file tree

Hide file tree

Showing 71 changed files with 3 additions and 3 deletions.
diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-1.ts
diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-2.ts
diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-3.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-3.ts
diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-1.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-1.ts
diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-2.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-2.ts
diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-3.ts
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-1.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-1.ts
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-2.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-2.ts
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-3.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-3.ts
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-1.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-1.ts
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-2.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-2.ts
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-3.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-3.ts
diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-1.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-1.ts
diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-2.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-2.ts
diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-3.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-3.ts
diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-1.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-1.ts
diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-2.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-2.ts
diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-3.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-3.ts
diff --git a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-1.ts b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-1.ts
diff --git a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-2.ts b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-2.ts
diff --git a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/bear-640x360-video-3.ts
diff --git a/...ger/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-1.ts b/...ger/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-1.ts
diff --git a/...ger/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-2.ts b/...ger/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-2.ts
diff --git a/...ger/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-3.ts b/...ger/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/bear-640x360-ac3-video-3.ts
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-1.ts
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-2.ts
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-3.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-3.ts
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-1.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-1.ts
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-2.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-2.ts
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-3.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-1.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-2.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-3.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-3.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-1.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-1.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-2.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-2.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-3.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-1.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-2.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-3.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-3.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-1.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-1.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-2.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-2.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-3.ts
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-1.ts
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-2.ts
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-3.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-3.ts
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-1.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-1.ts
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-2.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-2.ts
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-3.ts
diff --git a/.../testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-1.ts b/.../testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-1.ts
diff --git a/.../testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-2.ts b/.../testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-2.ts
diff --git a/.../testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-3.ts b/.../testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-3.ts
diff --git a/.../testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-4.ts b/.../testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-4.ts
diff --git a/.../testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-5.ts b/.../testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-5.ts
diff --git a/.../testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-6.ts b/.../testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-6.ts
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-1.ts
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-2.ts
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-3.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-3.ts
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-1.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-1.ts
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-2.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-2.ts
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-3.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-3.ts
diff --git a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-1.ts b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-1.ts
diff --git a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-2.ts b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-2.ts
diff --git a/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-3.ts b/packager/app/test/testdata/ec3-packed-audio-encrypted/bear-640x360-ec3-video-3.ts
diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-1.ts b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-1.ts
diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-2.ts b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-2.ts
diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-3.ts b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-3.ts
diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-1.ts b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-1.ts
diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-2.ts b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-2.ts
diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-3.ts b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-3.ts
diff --git a/packager/media/formats/mp2t/ts_packet_writer_util.cc b/packager/media/formats/mp2t/ts_packet_writer_util.cc
@@ -97,7 +97,7 @@ void WriteAdaptationField(bool has_pcr,
     const uint32_t most_significant_32bits_pcr =
         static_cast<uint32_t>(pcr_base >> 1);
     const uint16_t pcr_last_bit_reserved_and_pcr_extension =
-        ((pcr_base & 1) << 15);
+        ((pcr_base & 1) << 15) | 0x7e00;  // Set the 6 reserved bits to '1'
     writer->AppendInt(most_significant_32bits_pcr);
     writer->AppendInt(pcr_last_bit_reserved_and_pcr_extension);
     remaining_bytes -= kPcrFieldsSize;

diff --git a/packager/media/formats/mp2t/ts_writer_unittest.cc b/packager/media/formats/mp2t/ts_writer_unittest.cc
@@ -319,7 +319,7 @@ TEST_F(TsWriterTest, AddPesPacket) {
       0x30,  // Adaptation field and payload are both present. counter = 0.
       0xA0,  // Adaptation Field length.
       0x10,  // pcr flag.
-      0x00, 0x00, 0x04, 0x80, 0x00, 0x00,  // PCR.
+      0x00, 0x00, 0x04, 0x80, 0x7e, 0x00,  // PCR.
   };
 
   const uint8_t kExpectedPayload[] = {
@@ -411,7 +411,7 @@ TEST_F(TsWriterTest, PesPtsZeroNoDts) {
       0x30,  // Adaptation field and payload are both present. counter = 0.
       0xA5,  // Adaptation Field length.
       0x10,  // pcr flag.
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // PCR.
+      0x00, 0x00, 0x00, 0x00, 0x7e, 0x00,  // PCR.
   };
 
   const uint8_t kExpectedPayload[] = {