fix: regenerate expected ts with packet stuffing

Pluto-tv · Jan 25, 2024 · 0120de1 · 0120de1
1 parent 857a285
commit 0120de1
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 3 deletions.
diff --git a/packager/live_packager_test.cc b/packager/live_packager_test.cc
@@ -550,12 +550,14 @@ TEST_F(LivePackagerBaseTest, VerifyAes128WithDecryption) {
     live_config.format = LiveConfig::OutputFormat::TS;
     live_config.track_type = LiveConfig::TrackType::VIDEO;
     live_config.protection_scheme = LiveConfig::EncryptionScheme::AES_128;
+    live_config.segment_number = i;
 
     SetupLivePackagerConfig(live_config);
     ASSERT_EQ(Status::OK, live_packager_->Package(init_seg, media_seg, out));
     ASSERT_GT(out.SegmentSize(), 0);
 
-    std::string exp_segment_num = absl::StrFormat("expected/ts/%04d.ts", i + 1);
+    std::string exp_segment_num =
+        absl::StrFormat("expected/stuffing_ts/%04d.ts", i + 1);
     std::vector<uint8_t> exp_segment_buffer = ReadTestDataFile(exp_segment_num);
     ASSERT_FALSE(exp_segment_buffer.empty());
 
@@ -564,8 +566,7 @@ TEST_F(LivePackagerBaseTest, VerifyAes128WithDecryption) {
                                 out.SegmentData() + out.SegmentSize());
 
     ASSERT_TRUE(decryptor.Crypt(buffer, &decrypted));
-    // TODO(Fordyce): with null packet stuffing this is no longer valid
-    // ASSERT_EQ(decrypted, exp_segment_buffer);
+    ASSERT_EQ(decrypted, exp_segment_buffer);
   }
 }
 

diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0001.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0001.ts
diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0002.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0002.ts
diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0003.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0003.ts
diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0004.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0004.ts
diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0005.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0005.ts
diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0006.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0006.ts
diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0007.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0007.ts
diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0008.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0008.ts
diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0009.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0009.ts
diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0010.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0010.ts