fix: retain mehd box after re-encryption

Pluto-tv · May 13, 2024 · 921a7a7 · 921a7a7
1 parent 1696776
commit 921a7a7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/packager/live_packager_test.cc b/packager/live_packager_test.cc
@@ -915,12 +915,18 @@ TEST_F(LivePackagerBaseTest, MehdBoxIncluded) {
   live_config.decryption_key_id = HexStringToVector(kKeyIdHex);
   SetupLivePackagerConfig(live_config);
 
-  SegmentData init_seg(init_segment_buffer.data(),
-                       init_segment_buffer.size());
+  SegmentData init_seg(init_segment_buffer.data(), init_segment_buffer.size());
   SegmentBuffer actual_buf;
   const auto status = live_packager_->PackageInit(init_seg, actual_buf);
   ASSERT_EQ(Status::OK, status);
   ASSERT_GT(actual_buf.Size(), 0);
+
+  media::mp4::Movie exp_moov;
+  ASSERT_TRUE(GetBox(init_seg, exp_moov));
+  media::mp4::Movie act_moov;
+  ASSERT_TRUE(GetBox(actual_buf, act_moov));
+
+  ASSERT_EQ(exp_moov.extends.header, act_moov.extends.header);
 }
 
 TEST_F(LivePackagerBaseTest, EncryptionFailure) {

diff --git a/packager/media/formats/mp4/mp4_muxer.cc b/packager/media/formats/mp4/mp4_muxer.cc
@@ -247,6 +247,7 @@ Status MP4Muxer::DelayInitializeMuxer() {
     if (codec_fourcc != FOURCC_avc3 && codec_fourcc != FOURCC_hev1)
       ftyp->compatible_brands.push_back(FOURCC_cmfc);
 
+    // Carry over movie extends header duration from init segment.
     moov->extends.header.fragment_duration = streams()[0].get()->duration();
   }
 
@@ -256,8 +257,6 @@ Status MP4Muxer::DelayInitializeMuxer() {
 
   moov->tracks.resize(streams().size());
   moov->extends.tracks.resize(streams().size());
-//  const StreamInfo* stream_info = streams()[0].get();
-//  moov->extends.header.fragment_duration = stream_info->duration();
 
   // Initialize tracks.
   for (uint32_t i = 0; i < streams().size(); ++i) {