From 74cfd2ad7927e875b1d0602aa470e21eac8371b4 Mon Sep 17 00:00:00 2001 From: rohks Date: Wed, 14 Aug 2024 05:33:31 -0700 Subject: [PATCH] Deduplicate AMR samples and use dump file prefix for unique names AMR samples with identical data but different names, previously used to generate uniquely named dump files, have been deleted. Instead, `AssertionConfig` is now used to set the dump file prefix, ensuring files are generated with unique names. PiperOrigin-RevId: 662883541 --- .../amr/AmrExtractorParameterizedTest.java | 10 ++++++++-- ... => sample_nb_cbr_seeking_enabled.amr.0.dump} | 0 ... => sample_nb_cbr_seeking_enabled.amr.1.dump} | 0 ... => sample_nb_cbr_seeking_enabled.amr.2.dump} | 0 ... => sample_nb_cbr_seeking_enabled.amr.3.dump} | 0 ..._cbr_seeking_enabled.amr.unknown_length.dump} | 0 ... => sample_wb_cbr_seeking_enabled.amr.0.dump} | 0 ... => sample_wb_cbr_seeking_enabled.amr.1.dump} | 0 ... => sample_wb_cbr_seeking_enabled.amr.2.dump} | 0 ... => sample_wb_cbr_seeking_enabled.amr.3.dump} | 0 ..._cbr_seeking_enabled.amr.unknown_length.dump} | 0 .../src/test/assets/media/amr/sample_nb_cbr.amr | Bin 2840 -> 0 bytes .../src/test/assets/media/amr/sample_wb_cbr.amr | Bin 4065 -> 0 bytes 13 files changed, 8 insertions(+), 2 deletions(-) rename libraries/test_data/src/test/assets/extractordumps/amr/{sample_nb_cbr.amr.0.dump => sample_nb_cbr_seeking_enabled.amr.0.dump} (100%) rename libraries/test_data/src/test/assets/extractordumps/amr/{sample_nb_cbr.amr.1.dump => sample_nb_cbr_seeking_enabled.amr.1.dump} (100%) rename libraries/test_data/src/test/assets/extractordumps/amr/{sample_nb_cbr.amr.2.dump => sample_nb_cbr_seeking_enabled.amr.2.dump} (100%) rename libraries/test_data/src/test/assets/extractordumps/amr/{sample_nb_cbr.amr.3.dump => sample_nb_cbr_seeking_enabled.amr.3.dump} (100%) rename libraries/test_data/src/test/assets/extractordumps/amr/{sample_nb_cbr.amr.unknown_length.dump => sample_nb_cbr_seeking_enabled.amr.unknown_length.dump} (100%) rename libraries/test_data/src/test/assets/extractordumps/amr/{sample_wb_cbr.amr.0.dump => sample_wb_cbr_seeking_enabled.amr.0.dump} (100%) rename libraries/test_data/src/test/assets/extractordumps/amr/{sample_wb_cbr.amr.1.dump => sample_wb_cbr_seeking_enabled.amr.1.dump} (100%) rename libraries/test_data/src/test/assets/extractordumps/amr/{sample_wb_cbr.amr.2.dump => sample_wb_cbr_seeking_enabled.amr.2.dump} (100%) rename libraries/test_data/src/test/assets/extractordumps/amr/{sample_wb_cbr.amr.3.dump => sample_wb_cbr_seeking_enabled.amr.3.dump} (100%) rename libraries/test_data/src/test/assets/extractordumps/amr/{sample_wb_cbr.amr.unknown_length.dump => sample_wb_cbr_seeking_enabled.amr.unknown_length.dump} (100%) delete mode 100644 libraries/test_data/src/test/assets/media/amr/sample_nb_cbr.amr delete mode 100644 libraries/test_data/src/test/assets/media/amr/sample_wb_cbr.amr diff --git a/libraries/extractor/src/test/java/androidx/media3/extractor/amr/AmrExtractorParameterizedTest.java b/libraries/extractor/src/test/java/androidx/media3/extractor/amr/AmrExtractorParameterizedTest.java index 607f91e919..65972027bc 100644 --- a/libraries/extractor/src/test/java/androidx/media3/extractor/amr/AmrExtractorParameterizedTest.java +++ b/libraries/extractor/src/test/java/androidx/media3/extractor/amr/AmrExtractorParameterizedTest.java @@ -59,7 +59,10 @@ public final class AmrExtractorParameterizedTest { public void extractingNarrowBandSamples_withSeeking() throws Exception { ExtractorAsserts.assertBehavior( createAmrExtractorFactory(/* withSeeking= */ true), - "media/amr/sample_nb_cbr.amr", + "media/amr/sample_nb.amr", + new ExtractorAsserts.AssertionConfig.Builder() + .setDumpFilesPrefix("extractordumps/amr/sample_nb_cbr_seeking_enabled.amr") + .build(), simulationConfig); } @@ -67,7 +70,10 @@ public final class AmrExtractorParameterizedTest { public void extractingWideBandSamples_withSeeking() throws Exception { ExtractorAsserts.assertBehavior( createAmrExtractorFactory(/* withSeeking= */ true), - "media/amr/sample_wb_cbr.amr", + "media/amr/sample_wb.amr", + new ExtractorAsserts.AssertionConfig.Builder() + .setDumpFilesPrefix("extractordumps/amr/sample_wb_cbr_seeking_enabled.amr") + .build(), simulationConfig); } diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.0.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.0.dump similarity index 100% rename from libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.0.dump rename to libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.0.dump diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.1.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.1.dump similarity index 100% rename from libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.1.dump rename to libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.1.dump diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.2.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.2.dump similarity index 100% rename from libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.2.dump rename to libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.2.dump diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.3.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.3.dump similarity index 100% rename from libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.3.dump rename to libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.3.dump diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.unknown_length.dump similarity index 100% rename from libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.unknown_length.dump rename to libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.unknown_length.dump diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.0.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.0.dump similarity index 100% rename from libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.0.dump rename to libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.0.dump diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.1.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.1.dump similarity index 100% rename from libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.1.dump rename to libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.1.dump diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.2.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.2.dump similarity index 100% rename from libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.2.dump rename to libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.2.dump diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.3.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.3.dump similarity index 100% rename from libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.3.dump rename to libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.3.dump diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.unknown_length.dump similarity index 100% rename from libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.unknown_length.dump rename to libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.unknown_length.dump diff --git a/libraries/test_data/src/test/assets/media/amr/sample_nb_cbr.amr b/libraries/test_data/src/test/assets/media/amr/sample_nb_cbr.amr deleted file mode 100644 index 2e21cc843ccadc6ce066687371b95df0e568a07d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2840 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 diff --git a/libraries/test_data/src/test/assets/media/amr/sample_wb_cbr.amr b/libraries/test_data/src/test/assets/media/amr/sample_wb_cbr.amr deleted file mode 100644 index 14b85b553c5ea842da30eb875b2d6581bed14152..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4065 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