Update test code based on the latest code structure

2025-04-30 06:46:50 +08:00 · 2024-11-18 10:29:40 +08:00 · 2024-11-18 10:29:40 +08:00 · 7b3effb871
commit 7b3effb871
parent 1381c92d76
7 changed files with 413 additions and 5 deletions
--- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Mp4PlaybackTest.java
+++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Mp4PlaybackTest.java
@ -50,6 +50,7 @@ public class Mp4PlaybackTest {
        "sample_ac3_fragmented.mp4",
        "sample_ac3.mp4",
        "sample_ac4_fragmented.mp4",
+        "sample_ac4_level4_fragmented.mp4",
        "sample_ac4.mp4",
        "sample_android_slow_motion.mp4",
        "sample_eac3_fragmented.mp4",
--- a/libraries/extractor/src/test/java/androidx/media3/extractor/mp4/FragmentedMp4ExtractorParameterizedTest.java
+++ b/libraries/extractor/src/test/java/androidx/media3/extractor/mp4/FragmentedMp4ExtractorParameterizedTest.java
@ -112,11 +112,8 @@ public final class FragmentedMp4ExtractorParameterizedTest {

  @Test
  public void sampleWithAc4Level4Track() throws Exception {
-    ExtractorAsserts.assertBehavior(
-        getExtractorFactory(
-            /* closedCaptionFormats= */ ImmutableList.of(), subtitlesParsedDuringExtraction),
-        "media/mp4/sample_ac4_level4_fragmented.mp4",
-        simulationConfig);
+    assertExtractorBehavior(
+        /* closedCaptionFormats= */ ImmutableList.of(), "media/mp4/sample_ac4_level4_fragmented.mp4");
  }

  @Test
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump
@ -0,0 +1,98 @@
+seekMap:
+  isSeekable = true
+  duration = 853333
+  getPosition(0) = [[timeUs=0, position=669]]
+  getPosition(1) = [[timeUs=0, position=669]]
+  getPosition(426666) = [[timeUs=0, position=669]]
+  getPosition(853333) = [[timeUs=0, position=669]]
+numberOfTracks = 1
+track 0:
+  total output bytes = 162700
+  sample count = 20
+  format 0:
+    id = 1
+    sampleMimeType = audio/ac4
+    channelCount = 21
+    sampleRate = 48000
+    language = und
+  sample 0:
+    time = 0
+    flags = 1
+    data = length 8135, hash B524F88E
+  sample 1:
+    time = 42666
+    flags = 0
+    data = length 8135, hash FB80C2FB
+  sample 2:
+    time = 85333
+    flags = 0
+    data = length 8135, hash 907C0C31
+  sample 3:
+    time = 128000
+    flags = 0
+    data = length 8135, hash FDFBD32B
+  sample 4:
+    time = 170666
+    flags = 0
+    data = length 8135, hash 6CAF0549
+  sample 5:
+    time = 213333
+    flags = 0
+    data = length 8135, hash F5CA1C9A
+  sample 6:
+    time = 256000
+    flags = 0
+    data = length 8135, hash B1B5160D
+  sample 7:
+    time = 298666
+    flags = 0
+    data = length 8135, hash 9E923B3F
+  sample 8:
+    time = 341333
+    flags = 0
+    data = length 8135, hash B1C0BB1F
+  sample 9:
+    time = 384000
+    flags = 0
+    data = length 8135, hash 56F65A03
+  sample 10:
+    time = 426666
+    flags = 1
+    data = length 8135, hash D07FA9A1
+  sample 11:
+    time = 469333
+    flags = 0
+    data = length 8135, hash EF26FDDE
+  sample 12:
+    time = 512000
+    flags = 0
+    data = length 8135, hash 8946EEEB
+  sample 13:
+    time = 554666
+    flags = 0
+    data = length 8135, hash AC2E4C99
+  sample 14:
+    time = 597333
+    flags = 0
+    data = length 8135, hash B63A1D8
+  sample 15:
+    time = 640000
+    flags = 0
+    data = length 8135, hash 23119F0F
+  sample 16:
+    time = 682666
+    flags = 0
+    data = length 8135, hash 507972CA
+  sample 17:
+    time = 725333
+    flags = 0
+    data = length 8135, hash E574BC00
+  sample 18:
+    time = 768000
+    flags = 0
+    data = length 8135, hash 52F482FA
+  sample 19:
+    time = 810666
+    flags = 0
+    data = length 8135, hash C1A7B518
+tracksEnded = true
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump
@ -0,0 +1,98 @@
+seekMap:
+  isSeekable = true
+  duration = 853333
+  getPosition(0) = [[timeUs=0, position=669]]
+  getPosition(1) = [[timeUs=0, position=669]]
+  getPosition(426666) = [[timeUs=0, position=669]]
+  getPosition(853333) = [[timeUs=0, position=669]]
+numberOfTracks = 1
+track 0:
+  total output bytes = 162700
+  sample count = 20
+  format 0:
+    id = 1
+    sampleMimeType = audio/ac4
+    channelCount = 21
+    sampleRate = 48000
+    language = und
+  sample 0:
+    time = 0
+    flags = 1
+    data = length 8135, hash B524F88E
+  sample 1:
+    time = 42666
+    flags = 0
+    data = length 8135, hash FB80C2FB
+  sample 2:
+    time = 85333
+    flags = 0
+    data = length 8135, hash 907C0C31
+  sample 3:
+    time = 128000
+    flags = 0
+    data = length 8135, hash FDFBD32B
+  sample 4:
+    time = 170666
+    flags = 0
+    data = length 8135, hash 6CAF0549
+  sample 5:
+    time = 213333
+    flags = 0
+    data = length 8135, hash F5CA1C9A
+  sample 6:
+    time = 256000
+    flags = 0
+    data = length 8135, hash B1B5160D
+  sample 7:
+    time = 298666
+    flags = 0
+    data = length 8135, hash 9E923B3F
+  sample 8:
+    time = 341333
+    flags = 0
+    data = length 8135, hash B1C0BB1F
+  sample 9:
+    time = 384000
+    flags = 0
+    data = length 8135, hash 56F65A03
+  sample 10:
+    time = 426666
+    flags = 1
+    data = length 8135, hash D07FA9A1
+  sample 11:
+    time = 469333
+    flags = 0
+    data = length 8135, hash EF26FDDE
+  sample 12:
+    time = 512000
+    flags = 0
+    data = length 8135, hash 8946EEEB
+  sample 13:
+    time = 554666
+    flags = 0
+    data = length 8135, hash AC2E4C99
+  sample 14:
+    time = 597333
+    flags = 0
+    data = length 8135, hash B63A1D8
+  sample 15:
+    time = 640000
+    flags = 0
+    data = length 8135, hash 23119F0F
+  sample 16:
+    time = 682666
+    flags = 0
+    data = length 8135, hash 507972CA
+  sample 17:
+    time = 725333
+    flags = 0
+    data = length 8135, hash E574BC00
+  sample 18:
+    time = 768000
+    flags = 0
+    data = length 8135, hash 52F482FA
+  sample 19:
+    time = 810666
+    flags = 0
+    data = length 8135, hash C1A7B518
+tracksEnded = true
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump
@ -0,0 +1,58 @@
+seekMap:
+  isSeekable = true
+  duration = 853333
+  getPosition(0) = [[timeUs=0, position=669]]
+  getPosition(1) = [[timeUs=0, position=669]]
+  getPosition(426666) = [[timeUs=0, position=669]]
+  getPosition(853333) = [[timeUs=0, position=669]]
+numberOfTracks = 1
+track 0:
+  total output bytes = 81350
+  sample count = 10
+  format 0:
+    id = 1
+    sampleMimeType = audio/ac4
+    channelCount = 21
+    sampleRate = 48000
+    language = und
+  sample 0:
+    time = 426666
+    flags = 1
+    data = length 8135, hash D07FA9A1
+  sample 1:
+    time = 469333
+    flags = 0
+    data = length 8135, hash EF26FDDE
+  sample 2:
+    time = 512000
+    flags = 0
+    data = length 8135, hash 8946EEEB
+  sample 3:
+    time = 554666
+    flags = 0
+    data = length 8135, hash AC2E4C99
+  sample 4:
+    time = 597333
+    flags = 0
+    data = length 8135, hash B63A1D8
+  sample 5:
+    time = 640000
+    flags = 0
+    data = length 8135, hash 23119F0F
+  sample 6:
+    time = 682666
+    flags = 0
+    data = length 8135, hash 507972CA
+  sample 7:
+    time = 725333
+    flags = 0
+    data = length 8135, hash E574BC00
+  sample 8:
+    time = 768000
+    flags = 0
+    data = length 8135, hash 52F482FA
+  sample 9:
+    time = 810666
+    flags = 0
+    data = length 8135, hash C1A7B518
+tracksEnded = true
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump
@ -0,0 +1,58 @@
+seekMap:
+  isSeekable = true
+  duration = 853333
+  getPosition(0) = [[timeUs=0, position=669]]
+  getPosition(1) = [[timeUs=0, position=669]]
+  getPosition(426666) = [[timeUs=0, position=669]]
+  getPosition(853333) = [[timeUs=0, position=669]]
+numberOfTracks = 1
+track 0:
+  total output bytes = 81350
+  sample count = 10
+  format 0:
+    id = 1
+    sampleMimeType = audio/ac4
+    channelCount = 21
+    sampleRate = 48000
+    language = und
+  sample 0:
+    time = 426666
+    flags = 1
+    data = length 8135, hash D07FA9A1
+  sample 1:
+    time = 469333
+    flags = 0
+    data = length 8135, hash EF26FDDE
+  sample 2:
+    time = 512000
+    flags = 0
+    data = length 8135, hash 8946EEEB
+  sample 3:
+    time = 554666
+    flags = 0
+    data = length 8135, hash AC2E4C99
+  sample 4:
+    time = 597333
+    flags = 0
+    data = length 8135, hash B63A1D8
+  sample 5:
+    time = 640000
+    flags = 0
+    data = length 8135, hash 23119F0F
+  sample 6:
+    time = 682666
+    flags = 0
+    data = length 8135, hash 507972CA
+  sample 7:
+    time = 725333
+    flags = 0
+    data = length 8135, hash E574BC00
+  sample 8:
+    time = 768000
+    flags = 0
+    data = length 8135, hash 52F482FA
+  sample 9:
+    time = 810666
+    flags = 0
+    data = length 8135, hash C1A7B518
+tracksEnded = true
--- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
@ -0,0 +1,98 @@
+seekMap:
+  isSeekable = true
+  duration = 853333
+  getPosition(0) = [[timeUs=0, position=669]]
+  getPosition(1) = [[timeUs=0, position=669]]
+  getPosition(426666) = [[timeUs=0, position=669]]
+  getPosition(853333) = [[timeUs=0, position=669]]
+numberOfTracks = 1
+track 0:
+  total output bytes = 162700
+  sample count = 20
+  format 0:
+    id = 1
+    sampleMimeType = audio/ac4
+    channelCount = 21
+    sampleRate = 48000
+    language = und
+  sample 0:
+    time = 0
+    flags = 1
+    data = length 8135, hash B524F88E
+  sample 1:
+    time = 42666
+    flags = 0
+    data = length 8135, hash FB80C2FB
+  sample 2:
+    time = 85333
+    flags = 0
+    data = length 8135, hash 907C0C31
+  sample 3:
+    time = 128000
+    flags = 0
+    data = length 8135, hash FDFBD32B
+  sample 4:
+    time = 170666
+    flags = 0
+    data = length 8135, hash 6CAF0549
+  sample 5:
+    time = 213333
+    flags = 0
+    data = length 8135, hash F5CA1C9A
+  sample 6:
+    time = 256000
+    flags = 0
+    data = length 8135, hash B1B5160D
+  sample 7:
+    time = 298666
+    flags = 0
+    data = length 8135, hash 9E923B3F
+  sample 8:
+    time = 341333
+    flags = 0
+    data = length 8135, hash B1C0BB1F
+  sample 9:
+    time = 384000
+    flags = 0
+    data = length 8135, hash 56F65A03
+  sample 10:
+    time = 426666
+    flags = 1
+    data = length 8135, hash D07FA9A1
+  sample 11:
+    time = 469333
+    flags = 0
+    data = length 8135, hash EF26FDDE
+  sample 12:
+    time = 512000
+    flags = 0
+    data = length 8135, hash 8946EEEB
+  sample 13:
+    time = 554666
+    flags = 0
+    data = length 8135, hash AC2E4C99
+  sample 14:
+    time = 597333
+    flags = 0
+    data = length 8135, hash B63A1D8
+  sample 15:
+    time = 640000
+    flags = 0
+    data = length 8135, hash 23119F0F
+  sample 16:
+    time = 682666
+    flags = 0
+    data = length 8135, hash 507972CA
+  sample 17:
+    time = 725333
+    flags = 0
+    data = length 8135, hash E574BC00
+  sample 18:
+    time = 768000
+    flags = 0
+    data = length 8135, hash 52F482FA
+  sample 19:
+    time = 810666
+    flags = 0
+    data = length 8135, hash C1A7B518
+tracksEnded = true