diff --git a/packager/live_packager.cc b/packager/live_packager.cc index 7e9291d46c2..893da8d63c3 100644 --- a/packager/live_packager.cc +++ b/packager/live_packager.cc @@ -34,8 +34,9 @@ namespace { using StreamDescriptors = std::vector; -// Shaka requires a non-zero value for segment duration otherwise it throws an error. -// For our use-case of packaging segments individually, this value has no effect. +// Shaka requires a non-zero value for segment duration otherwise it throws an +// error. For our use-case of packaging segments individually, this value has no +// effect. constexpr double DEFAULT_SEGMENT_DURATION = 5.0; const std::string INPUT_FNAME = "memory://input_file"; diff --git a/packager/live_packager_test.cc b/packager/live_packager_test.cc index 91412d35cd0..737e9bf36cf 100644 --- a/packager/live_packager_test.cc +++ b/packager/live_packager_test.cc @@ -661,16 +661,15 @@ TEST_F(LivePackagerBaseTest, CheckContinutityCounter) { } if (ts_packet->payload_unit_start_indicator() && - ts_packet->pid() == media::mp2t::TsSection::kPidPat) { - LOG(WARNING) << "Processing PID=" << ts_packet->pid() << " start_unit=" - << ts_packet->payload_unit_start_indicator() - << " continuity_counter=" - << ts_packet->continuity_counter(); - - // check the PAT continuity counter is in sync with the segment number. + (ts_packet->pid() == media::mp2t::TsSection::kPidPat || + ts_packet->pid() == 0x20)) { + LOG(INFO) << "Processing PID=" << ts_packet->pid() + << " start_unit=" << ts_packet->payload_unit_start_indicator() + << " continuity_counter=" << ts_packet->continuity_counter(); + // check the PAT (PID = 0x0) or PMT (PID = 0x20) continuity counter is + // in sync with the segment number. EXPECT_EQ(ts_packet->continuity_counter(), live_config.segment_number); } - // Go to the next packet. ts_byte_queue.Pop(media::mp2t::TsPacket::kPacketSize); } diff --git a/packager/media/formats/mp2t/continuity_counter.cc b/packager/media/formats/mp2t/continuity_counter.cc index 48f71af6bac..ef769f05304 100644 --- a/packager/media/formats/mp2t/continuity_counter.cc +++ b/packager/media/formats/mp2t/continuity_counter.cc @@ -17,15 +17,11 @@ ContinuityCounter::ContinuityCounter(unsigned int segment_number) ContinuityCounter::~ContinuityCounter() = default; unsigned int ContinuityCounter::GetNext() { - // int ret = counter_; - // ++counter_; - // counter_ %= 16; - // return ret; unsigned int ret = ((counter_++) & 0x0F); return ret; } -unsigned int ContinuityCounter::GetContinuityCounter() const { +unsigned int ContinuityCounter::GetCurrent() const { return counter_; } diff --git a/packager/media/formats/mp2t/continuity_counter.h b/packager/media/formats/mp2t/continuity_counter.h index 54c55e5eec7..05dbb516687 100644 --- a/packager/media/formats/mp2t/continuity_counter.h +++ b/packager/media/formats/mp2t/continuity_counter.h @@ -25,7 +25,7 @@ class ContinuityCounter { unsigned int GetNext(); /// @return the current value of the continuity counter. - [[nodiscard]] unsigned int GetContinuityCounter() const; + [[nodiscard]] unsigned int GetCurrent() const; private: unsigned int counter_; diff --git a/packager/media/formats/mp2t/program_map_table_writer.cc b/packager/media/formats/mp2t/program_map_table_writer.cc index 3deeac9dc10..b76f0e9e97c 100644 --- a/packager/media/formats/mp2t/program_map_table_writer.cc +++ b/packager/media/formats/mp2t/program_map_table_writer.cc @@ -38,69 +38,48 @@ const uint8_t kProgramMapTableId = 0x02; // Table for CRC32/MPEG2. const uint32_t kCrcTable[] = { - 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, - 0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005, - 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61, - 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, - 0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9, - 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75, - 0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, - 0x791d4014, 0x7ddc5da3, 0x709f7b7a, 0x745e66cd, - 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039, - 0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, - 0xbe2b5b58, 0xbaea46ef, 0xb7a96036, 0xb3687d81, - 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d, - 0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, - 0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95, - 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, - 0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, - 0x34867077, 0x30476dc0, 0x3d044b19, 0x39c556ae, - 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072, - 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, - 0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca, - 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde, - 0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, - 0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1, 0x53dc6066, - 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba, - 0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, - 0xbfa1b04b, 0xbb60adfc, 0xb6238b25, 0xb2e29692, - 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6, - 0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, - 0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e, - 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2, - 0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, - 0xd5b88683, 0xd1799b34, 0xdc3abded, 0xd8fba05a, - 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637, - 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, - 0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f, - 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53, - 0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, - 0x36194d42, 0x32d850f5, 0x3f9b762c, 0x3b5a6b9b, - 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff, - 0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, - 0xf12f560e, 0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7, - 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b, - 0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, - 0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3, - 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, - 0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, - 0x9b3660c6, 0x9ff77d71, 0x92b45ba8, 0x9675461f, - 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3, - 0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, - 0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c, - 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8, - 0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, - 0x119b4be9, 0x155a565e, 0x18197087, 0x1cd86d30, - 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec, - 0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, - 0x2497d08d, 0x2056cd3a, 0x2d15ebe3, 0x29d4f654, - 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0, - 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, - 0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18, - 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4, - 0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, - 0x9abc8bd5, 0x9e7d9662, 0x933eb0bb, 0x97ffad0c, - 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668, + 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b, + 0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61, + 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7, + 0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75, + 0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3, + 0x709f7b7a, 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039, + 0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58, 0xbaea46ef, + 0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d, + 0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb, + 0xceb42022, 0xca753d95, 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, + 0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0, + 0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072, + 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x018aeb13, 0x054bf6a4, + 0x0808d07d, 0x0cc9cdca, 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde, + 0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08, + 0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba, + 0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc, + 0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6, + 0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, 0xe0b41de7, 0xe4750050, + 0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2, + 0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34, + 0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637, + 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, 0x4f040d56, 0x4bc510e1, + 0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53, + 0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5, + 0x3f9b762c, 0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff, + 0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e, 0xf5ee4bb9, + 0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b, + 0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd, + 0xcda1f604, 0xc960ebb3, 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, + 0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71, + 0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3, + 0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2, + 0x470cdd2b, 0x43cdc09c, 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8, + 0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e, + 0x18197087, 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec, + 0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a, + 0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0, + 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, 0xe3a1cbc1, 0xe760d676, + 0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4, + 0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662, + 0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668, 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4, }; @@ -222,7 +201,7 @@ ProgramMapTableWriter::ProgramMapTableWriter(Codec codec) // segments ProgramMapTableWriter::ProgramMapTableWriter(Codec codec, unsigned int segment_number) - : codec_(codec), continuity_counter_(ContinuityCounter(segment_number)) {} + : codec_(codec), continuity_counter_(segment_number) {} bool ProgramMapTableWriter::EncryptedSegmentPmt(BufferWriter* writer) { if (encrypted_pmt_.Size() == 0) { diff --git a/packager/media/formats/mp2t/ts_segmenter.cc b/packager/media/formats/mp2t/ts_segmenter.cc index 9002d807e1f..c38bbfae3da 100644 --- a/packager/media/formats/mp2t/ts_segmenter.cc +++ b/packager/media/formats/mp2t/ts_segmenter.cc @@ -101,7 +101,8 @@ Status TsSegmenter::AddSample(const MediaSample& sample) { DCHECK(IsVideoCodec(codec_)); pmt_writer.reset(new VideoProgramMapTableWriter(codec_, segment_number)); } - ts_writer_.reset(new TsWriter(std::move(pmt_writer), segment_number)); + ts_writer_.reset( + new TsStuffingWriter(std::move(pmt_writer), segment_number)); } if (sample.is_encrypted()) diff --git a/packager/media/formats/mp2t/ts_writer.cc b/packager/media/formats/mp2t/ts_writer.cc index daa91f658f5..a4b83a2a539 100644 --- a/packager/media/formats/mp2t/ts_writer.cc +++ b/packager/media/formats/mp2t/ts_writer.cc @@ -15,6 +15,7 @@ #include #include #include +#include namespace shaka { namespace media { @@ -166,10 +167,13 @@ TsWriter::TsWriter(std::unique_ptr pmt_writer) TsWriter::TsWriter(std::unique_ptr pmt_writer, unsigned int segment_number) - : pat_continuity_counter_(ContinuityCounter(segment_number)), + : pat_continuity_counter_(segment_number), pmt_writer_(std::move(pmt_writer)) {} -TsWriter::~TsWriter() {} +TsStuffingWriter::TsStuffingWriter( + std::unique_ptr pmt_writer, + unsigned int segment_number) + : TsWriter(std::move(pmt_writer), segment_number) {} bool TsWriter::NewSegment(BufferWriter* buffer) { BufferWriter psi; @@ -204,6 +208,32 @@ bool TsWriter::AddPesPacket(std::unique_ptr pes_packet, return true; } +bool TsStuffingWriter::AddPesPacket(std::unique_ptr pes_packet, + BufferWriter* buffer) { + if (!WritePesToBuffer(*pes_packet, &elementary_stream_continuity_counter_, + buffer)) { + LOG(ERROR) << "Failed to write pes to buffer."; + return false; + } + + // We must end all ES packets at 0xf so that the next segment can start at + // 0x0. This can be done by stuffing null packets at the end of the segment + // for each elementary stream + do { + const int pid = ProgramMapTableWriter::kElementaryPid; + BufferWriter null_ts_packet_buffer; + null_ts_packet_buffer.AppendInt( + static_cast(TsSection::kPidNullPacket)); + WritePayloadToBufferWriter(null_ts_packet_buffer.Buffer(), + null_ts_packet_buffer.Size(), + !kPayloadUnitStartIndicator, pid, !kHasPcr, 0, + &elementary_stream_continuity_counter_, buffer); + } while ((elementary_stream_continuity_counter_.GetCurrent() & 0x0F) != 0); + + // No need to keep pes_packet around so not passing it anywhere. + return true; +} + } // namespace mp2t } // namespace media } // namespace shaka diff --git a/packager/media/formats/mp2t/ts_writer.h b/packager/media/formats/mp2t/ts_writer.h index ae8ba690c0e..975f8e2a006 100644 --- a/packager/media/formats/mp2t/ts_writer.h +++ b/packager/media/formats/mp2t/ts_writer.h @@ -38,7 +38,7 @@ class TsWriter { /// packets. TsWriter(std::unique_ptr pmt_writer, unsigned int segment_number); - virtual ~TsWriter(); + virtual ~TsWriter() = default; /// This will fail if the current segment is not finalized. /// @param buffer to write segment data. @@ -53,7 +53,11 @@ class TsWriter { /// @param pes_packet gets added to the writer. /// @param buffer to write pes packet. /// @return true on success, false otherwise. - virtual bool AddPesPacket(std::unique_ptr pes_packet, BufferWriter* buffer); + virtual bool AddPesPacket(std::unique_ptr pes_packet, + BufferWriter* buffer); + + protected: + ContinuityCounter elementary_stream_continuity_counter_; private: TsWriter(const TsWriter&) = delete; @@ -63,11 +67,20 @@ class TsWriter { bool encrypted_ = false; ContinuityCounter pat_continuity_counter_; - ContinuityCounter elementary_stream_continuity_counter_; std::unique_ptr pmt_writer_; }; +/// TsWriter to handle stuffing null TS Packets +class TsStuffingWriter : public TsWriter { + public: + TsStuffingWriter(std::unique_ptr pmt_writer, + unsigned int segment_number); + + bool AddPesPacket(std::unique_ptr pes_packet, + BufferWriter* buffer) override; +}; + } // namespace mp2t } // namespace media } // namespace shaka