From ae7667783cb815344add78a4ef8cca52e9b690de Mon Sep 17 00:00:00 2001 From: samrobinson Date: Mon, 21 Aug 2023 17:59:09 +0100 Subject: [PATCH] Split dump file directories based on input file name. Remove old unused dump files. PiperOrigin-RevId: 558820926 --- .../original.dump} | 0 .../noaudio.dump} | 0 .../mp4/sample.mp4.48000hz.dump | 478 ------- .../noaudio.dump} | 0 .../novideo.dump} | 0 .../original.dump} | 0 .../original_original_transmux.dump} | 0 .../rotated.dump} | 0 .../silence.dump} | 0 .../silence_48000hz.dump} | 0 .../with_capture_fps.dump} | 0 .../with_creation_time.dump} | 0 .../with_custom_metadata.dump} | 0 .../with_location_metadata.dump} | 0 .../original.dump} | 0 .../silence.dump} | 0 .../mp4/sample_ac3.mp4.fallback.dump | 63 - .../noaudio.dump} | 0 .../clipped.dump} | 0 .../clipped_clipped_transmux.dump} | 0 .../mp4/sowt-with-video.mov.44100hz.dump | 1203 ----------------- .../highPitch_silenceHighPitch.dump} | 0 .../original_silence.dump} | 0 .../silenceHighPitch_highPitch.dump} | 0 .../silenceHighPitch_silence.dump} | 472 +++---- .../silenceHighPitch_silenceHighPitch.dump} | 0 .../silence_original.dump} | 0 .../silence_silence.dump} | 0 .../silence_silenceHighPitch.dump} | 680 +++++----- .../48000hz.dump} | 0 .../aac.dump} | 0 .../concurrent.dump} | 0 .../highPitch_highPitch.dump} | 0 .../highPitch_lowPitch.dump} | 0 .../original_original.dump} | 0 .../highPitch_sample.wavHighPitch.dump} | 0 .../highPitch_sample.wavLowPitch.dump} | 0 .../original_sample.wav.dump} | 0 .../transformer/CompositionExportTest.java | 5 +- .../transformer/MediaItemExportTest.java | 65 +- .../transformer/SequenceExportTest.java | 105 +- .../androidx/media3/transformer/TestUtil.java | 10 +- ...TransformerWithInAppMuxerEndToEndTest.java | 35 +- 43 files changed, 739 insertions(+), 2377 deletions(-) rename libraries/test_data/src/test/assets/transformerdumps/amr/{sample_nb.amr.dump => sample_nb.amr/original.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mkv/{sample_with_srt.mkv.dump.noaudio => sample_with_srt.mkv/noaudio.dump} (100%) delete mode 100644 libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.48000hz.dump rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sample.mp4.noaudio.dump => sample.mp4/noaudio.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sample.mp4.novideo.dump => sample.mp4/novideo.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sample.mp4.dump => sample.mp4/original.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sample.mp4.concatenated_transmux.dump => sample.mp4/original_original_transmux.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sample.mp4.rotated.dump => sample.mp4/rotated.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sample.mp4.silentaudio.dump => sample.mp4/silence.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sample.mp4.silentaudio_48000hz.dump => sample.mp4/silence_48000hz.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sample.mp4.with_capture_fps.dump => sample.mp4/with_capture_fps.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sample.mp4.with_creation_time.dump => sample.mp4/with_creation_time.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sample.mp4.with_custom_metadata.dump => sample.mp4/with_custom_metadata.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sample.mp4.with_location_metadata.dump => sample.mp4/with_location_metadata.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sample_18byte_nclx_colr.mp4.dump => sample_18byte_nclx_colr.mp4/original.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sample_18byte_nclx_colr.mp4.silentaudio.dump => sample_18byte_nclx_colr.mp4/silence.dump} (100%) delete mode 100644 libraries/test_data/src/test/assets/transformerdumps/mp4/sample_ac3.mp4.fallback.dump rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sample_sef_slow_motion.mp4.dump.noaudio => sample_sef_slow_motion.mp4/noaudio.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sample_with_increasing_timestamps_320w_240h.mp4.clipped.dump => sample_with_increasing_timestamps_320w_240h.mp4/clipped.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sample_with_increasing_timestamps_320w_240h.mp4.clipped_concatenated_transmux.dump => sample_with_increasing_timestamps_320w_240h.mp4/clipped_clipped_transmux.dump} (100%) delete mode 100644 libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.44100hz.dump rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sowt-with-video.mov.audio_then_silence_with_effects.dump => sowt-with-video.mov/highPitch_silenceHighPitch.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sowt-with-video.mov.audio_then_silence.dump => sowt-with-video.mov/original_silence.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sowt-with-video.mov.silence_then_audio_with_effects.dump => sowt-with-video.mov/silenceHighPitch_highPitch.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sowt-with-video.mov.silence_then_silence_with_effects.dump => sowt-with-video.mov/silenceHighPitch_silence.dump} (86%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sowt-with-video.mov.silence-effects_then_silence.dump => sowt-with-video.mov/silenceHighPitch_silenceHighPitch.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sowt-with-video.mov.silence_then_audio.dump => sowt-with-video.mov/silence_original.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sowt-with-video.mov.silence_then_silence.dump => sowt-with-video.mov/silence_silence.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/{sowt-with-video.mov.silence_then_silence-effects.dump => sowt-with-video.mov/silence_silenceHighPitch.dump} (81%) rename libraries/test_data/src/test/assets/transformerdumps/wav/{sample.wav.48000hz.dump => sample.wav/48000hz.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/wav/{sample.wav.aac.dump => sample.wav/aac.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/wav/{sample.wav.concurrent.dump => sample.wav/concurrent.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/wav/{sample.wav.concatenated_high_pitch.dump => sample.wav/highPitch_highPitch.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/wav/{sample.wav.high_pitch_then_low_pitch.dump => sample.wav/highPitch_lowPitch.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/wav/{sample.wav.concatenated.dump => sample.wav/original_original.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/wav/{sample_rf64.wav-high_pitch_then_sample.wav-high_pitch.dump => sample_rf64.wav/highPitch_sample.wavHighPitch.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/wav/{sample_rf64.wav-high_pitch_then_sample.wav-low_pitch.dump => sample_rf64.wav/highPitch_sample.wavLowPitch.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/wav/{sample_rf64.wav_then_sample.wav.dump => sample_rf64.wav/original_sample.wav.dump} (100%) diff --git a/libraries/test_data/src/test/assets/transformerdumps/amr/sample_nb.amr.dump b/libraries/test_data/src/test/assets/transformerdumps/amr/sample_nb.amr/original.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/amr/sample_nb.amr.dump rename to libraries/test_data/src/test/assets/transformerdumps/amr/sample_nb.amr/original.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mkv/sample_with_srt.mkv.dump.noaudio b/libraries/test_data/src/test/assets/transformerdumps/mkv/sample_with_srt.mkv/noaudio.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mkv/sample_with_srt.mkv.dump.noaudio rename to libraries/test_data/src/test/assets/transformerdumps/mkv/sample_with_srt.mkv/noaudio.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.48000hz.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.48000hz.dump deleted file mode 100644 index fff0666d3a..0000000000 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.48000hz.dump +++ /dev/null @@ -1,478 +0,0 @@ -format 0: - id = 1 - sampleMimeType = video/avc - codecs = avc1.64001F - maxInputSize = 36722 - width = 1080 - height = 720 - frameRate = 29.970028 - metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] - initializationData: - data = length 29, hash 4746B5D9 - data = length 10, hash 7A0D0F2B -container metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] -format 1: - averageBitrate = 131072 - sampleMimeType = audio/mp4a-latm - channelCount = 1 - sampleRate = 48000 - pcmEncoding = 2 - metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] -container metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] -sample: - trackIndex = 0 - dataHashCode = -770308242 - size = 36692 - isKeyFrame = true - presentationTimeUs = 0 -sample: - trackIndex = 0 - dataHashCode = -732087136 - size = 5312 - isKeyFrame = false - presentationTimeUs = 66733 -sample: - trackIndex = 0 - dataHashCode = 468156717 - size = 599 - isKeyFrame = false - presentationTimeUs = 33366 -sample: - trackIndex = 0 - dataHashCode = 1150349584 - size = 7735 - isKeyFrame = false - presentationTimeUs = 200200 -sample: - trackIndex = 0 - dataHashCode = 1443582006 - size = 987 - isKeyFrame = false - presentationTimeUs = 133466 -sample: - trackIndex = 0 - dataHashCode = -310585145 - size = 673 - isKeyFrame = false - presentationTimeUs = 100100 -sample: - trackIndex = 0 - dataHashCode = 807460688 - size = 523 - isKeyFrame = false - presentationTimeUs = 166833 -sample: - trackIndex = 0 - dataHashCode = 1936487090 - size = 6061 - isKeyFrame = false - presentationTimeUs = 333666 -sample: - trackIndex = 0 - dataHashCode = -32297181 - size = 992 - isKeyFrame = false - presentationTimeUs = 266933 -sample: - trackIndex = 0 - dataHashCode = 1529616406 - size = 623 - isKeyFrame = false - presentationTimeUs = 233566 -sample: - trackIndex = 0 - dataHashCode = 1949198785 - size = 421 - isKeyFrame = false - presentationTimeUs = 300300 -sample: - trackIndex = 0 - dataHashCode = -147880287 - size = 4899 - isKeyFrame = false - presentationTimeUs = 433766 -sample: - trackIndex = 0 - dataHashCode = 1369083472 - size = 568 - isKeyFrame = false - presentationTimeUs = 400400 -sample: - trackIndex = 0 - dataHashCode = 965782073 - size = 620 - isKeyFrame = false - presentationTimeUs = 367033 -sample: - trackIndex = 0 - dataHashCode = -261176150 - size = 5450 - isKeyFrame = false - presentationTimeUs = 567233 -sample: - trackIndex = 0 - dataHashCode = -1830836678 - size = 1051 - isKeyFrame = false - presentationTimeUs = 500500 -sample: - trackIndex = 0 - dataHashCode = 1767407540 - size = 874 - isKeyFrame = false - presentationTimeUs = 467133 -sample: - trackIndex = 0 - dataHashCode = 918440283 - size = 781 - isKeyFrame = false - presentationTimeUs = 533866 -sample: - trackIndex = 0 - dataHashCode = -1408463661 - size = 4725 - isKeyFrame = false - presentationTimeUs = 700700 -sample: - trackIndex = 0 - dataHashCode = 1569455924 - size = 1022 - isKeyFrame = false - presentationTimeUs = 633966 -sample: - trackIndex = 0 - dataHashCode = -1723778407 - size = 790 - isKeyFrame = false - presentationTimeUs = 600600 -sample: - trackIndex = 0 - dataHashCode = 1578275472 - size = 610 - isKeyFrame = false - presentationTimeUs = 667333 -sample: - trackIndex = 0 - dataHashCode = 1989768395 - size = 2751 - isKeyFrame = false - presentationTimeUs = 834166 -sample: - trackIndex = 0 - dataHashCode = -1215674502 - size = 745 - isKeyFrame = false - presentationTimeUs = 767433 -sample: - trackIndex = 0 - dataHashCode = -814473606 - size = 621 - isKeyFrame = false - presentationTimeUs = 734066 -sample: - trackIndex = 0 - dataHashCode = 498370894 - size = 505 - isKeyFrame = false - presentationTimeUs = 800800 -sample: - trackIndex = 0 - dataHashCode = -1051506468 - size = 1268 - isKeyFrame = false - presentationTimeUs = 967633 -sample: - trackIndex = 0 - dataHashCode = -1025604144 - size = 880 - isKeyFrame = false - presentationTimeUs = 900900 -sample: - trackIndex = 0 - dataHashCode = -913586520 - size = 530 - isKeyFrame = false - presentationTimeUs = 867533 -sample: - trackIndex = 0 - dataHashCode = 1340459242 - size = 568 - isKeyFrame = false - presentationTimeUs = 934266 -sample: - trackIndex = 1 - dataHashCode = 1868041800 - size = 22 - isKeyFrame = true - presentationTimeUs = 0 -sample: - trackIndex = 1 - dataHashCode = 1552866193 - size = 8 - isKeyFrame = true - presentationTimeUs = 229 -sample: - trackIndex = 1 - dataHashCode = 701848493 - size = 160 - isKeyFrame = true - presentationTimeUs = 312 -sample: - trackIndex = 1 - dataHashCode = 2000505720 - size = 206 - isKeyFrame = true - presentationTimeUs = 1979 -sample: - trackIndex = 1 - dataHashCode = 57276327 - size = 222 - isKeyFrame = true - presentationTimeUs = 4125 -sample: - trackIndex = 1 - dataHashCode = 382237408 - size = 228 - isKeyFrame = true - presentationTimeUs = 6437 -sample: - trackIndex = 1 - dataHashCode = 795308374 - size = 228 - isKeyFrame = true - presentationTimeUs = 8812 -sample: - trackIndex = 1 - dataHashCode = 356270426 - size = 224 - isKeyFrame = true - presentationTimeUs = 11187 -sample: - trackIndex = 1 - dataHashCode = 963641614 - size = 244 - isKeyFrame = true - presentationTimeUs = 13520 -sample: - trackIndex = 1 - dataHashCode = 2045272193 - size = 234 - isKeyFrame = true - presentationTimeUs = 16062 -sample: - trackIndex = 1 - dataHashCode = -251933090 - size = 228 - isKeyFrame = true - presentationTimeUs = 18500 -sample: - trackIndex = 1 - dataHashCode = -329315280 - size = 234 - isKeyFrame = true - presentationTimeUs = 20875 -sample: - trackIndex = 1 - dataHashCode = -1536715689 - size = 248 - isKeyFrame = true - presentationTimeUs = 23312 -sample: - trackIndex = 1 - dataHashCode = -1275249610 - size = 254 - isKeyFrame = true - presentationTimeUs = 25895 -sample: - trackIndex = 1 - dataHashCode = -2081231470 - size = 254 - isKeyFrame = true - presentationTimeUs = 28541 -sample: - trackIndex = 1 - dataHashCode = 1912348529 - size = 250 - isKeyFrame = true - presentationTimeUs = 31187 -sample: - trackIndex = 1 - dataHashCode = -1393642278 - size = 246 - isKeyFrame = true - presentationTimeUs = 33791 -sample: - trackIndex = 1 - dataHashCode = -2073671562 - size = 236 - isKeyFrame = true - presentationTimeUs = 36354 -sample: - trackIndex = 1 - dataHashCode = -381095129 - size = 248 - isKeyFrame = true - presentationTimeUs = 38812 -sample: - trackIndex = 1 - dataHashCode = -804721381 - size = 238 - isKeyFrame = true - presentationTimeUs = 41395 -sample: - trackIndex = 1 - dataHashCode = 172275944 - size = 260 - isKeyFrame = true - presentationTimeUs = 43875 -sample: - trackIndex = 1 - dataHashCode = -1045486664 - size = 248 - isKeyFrame = true - presentationTimeUs = 46583 -sample: - trackIndex = 1 - dataHashCode = -1465283679 - size = 260 - isKeyFrame = true - presentationTimeUs = 49166 -sample: - trackIndex = 1 - dataHashCode = 1840117006 - size = 254 - isKeyFrame = true - presentationTimeUs = 51875 -sample: - trackIndex = 1 - dataHashCode = -631848848 - size = 250 - isKeyFrame = true - presentationTimeUs = 54520 -sample: - trackIndex = 1 - dataHashCode = -1207491554 - size = 236 - isKeyFrame = true - presentationTimeUs = 57125 -sample: - trackIndex = 1 - dataHashCode = 838792456 - size = 258 - isKeyFrame = true - presentationTimeUs = 59583 -sample: - trackIndex = 1 - dataHashCode = -1131122284 - size = 264 - isKeyFrame = true - presentationTimeUs = 62270 -sample: - trackIndex = 1 - dataHashCode = -122326555 - size = 250 - isKeyFrame = true - presentationTimeUs = 65020 -sample: - trackIndex = 1 - dataHashCode = -1340323720 - size = 250 - isKeyFrame = true - presentationTimeUs = 67625 -sample: - trackIndex = 1 - dataHashCode = -1290952882 - size = 260 - isKeyFrame = true - presentationTimeUs = 70229 -sample: - trackIndex = 1 - dataHashCode = 2118216858 - size = 244 - isKeyFrame = true - presentationTimeUs = 72937 -sample: - trackIndex = 1 - dataHashCode = 879520231 - size = 252 - isKeyFrame = true - presentationTimeUs = 75479 -sample: - trackIndex = 1 - dataHashCode = -174892555 - size = 264 - isKeyFrame = true - presentationTimeUs = 78104 -sample: - trackIndex = 1 - dataHashCode = -555873771 - size = 252 - isKeyFrame = true - presentationTimeUs = 80854 -sample: - trackIndex = 1 - dataHashCode = -1479853263 - size = 256 - isKeyFrame = true - presentationTimeUs = 83479 -sample: - trackIndex = 1 - dataHashCode = -1068971504 - size = 250 - isKeyFrame = true - presentationTimeUs = 86145 -sample: - trackIndex = 1 - dataHashCode = -866214350 - size = 254 - isKeyFrame = true - presentationTimeUs = 88750 -sample: - trackIndex = 1 - dataHashCode = -2111034853 - size = 288 - isKeyFrame = true - presentationTimeUs = 91395 -sample: - trackIndex = 1 - dataHashCode = -1445430754 - size = 278 - isKeyFrame = true - presentationTimeUs = 94395 -sample: - trackIndex = 1 - dataHashCode = 1200468541 - size = 246 - isKeyFrame = true - presentationTimeUs = 97291 -sample: - trackIndex = 1 - dataHashCode = -1853596884 - size = 246 - isKeyFrame = true - presentationTimeUs = 99854 -sample: - trackIndex = 1 - dataHashCode = -1266372568 - size = 254 - isKeyFrame = true - presentationTimeUs = 102416 -sample: - trackIndex = 1 - dataHashCode = -212017561 - size = 248 - isKeyFrame = true - presentationTimeUs = 105062 -sample: - trackIndex = 1 - dataHashCode = -1464702479 - size = 8 - isKeyFrame = true - presentationTimeUs = 107645 -sample: - trackIndex = 1 - dataHashCode = -2065 - size = 2 - isKeyFrame = true - presentationTimeUs = 107729 -released = true diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.noaudio.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/noaudio.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.noaudio.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/noaudio.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.novideo.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/novideo.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.novideo.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/novideo.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.concatenated_transmux.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original_original_transmux.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.concatenated_transmux.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original_original_transmux.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.rotated.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/rotated.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.rotated.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/rotated.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.silentaudio.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.silentaudio.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.silentaudio_48000hz.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence_48000hz.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.silentaudio_48000hz.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence_48000hz.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.with_capture_fps.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_capture_fps.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.with_capture_fps.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_capture_fps.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.with_creation_time.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_creation_time.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.with_creation_time.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_creation_time.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.with_custom_metadata.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_custom_metadata.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.with_custom_metadata.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_custom_metadata.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.with_location_metadata.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_location_metadata.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.with_location_metadata.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_location_metadata.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/original.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/original.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4.silentaudio.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/silence.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4.silentaudio.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/silence.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_ac3.mp4.fallback.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_ac3.mp4.fallback.dump deleted file mode 100644 index adf4c31837..0000000000 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_ac3.mp4.fallback.dump +++ /dev/null @@ -1,63 +0,0 @@ -format 0: - averageBitrate = 131072 - sampleMimeType = audio/mp4a-latm - channelCount = 6 - sampleRate = 48000 - pcmEncoding = 2 - metadata = entries=[Mp4Timestamp: creation time=3664419241, modification time=3664419241, timescale=600] -container metadata = entries=[Mp4Timestamp: creation time=3664419241, modification time=3664419241, timescale=600] -sample: - trackIndex = 0 - dataHashCode = 1896404418 - size = 1536 - isKeyFrame = true - presentationTimeUs = 0 -sample: - trackIndex = 0 - dataHashCode = -2134951116 - size = 1536 - isKeyFrame = true - presentationTimeUs = 2666 -sample: - trackIndex = 0 - dataHashCode = 97556101 - size = 1536 - isKeyFrame = true - presentationTimeUs = 5333 -sample: - trackIndex = 0 - dataHashCode = -1448980924 - size = 1536 - isKeyFrame = true - presentationTimeUs = 8000 -sample: - trackIndex = 0 - dataHashCode = 1871012467 - size = 1536 - isKeyFrame = true - presentationTimeUs = 10666 -sample: - trackIndex = 0 - dataHashCode = -1317831364 - size = 1536 - isKeyFrame = true - presentationTimeUs = 13333 -sample: - trackIndex = 0 - dataHashCode = -1728189539 - size = 1536 - isKeyFrame = true - presentationTimeUs = 16000 -sample: - trackIndex = 0 - dataHashCode = -1715881661 - size = 1536 - isKeyFrame = true - presentationTimeUs = 18666 -sample: - trackIndex = 0 - dataHashCode = -1428554542 - size = 1536 - isKeyFrame = true - presentationTimeUs = 21333 -released = true diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4.dump.noaudio b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4/noaudio.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4.dump.noaudio rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4/noaudio.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4.clipped.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4.clipped.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4.clipped_concatenated_transmux.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped_clipped_transmux.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4.clipped_concatenated_transmux.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped_clipped_transmux.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.44100hz.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.44100hz.dump deleted file mode 100644 index b7a3bfe30e..0000000000 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.44100hz.dump +++ /dev/null @@ -1,1203 +0,0 @@ -format 0: - id = 1 - sampleMimeType = video/avc - codecs = avc1.64002A - maxInputSize = 41084 - width = 1920 - height = 1080 - frameRate = 50.0 - colorInfo: - colorSpace = 1 - colorRange = 2 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 - metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000] - initializationData: - data = length 34, hash 8D738018 - data = length 10, hash 7A0D0F2B -container metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000] -format 1: - averageBitrate = 131072 - sampleMimeType = audio/mp4a-latm - channelCount = 2 - sampleRate = 44100 - pcmEncoding = 2 - metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000] -container metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000] -sample: - trackIndex = 0 - dataHashCode = 33691269 - size = 41054 - isKeyFrame = true - presentationTimeUs = 0 -sample: - trackIndex = 0 - dataHashCode = 951153212 - size = 15163 - isKeyFrame = false - presentationTimeUs = 40000 -sample: - trackIndex = 0 - dataHashCode = 552307150 - size = 6490 - isKeyFrame = false - presentationTimeUs = 20000 -sample: - trackIndex = 0 - dataHashCode = -151063635 - size = 25484 - isKeyFrame = false - presentationTimeUs = 120000 -sample: - trackIndex = 0 - dataHashCode = -1847115463 - size = 14792 - isKeyFrame = false - presentationTimeUs = 80000 -sample: - trackIndex = 0 - dataHashCode = 775037055 - size = 8823 - isKeyFrame = false - presentationTimeUs = 60000 -sample: - trackIndex = 0 - dataHashCode = 1452603441 - size = 7905 - isKeyFrame = false - presentationTimeUs = 100000 -sample: - trackIndex = 0 - dataHashCode = 1732228513 - size = 21086 - isKeyFrame = false - presentationTimeUs = 200000 -sample: - trackIndex = 0 - dataHashCode = 1246814657 - size = 13181 - isKeyFrame = false - presentationTimeUs = 160000 -sample: - trackIndex = 0 - dataHashCode = 426081419 - size = 7666 - isKeyFrame = false - presentationTimeUs = 140000 -sample: - trackIndex = 0 - dataHashCode = -241872379 - size = 8627 - isKeyFrame = false - presentationTimeUs = 180000 -sample: - trackIndex = 0 - dataHashCode = 1109784816 - size = 23310 - isKeyFrame = false - presentationTimeUs = 280000 -sample: - trackIndex = 0 - dataHashCode = -377448231 - size = 16108 - isKeyFrame = false - presentationTimeUs = 240000 -sample: - trackIndex = 0 - dataHashCode = -688376574 - size = 10591 - isKeyFrame = false - presentationTimeUs = 220000 -sample: - trackIndex = 0 - dataHashCode = 496944885 - size = 9652 - isKeyFrame = false - presentationTimeUs = 260000 -sample: - trackIndex = 0 - dataHashCode = 591739725 - size = 26209 - isKeyFrame = false - presentationTimeUs = 360000 -sample: - trackIndex = 0 - dataHashCode = -469037805 - size = 14679 - isKeyFrame = false - presentationTimeUs = 320000 -sample: - trackIndex = 0 - dataHashCode = 2089439735 - size = 11258 - isKeyFrame = false - presentationTimeUs = 300000 -sample: - trackIndex = 0 - dataHashCode = -991522861 - size = 8380 - isKeyFrame = false - presentationTimeUs = 340000 -sample: - trackIndex = 0 - dataHashCode = 1228181765 - size = 21371 - isKeyFrame = false - presentationTimeUs = 420000 -sample: - trackIndex = 0 - dataHashCode = -881594031 - size = 15113 - isKeyFrame = false - presentationTimeUs = 380000 -sample: - trackIndex = 0 - dataHashCode = -1336355567 - size = 10553 - isKeyFrame = false - presentationTimeUs = 400000 -sample: - trackIndex = 0 - dataHashCode = -1156719720 - size = 34938 - isKeyFrame = false - presentationTimeUs = 480000 -sample: - trackIndex = 0 - dataHashCode = 396046716 - size = 17842 - isKeyFrame = false - presentationTimeUs = 440000 -sample: - trackIndex = 0 - dataHashCode = -1084632521 - size = 11502 - isKeyFrame = false - presentationTimeUs = 460000 -sample: - trackIndex = 0 - dataHashCode = -337819407 - size = 18009 - isKeyFrame = false - presentationTimeUs = 500000 -sample: - trackIndex = 0 - dataHashCode = 1295059940 - size = 24298 - isKeyFrame = false - presentationTimeUs = 520000 -sample: - trackIndex = 0 - dataHashCode = -929598998 - size = 21682 - isKeyFrame = false - presentationTimeUs = 540000 -sample: - trackIndex = 0 - dataHashCode = 1579805687 - size = 31833 - isKeyFrame = false - presentationTimeUs = 620000 -sample: - trackIndex = 0 - dataHashCode = 79553286 - size = 20853 - isKeyFrame = false - presentationTimeUs = 580000 -sample: - trackIndex = 0 - dataHashCode = -119845353 - size = 12906 - isKeyFrame = false - presentationTimeUs = 560000 -sample: - trackIndex = 0 - dataHashCode = -1242905044 - size = 17165 - isKeyFrame = false - presentationTimeUs = 600000 -sample: - trackIndex = 0 - dataHashCode = 1161132039 - size = 35065 - isKeyFrame = false - presentationTimeUs = 700000 -sample: - trackIndex = 0 - dataHashCode = 1801923857 - size = 19881 - isKeyFrame = false - presentationTimeUs = 660000 -sample: - trackIndex = 0 - dataHashCode = -1201934910 - size = 22571 - isKeyFrame = false - presentationTimeUs = 640000 -sample: - trackIndex = 0 - dataHashCode = -655417171 - size = 11566 - isKeyFrame = false - presentationTimeUs = 680000 -sample: - trackIndex = 0 - dataHashCode = 2011055114 - size = 24236 - isKeyFrame = false - presentationTimeUs = 780000 -sample: - trackIndex = 0 - dataHashCode = 1098159553 - size = 10515 - isKeyFrame = false - presentationTimeUs = 740000 -sample: - trackIndex = 0 - dataHashCode = 813195513 - size = 8188 - isKeyFrame = false - presentationTimeUs = 720000 -sample: - trackIndex = 0 - dataHashCode = 1610084647 - size = 9662 - isKeyFrame = false - presentationTimeUs = 760000 -sample: - trackIndex = 0 - dataHashCode = -389131647 - size = 22443 - isKeyFrame = false - presentationTimeUs = 860000 -sample: - trackIndex = 0 - dataHashCode = -49148581 - size = 12726 - isKeyFrame = false - presentationTimeUs = 820000 -sample: - trackIndex = 0 - dataHashCode = 650534699 - size = 8521 - isKeyFrame = false - presentationTimeUs = 800000 -sample: - trackIndex = 0 - dataHashCode = 554081714 - size = 7850 - isKeyFrame = false - presentationTimeUs = 840000 -sample: - trackIndex = 0 - dataHashCode = -539147636 - size = 30005 - isKeyFrame = false - presentationTimeUs = 940000 -sample: - trackIndex = 0 - dataHashCode = 863445487 - size = 19430 - isKeyFrame = false - presentationTimeUs = 900000 -sample: - trackIndex = 0 - dataHashCode = -210870675 - size = 12962 - isKeyFrame = false - presentationTimeUs = 880000 -sample: - trackIndex = 0 - dataHashCode = -1294790684 - size = 10767 - isKeyFrame = false - presentationTimeUs = 920000 -sample: - trackIndex = 0 - dataHashCode = -650391415 - size = 25914 - isKeyFrame = false - presentationTimeUs = 1000000 -sample: - trackIndex = 0 - dataHashCode = 1964249241 - size = 11471 - isKeyFrame = false - presentationTimeUs = 960000 -sample: - trackIndex = 0 - dataHashCode = 1901943199 - size = 8639 - isKeyFrame = false - presentationTimeUs = 980000 -sample: - trackIndex = 0 - dataHashCode = 754314804 - size = 22173 - isKeyFrame = false - presentationTimeUs = 1060000 -sample: - trackIndex = 0 - dataHashCode = 1631939129 - size = 10274 - isKeyFrame = false - presentationTimeUs = 1020000 -sample: - trackIndex = 0 - dataHashCode = -914580412 - size = 8625 - isKeyFrame = false - presentationTimeUs = 1040000 -sample: - trackIndex = 0 - dataHashCode = 464184359 - size = 19443 - isKeyFrame = false - presentationTimeUs = 1100000 -sample: - trackIndex = 0 - dataHashCode = 521590252 - size = 9189 - isKeyFrame = false - presentationTimeUs = 1080000 -sample: - trackIndex = 0 - dataHashCode = -1920606290 - size = 16242 - isKeyFrame = false - presentationTimeUs = 1120000 -sample: - trackIndex = 0 - dataHashCode = -1462753526 - size = 16036 - isKeyFrame = false - presentationTimeUs = 1140000 -sample: - trackIndex = 0 - dataHashCode = -2095257664 - size = 16431 - isKeyFrame = false - presentationTimeUs = 1160000 -sample: - trackIndex = 0 - dataHashCode = -1722510728 - size = 16421 - isKeyFrame = false - presentationTimeUs = 1180000 -sample: - trackIndex = 0 - dataHashCode = -2075073532 - size = 23643 - isKeyFrame = false - presentationTimeUs = 1240000 -sample: - trackIndex = 0 - dataHashCode = 1068866869 - size = 9962 - isKeyFrame = false - presentationTimeUs = 1200000 -sample: - trackIndex = 0 - dataHashCode = 2139806323 - size = 8627 - isKeyFrame = false - presentationTimeUs = 1220000 -sample: - trackIndex = 0 - dataHashCode = -75510961 - size = 20148 - isKeyFrame = false - presentationTimeUs = 1280000 -sample: - trackIndex = 0 - dataHashCode = -1734586788 - size = 8888 - isKeyFrame = false - presentationTimeUs = 1260000 -sample: - trackIndex = 0 - dataHashCode = 1689355701 - size = 19300 - isKeyFrame = false - presentationTimeUs = 1320000 -sample: - trackIndex = 0 - dataHashCode = 1014386281 - size = 8455 - isKeyFrame = false - presentationTimeUs = 1300000 -sample: - trackIndex = 0 - dataHashCode = 655967971 - size = 29708 - isKeyFrame = false - presentationTimeUs = 1400000 -sample: - trackIndex = 0 - dataHashCode = 651498019 - size = 12715 - isKeyFrame = false - presentationTimeUs = 1360000 -sample: - trackIndex = 0 - dataHashCode = -1326592134 - size = 8573 - isKeyFrame = false - presentationTimeUs = 1340000 -sample: - trackIndex = 0 - dataHashCode = -481876840 - size = 8982 - isKeyFrame = false - presentationTimeUs = 1380000 -sample: - trackIndex = 0 - dataHashCode = -1289166593 - size = 25026 - isKeyFrame = false - presentationTimeUs = 1460000 -sample: - trackIndex = 0 - dataHashCode = 1533284887 - size = 9600 - isKeyFrame = false - presentationTimeUs = 1420000 -sample: - trackIndex = 0 - dataHashCode = 931231084 - size = 8098 - isKeyFrame = false - presentationTimeUs = 1440000 -sample: - trackIndex = 0 - dataHashCode = 593905363 - size = 27032 - isKeyFrame = false - presentationTimeUs = 1540000 -sample: - trackIndex = 0 - dataHashCode = -61693143 - size = 11416 - isKeyFrame = false - presentationTimeUs = 1500000 -sample: - trackIndex = 0 - dataHashCode = 2034274294 - size = 8119 - isKeyFrame = false - presentationTimeUs = 1480000 -sample: - trackIndex = 0 - dataHashCode = -1382173825 - size = 7355 - isKeyFrame = false - presentationTimeUs = 1520000 -sample: - trackIndex = 0 - dataHashCode = 1141112289 - size = 27694 - isKeyFrame = false - presentationTimeUs = 1620000 -sample: - trackIndex = 0 - dataHashCode = 615108734 - size = 10665 - isKeyFrame = false - presentationTimeUs = 1580000 -sample: - trackIndex = 0 - dataHashCode = -192568269 - size = 7176 - isKeyFrame = false - presentationTimeUs = 1560000 -sample: - trackIndex = 0 - dataHashCode = 1139129648 - size = 7375 - isKeyFrame = false - presentationTimeUs = 1600000 -sample: - trackIndex = 0 - dataHashCode = -644623072 - size = 24651 - isKeyFrame = false - presentationTimeUs = 1700000 -sample: - trackIndex = 0 - dataHashCode = 1087668168 - size = 9679 - isKeyFrame = false - presentationTimeUs = 1660000 -sample: - trackIndex = 0 - dataHashCode = 1406222068 - size = 6862 - isKeyFrame = false - presentationTimeUs = 1640000 -sample: - trackIndex = 0 - dataHashCode = -622032068 - size = 6000 - isKeyFrame = false - presentationTimeUs = 1680000 -sample: - trackIndex = 0 - dataHashCode = 1191619637 - size = 22101 - isKeyFrame = false - presentationTimeUs = 1780000 -sample: - trackIndex = 0 - dataHashCode = 603349552 - size = 8537 - isKeyFrame = false - presentationTimeUs = 1740000 -sample: - trackIndex = 0 - dataHashCode = -1784449460 - size = 6288 - isKeyFrame = false - presentationTimeUs = 1720000 -sample: - trackIndex = 0 - dataHashCode = 1158465085 - size = 5152 - isKeyFrame = false - presentationTimeUs = 1760000 -sample: - trackIndex = 0 - dataHashCode = 147323155 - size = 19889 - isKeyFrame = false - presentationTimeUs = 1860000 -sample: - trackIndex = 0 - dataHashCode = 1714081095 - size = 8893 - isKeyFrame = false - presentationTimeUs = 1820000 -sample: - trackIndex = 0 - dataHashCode = -1894307035 - size = 5905 - isKeyFrame = false - presentationTimeUs = 1800000 -sample: - trackIndex = 0 - dataHashCode = -1208848015 - size = 5635 - isKeyFrame = false - presentationTimeUs = 1840000 -sample: - trackIndex = 0 - dataHashCode = 1015012687 - size = 14896 - isKeyFrame = false - presentationTimeUs = 1940000 -sample: - trackIndex = 0 - dataHashCode = 513736378 - size = 9260 - isKeyFrame = false - presentationTimeUs = 1900000 -sample: - trackIndex = 0 - dataHashCode = 1346700024 - size = 5850 - isKeyFrame = false - presentationTimeUs = 1880000 -sample: - trackIndex = 0 - dataHashCode = 279399292 - size = 7154 - isKeyFrame = false - presentationTimeUs = 1920000 -sample: - trackIndex = 0 - dataHashCode = 831498454 - size = 8605 - isKeyFrame = false - presentationTimeUs = 1980000 -sample: - trackIndex = 0 - dataHashCode = -20875598 - size = 6983 - isKeyFrame = false - presentationTimeUs = 1960000 -sample: - trackIndex = 1 - dataHashCode = 838148193 - size = 3760 - isKeyFrame = true - presentationTimeUs = 0 -sample: - trackIndex = 1 - dataHashCode = 867867043 - size = 3764 - isKeyFrame = true - presentationTimeUs = 21315 -sample: - trackIndex = 1 - dataHashCode = -1491441898 - size = 3764 - isKeyFrame = true - presentationTimeUs = 42653 -sample: - trackIndex = 1 - dataHashCode = 834552609 - size = 3764 - isKeyFrame = true - presentationTimeUs = 63990 -sample: - trackIndex = 1 - dataHashCode = 300797245 - size = 3764 - isKeyFrame = true - presentationTimeUs = 85328 -sample: - trackIndex = 1 - dataHashCode = -1462810335 - size = 3760 - isKeyFrame = true - presentationTimeUs = 106666 -sample: - trackIndex = 1 - dataHashCode = 1944686734 - size = 3764 - isKeyFrame = true - presentationTimeUs = 127981 -sample: - trackIndex = 1 - dataHashCode = -1341756866 - size = 3764 - isKeyFrame = true - presentationTimeUs = 149319 -sample: - trackIndex = 1 - dataHashCode = -2028679386 - size = 3764 - isKeyFrame = true - presentationTimeUs = 170657 -sample: - trackIndex = 1 - dataHashCode = -1875874972 - size = 3764 - isKeyFrame = true - presentationTimeUs = 191995 -sample: - trackIndex = 1 - dataHashCode = 502983932 - size = 3760 - isKeyFrame = true - presentationTimeUs = 213333 -sample: - trackIndex = 1 - dataHashCode = -152413040 - size = 3764 - isKeyFrame = true - presentationTimeUs = 234648 -sample: - trackIndex = 1 - dataHashCode = 2115857425 - size = 3764 - isKeyFrame = true - presentationTimeUs = 255986 -sample: - trackIndex = 1 - dataHashCode = 1565297003 - size = 3764 - isKeyFrame = true - presentationTimeUs = 277324 -sample: - trackIndex = 1 - dataHashCode = -1352896324 - size = 3764 - isKeyFrame = true - presentationTimeUs = 298662 -sample: - trackIndex = 1 - dataHashCode = -1419566217 - size = 3760 - isKeyFrame = true - presentationTimeUs = 320000 -sample: - trackIndex = 1 - dataHashCode = -140145063 - size = 3764 - isKeyFrame = true - presentationTimeUs = 341315 -sample: - trackIndex = 1 - dataHashCode = -1064854301 - size = 3764 - isKeyFrame = true - presentationTimeUs = 362653 -sample: - trackIndex = 1 - dataHashCode = 1140211756 - size = 3764 - isKeyFrame = true - presentationTimeUs = 383990 -sample: - trackIndex = 1 - dataHashCode = 1410022017 - size = 3764 - isKeyFrame = true - presentationTimeUs = 405328 -sample: - trackIndex = 1 - dataHashCode = 1543094264 - size = 3760 - isKeyFrame = true - presentationTimeUs = 426666 -sample: - trackIndex = 1 - dataHashCode = -194814421 - size = 3764 - isKeyFrame = true - presentationTimeUs = 447981 -sample: - trackIndex = 1 - dataHashCode = -1036665888 - size = 1884 - isKeyFrame = true - presentationTimeUs = 469319 -sample: - trackIndex = 1 - dataHashCode = 1775616337 - size = 3528 - isKeyFrame = true - presentationTimeUs = 480000 -sample: - trackIndex = 1 - dataHashCode = 931216668 - size = 3996 - isKeyFrame = true - presentationTimeUs = 500000 -sample: - trackIndex = 1 - dataHashCode = 16108289 - size = 3764 - isKeyFrame = true - presentationTimeUs = 522653 -sample: - trackIndex = 1 - dataHashCode = 1621627919 - size = 3764 - isKeyFrame = true - presentationTimeUs = 543990 -sample: - trackIndex = 1 - dataHashCode = 2068064692 - size = 3764 - isKeyFrame = true - presentationTimeUs = 565328 -sample: - trackIndex = 1 - dataHashCode = -992940742 - size = 3760 - isKeyFrame = true - presentationTimeUs = 586666 -sample: - trackIndex = 1 - dataHashCode = -1602575392 - size = 3764 - isKeyFrame = true - presentationTimeUs = 607981 -sample: - trackIndex = 1 - dataHashCode = -250495549 - size = 3764 - isKeyFrame = true - presentationTimeUs = 629319 -sample: - trackIndex = 1 - dataHashCode = 230148053 - size = 3764 - isKeyFrame = true - presentationTimeUs = 650657 -sample: - trackIndex = 1 - dataHashCode = -1831510348 - size = 3764 - isKeyFrame = true - presentationTimeUs = 671995 -sample: - trackIndex = 1 - dataHashCode = -1720336442 - size = 3760 - isKeyFrame = true - presentationTimeUs = 693333 -sample: - trackIndex = 1 - dataHashCode = 967577141 - size = 3764 - isKeyFrame = true - presentationTimeUs = 714648 -sample: - trackIndex = 1 - dataHashCode = 1942439530 - size = 3764 - isKeyFrame = true - presentationTimeUs = 735986 -sample: - trackIndex = 1 - dataHashCode = -935502622 - size = 3764 - isKeyFrame = true - presentationTimeUs = 757324 -sample: - trackIndex = 1 - dataHashCode = -843755946 - size = 3764 - isKeyFrame = true - presentationTimeUs = 778662 -sample: - trackIndex = 1 - dataHashCode = 1069393122 - size = 3760 - isKeyFrame = true - presentationTimeUs = 800000 -sample: - trackIndex = 1 - dataHashCode = 49423702 - size = 3764 - isKeyFrame = true - presentationTimeUs = 821315 -sample: - trackIndex = 1 - dataHashCode = -553195030 - size = 3764 - isKeyFrame = true - presentationTimeUs = 842653 -sample: - trackIndex = 1 - dataHashCode = -1811527473 - size = 3764 - isKeyFrame = true - presentationTimeUs = 863990 -sample: - trackIndex = 1 - dataHashCode = -1747277513 - size = 3764 - isKeyFrame = true - presentationTimeUs = 885328 -sample: - trackIndex = 1 - dataHashCode = 1624044866 - size = 3760 - isKeyFrame = true - presentationTimeUs = 906666 -sample: - trackIndex = 1 - dataHashCode = -647085493 - size = 3764 - isKeyFrame = true - presentationTimeUs = 927981 -sample: - trackIndex = 1 - dataHashCode = 685235410 - size = 1884 - isKeyFrame = true - presentationTimeUs = 949319 -sample: - trackIndex = 1 - dataHashCode = 932376296 - size = 3760 - isKeyFrame = true - presentationTimeUs = 960000 -sample: - trackIndex = 1 - dataHashCode = 1297632614 - size = 3296 - isKeyFrame = true - presentationTimeUs = 981315 -sample: - trackIndex = 1 - dataHashCode = -1698066806 - size = 4232 - isKeyFrame = true - presentationTimeUs = 1000000 -sample: - trackIndex = 1 - dataHashCode = 1930678601 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1023990 -sample: - trackIndex = 1 - dataHashCode = -1846516440 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1045328 -sample: - trackIndex = 1 - dataHashCode = -1427786374 - size = 3760 - isKeyFrame = true - presentationTimeUs = 1066666 -sample: - trackIndex = 1 - dataHashCode = 318451114 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1087981 -sample: - trackIndex = 1 - dataHashCode = -715132585 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1109319 -sample: - trackIndex = 1 - dataHashCode = 264171543 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1130657 -sample: - trackIndex = 1 - dataHashCode = -1040207413 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1151995 -sample: - trackIndex = 1 - dataHashCode = 879854128 - size = 3760 - isKeyFrame = true - presentationTimeUs = 1173333 -sample: - trackIndex = 1 - dataHashCode = 876243983 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1194648 -sample: - trackIndex = 1 - dataHashCode = -363528509 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1215986 -sample: - trackIndex = 1 - dataHashCode = -135578478 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1237324 -sample: - trackIndex = 1 - dataHashCode = -515064024 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1258662 -sample: - trackIndex = 1 - dataHashCode = -1108659851 - size = 3760 - isKeyFrame = true - presentationTimeUs = 1280000 -sample: - trackIndex = 1 - dataHashCode = -968838622 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1301315 -sample: - trackIndex = 1 - dataHashCode = -1420164148 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1322653 -sample: - trackIndex = 1 - dataHashCode = -1112607201 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1343990 -sample: - trackIndex = 1 - dataHashCode = 1558783105 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1365328 -sample: - trackIndex = 1 - dataHashCode = -352924987 - size = 3760 - isKeyFrame = true - presentationTimeUs = 1386666 -sample: - trackIndex = 1 - dataHashCode = 2106460158 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1407981 -sample: - trackIndex = 1 - dataHashCode = -41009645 - size = 1884 - isKeyFrame = true - presentationTimeUs = 1429319 -sample: - trackIndex = 1 - dataHashCode = 1436590081 - size = 3760 - isKeyFrame = true - presentationTimeUs = 1440000 -sample: - trackIndex = 1 - dataHashCode = 1687127132 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1461315 -sample: - trackIndex = 1 - dataHashCode = 624992026 - size = 3060 - isKeyFrame = true - presentationTimeUs = 1482653 -sample: - trackIndex = 1 - dataHashCode = -1816384888 - size = 4468 - isKeyFrame = true - presentationTimeUs = 1500000 -sample: - trackIndex = 1 - dataHashCode = 1234475840 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1525328 -sample: - trackIndex = 1 - dataHashCode = 1059545106 - size = 3760 - isKeyFrame = true - presentationTimeUs = 1546666 -sample: - trackIndex = 1 - dataHashCode = -122199485 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1567981 -sample: - trackIndex = 1 - dataHashCode = 1959246634 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1589319 -sample: - trackIndex = 1 - dataHashCode = 850067509 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1610657 -sample: - trackIndex = 1 - dataHashCode = 1980472225 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1631995 -sample: - trackIndex = 1 - dataHashCode = -925055805 - size = 3760 - isKeyFrame = true - presentationTimeUs = 1653333 -sample: - trackIndex = 1 - dataHashCode = -1674063596 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1674648 -sample: - trackIndex = 1 - dataHashCode = -207399418 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1695986 -sample: - trackIndex = 1 - dataHashCode = 1414022975 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1717324 -sample: - trackIndex = 1 - dataHashCode = -750183218 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1738662 -sample: - trackIndex = 1 - dataHashCode = 2010693178 - size = 3760 - isKeyFrame = true - presentationTimeUs = 1760000 -sample: - trackIndex = 1 - dataHashCode = -2140767398 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1781315 -sample: - trackIndex = 1 - dataHashCode = 797139457 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1802653 -sample: - trackIndex = 1 - dataHashCode = 1273236854 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1823990 -sample: - trackIndex = 1 - dataHashCode = -1033659332 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1845328 -sample: - trackIndex = 1 - dataHashCode = -476572566 - size = 3760 - isKeyFrame = true - presentationTimeUs = 1866666 -sample: - trackIndex = 1 - dataHashCode = -1957052196 - size = 3764 - isKeyFrame = true - presentationTimeUs = 1887981 -sample: - trackIndex = 1 - dataHashCode = 191919408 - size = 1884 - isKeyFrame = true - presentationTimeUs = 1909319 -sample: - trackIndex = 1 - dataHashCode = 10326927 - size = 3760 - isKeyFrame = true - presentationTimeUs = 1920000 -sample: - trackIndex = 1 - dataHashCode = -672114487 - size = 7528 - isKeyFrame = true - presentationTimeUs = 1941315 -sample: - trackIndex = 1 - dataHashCode = 1403065337 - size = 2824 - isKeyFrame = true - presentationTimeUs = 1983990 -sample: - trackIndex = 1 - dataHashCode = 923521 - size = 4 - isKeyFrame = true - presentationTimeUs = 2000000 -released = true diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.audio_then_silence_with_effects.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/highPitch_silenceHighPitch.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.audio_then_silence_with_effects.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/highPitch_silenceHighPitch.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.audio_then_silence.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original_silence.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.audio_then_silence.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original_silence.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.silence_then_audio_with_effects.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_highPitch.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.silence_then_audio_with_effects.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_highPitch.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.silence_then_silence_with_effects.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silence.dump similarity index 86% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.silence_then_silence_with_effects.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silence.dump index 2d187eee5d..00863ad913 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.silence_then_silence_with_effects.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silence.dump @@ -1716,482 +1716,482 @@ sample: presentationTimeUs = 1999841 sample: trackIndex = 1 - dataHashCode = 243395457 - size = 7012 + dataHashCode = 2017483649 + size = 8164 isKeyFrame = true presentationTimeUs = 2000000 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2039750 + presentationTimeUs = 2046281 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2062199 + presentationTimeUs = 2069501 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2087142 + presentationTimeUs = 2092721 sample: trackIndex = 1 - dataHashCode = -448902783 - size = 3956 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2109591 + presentationTimeUs = 2115941 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2132018 + presentationTimeUs = 2139160 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2156961 + presentationTimeUs = 2162380 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2179410 + presentationTimeUs = 2185600 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2201859 + presentationTimeUs = 2208820 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2226802 + presentationTimeUs = 2232040 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2249251 + presentationTimeUs = 2255260 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2271700 + presentationTimeUs = 2278480 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2296643 + presentationTimeUs = 2301700 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2319092 + presentationTimeUs = 2324920 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2341541 + presentationTimeUs = 2348140 sample: trackIndex = 1 - dataHashCode = -122903935 - size = 4396 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2363990 + presentationTimeUs = 2371360 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2388911 + presentationTimeUs = 2394580 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2411360 + presentationTimeUs = 2417800 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2433809 + presentationTimeUs = 2441020 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2458752 + presentationTimeUs = 2464240 sample: trackIndex = 1 - dataHashCode = -1476683391 - size = 3316 + dataHashCode = 2132657025 + size = 2212 isKeyFrame = true - presentationTimeUs = 2481201 + presentationTimeUs = 2487460 sample: trackIndex = 1 - dataHashCode = -1993784959 - size = 5044 + dataHashCode = -1274381183 + size = 5980 isKeyFrame = true presentationTimeUs = 2500000 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2528594 + presentationTimeUs = 2533900 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2551043 + presentationTimeUs = 2557120 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2573492 + presentationTimeUs = 2580340 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2598435 + presentationTimeUs = 2603560 sample: trackIndex = 1 - dataHashCode = -448902783 - size = 3956 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2620884 + presentationTimeUs = 2626780 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2643310 + presentationTimeUs = 2650000 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2665759 + presentationTimeUs = 2673219 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2690702 + presentationTimeUs = 2696439 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2713151 + presentationTimeUs = 2719659 sample: trackIndex = 1 - dataHashCode = 644553473 - size = 8360 + dataHashCode = -809762815 + size = 8192 isKeyFrame = true - presentationTimeUs = 2735600 + presentationTimeUs = 2742879 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2782993 + presentationTimeUs = 2789319 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2805442 + presentationTimeUs = 2812539 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2830385 + presentationTimeUs = 2835759 sample: trackIndex = 1 - dataHashCode = -448902783 - size = 3956 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2852834 + presentationTimeUs = 2858979 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2875260 + presentationTimeUs = 2882199 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2900204 + presentationTimeUs = 2905419 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2922653 + presentationTimeUs = 2928639 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2945102 + presentationTimeUs = 2951859 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 2967551 + presentationTimeUs = 2975079 sample: trackIndex = 1 - dataHashCode = 2055611009 - size = 1324 + dataHashCode = 634299009 + size = 300 isKeyFrame = true - presentationTimeUs = 2992494 + presentationTimeUs = 2998299 sample: trackIndex = 1 - dataHashCode = -76324991 - size = 6596 + dataHashCode = -1988911743 + size = 7892 isKeyFrame = true presentationTimeUs = 3000000 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3037392 + presentationTimeUs = 3044739 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3062335 + presentationTimeUs = 3067959 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3084784 + presentationTimeUs = 3091179 sample: trackIndex = 1 - dataHashCode = -122903935 - size = 4396 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3107233 + presentationTimeUs = 3114399 sample: trackIndex = 1 - dataHashCode = 2136490497 - size = 7920 + dataHashCode = -809762815 + size = 8192 isKeyFrame = true - presentationTimeUs = 3132154 + presentationTimeUs = 3137619 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3177052 + presentationTimeUs = 3184058 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3201995 + presentationTimeUs = 3207278 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3224444 + presentationTimeUs = 3230498 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3246893 + presentationTimeUs = 3253718 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3269342 + presentationTimeUs = 3276938 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3294285 + presentationTimeUs = 3300158 sample: trackIndex = 1 - dataHashCode = 644553473 - size = 8360 + dataHashCode = -809762815 + size = 8192 isKeyFrame = true - presentationTimeUs = 3316734 + presentationTimeUs = 3323378 sample: trackIndex = 1 - dataHashCode = -448902783 - size = 3956 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3364126 + presentationTimeUs = 3369818 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3386553 + presentationTimeUs = 3393038 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3409002 + presentationTimeUs = 3416258 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3433945 + presentationTimeUs = 3439478 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3456394 + presentationTimeUs = 3462698 sample: trackIndex = 1 - dataHashCode = 1120019841 - size = 3732 + dataHashCode = 1999233 + size = 2484 isKeyFrame = true - presentationTimeUs = 3478843 + presentationTimeUs = 3485918 sample: trackIndex = 1 - dataHashCode = 454210945 - size = 4628 + dataHashCode = -37765503 + size = 5708 isKeyFrame = true presentationTimeUs = 3500000 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3526235 + presentationTimeUs = 3532358 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3548684 + presentationTimeUs = 3555578 sample: trackIndex = 1 - dataHashCode = 2136490497 - size = 7920 + dataHashCode = -809762815 + size = 8192 isKeyFrame = true - presentationTimeUs = 3573628 + presentationTimeUs = 3578798 sample: trackIndex = 1 - dataHashCode = -448902783 - size = 3956 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3618526 + presentationTimeUs = 3625238 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3640952 + presentationTimeUs = 3648458 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3665895 + presentationTimeUs = 3671678 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3688344 + presentationTimeUs = 3694897 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3710793 + presentationTimeUs = 3718117 sample: trackIndex = 1 - dataHashCode = 2136490497 - size = 7920 + dataHashCode = -809762815 + size = 8192 isKeyFrame = true - presentationTimeUs = 3735736 + presentationTimeUs = 3741337 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3780634 + presentationTimeUs = 3787777 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3805578 + presentationTimeUs = 3810997 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3828027 + presentationTimeUs = 3834217 sample: trackIndex = 1 - dataHashCode = -122903935 - size = 4396 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3850476 + presentationTimeUs = 3857437 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3875396 + presentationTimeUs = 3880657 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = -809762815 + size = 8192 isKeyFrame = true - presentationTimeUs = 3897845 + presentationTimeUs = 3903877 sample: trackIndex = 1 - dataHashCode = 644553473 - size = 8360 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3920294 + presentationTimeUs = 3950317 sample: trackIndex = 1 - dataHashCode = -1759454975 - size = 440 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 3967687 + presentationTimeUs = 3973537 sample: trackIndex = 1 - dataHashCode = -1409159807 - size = 5204 + dataHashCode = -204243967 + size = 544 isKeyFrame = true - presentationTimeUs = 3970181 + presentationTimeUs = 3996757 released = true diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.silence-effects_then_silence.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silenceHighPitch.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.silence-effects_then_silence.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silenceHighPitch.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.silence_then_audio.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_original.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.silence_then_audio.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_original.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.silence_then_silence.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silence.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.silence_then_silence.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silence.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.silence_then_silence-effects.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silenceHighPitch.dump similarity index 81% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.silence_then_silence-effects.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silenceHighPitch.dump index 2d187eee5d..f5f43ca409 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov.silence_then_silence-effects.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silenceHighPitch.dump @@ -1224,500 +1224,494 @@ sample: presentationTimeUs = 3960000 sample: trackIndex = 1 - dataHashCode = 1940582145 - size = 3080 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true presentationTimeUs = 0 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 17460 + presentationTimeUs = 23219 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 39909 + presentationTimeUs = 46439 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 62358 + presentationTimeUs = 69659 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 87301 + presentationTimeUs = 92879 sample: trackIndex = 1 - dataHashCode = -448902783 - size = 3956 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 109750 + presentationTimeUs = 116099 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 132176 + presentationTimeUs = 139319 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 157120 + presentationTimeUs = 162539 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 179569 + presentationTimeUs = 185759 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 202018 + presentationTimeUs = 208979 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 226961 + presentationTimeUs = 232199 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 249410 + presentationTimeUs = 255419 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 271859 + presentationTimeUs = 278639 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 296802 + presentationTimeUs = 301859 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 319251 + presentationTimeUs = 325079 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 341700 + presentationTimeUs = 348299 sample: trackIndex = 1 - dataHashCode = -122903935 - size = 4396 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 364149 + presentationTimeUs = 371519 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 389070 + presentationTimeUs = 394739 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 411519 + presentationTimeUs = 417959 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 433968 + presentationTimeUs = 441179 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 458911 + presentationTimeUs = 464399 sample: trackIndex = 1 - dataHashCode = 836580609 - size = 3288 + dataHashCode = 1728208641 + size = 2184 isKeyFrame = true - presentationTimeUs = 481360 + presentationTimeUs = 487619 sample: trackIndex = 1 - dataHashCode = -1141905919 - size = 5072 + dataHashCode = 620404993 + size = 6008 isKeyFrame = true presentationTimeUs = 500000 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 528752 + presentationTimeUs = 534058 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 551201 + presentationTimeUs = 557278 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 573650 + presentationTimeUs = 580498 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 598594 + presentationTimeUs = 603718 sample: trackIndex = 1 - dataHashCode = -448902783 - size = 3956 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 621043 + presentationTimeUs = 626938 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 643469 + presentationTimeUs = 650158 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 665918 + presentationTimeUs = 673378 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 690861 + presentationTimeUs = 696598 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 713310 + presentationTimeUs = 719818 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 735759 + presentationTimeUs = 743038 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 760702 + presentationTimeUs = 766258 sample: trackIndex = 1 - dataHashCode = 644553473 - size = 8360 + dataHashCode = -809762815 + size = 8192 isKeyFrame = true - presentationTimeUs = 783151 + presentationTimeUs = 789478 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 830544 + presentationTimeUs = 835918 sample: trackIndex = 1 - dataHashCode = -448902783 - size = 3956 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 852993 + presentationTimeUs = 859138 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 875419 + presentationTimeUs = 882358 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 900362 + presentationTimeUs = 905578 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 922811 + presentationTimeUs = 928798 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 945260 + presentationTimeUs = 952018 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 967709 + presentationTimeUs = 975238 sample: trackIndex = 1 - dataHashCode = 744439297 - size = 1296 + dataHashCode = 1097317889 + size = 272 isKeyFrame = true - presentationTimeUs = 992653 + presentationTimeUs = 998458 sample: trackIndex = 1 - dataHashCode = -1744763903 - size = 6624 + dataHashCode = 2136490497 + size = 7920 isKeyFrame = true presentationTimeUs = 1000000 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1037551 + presentationTimeUs = 1044897 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1062494 + presentationTimeUs = 1068117 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1084943 + presentationTimeUs = 1091337 sample: trackIndex = 1 - dataHashCode = -122903935 - size = 4396 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1107392 + presentationTimeUs = 1114557 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1132312 + presentationTimeUs = 1137777 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1154761 + presentationTimeUs = 1160997 sample: trackIndex = 1 - dataHashCode = 644553473 - size = 8360 + dataHashCode = -809762815 + size = 8192 isKeyFrame = true - presentationTimeUs = 1177210 + presentationTimeUs = 1184217 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1224603 + presentationTimeUs = 1230657 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1247052 + presentationTimeUs = 1253877 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1269501 + presentationTimeUs = 1277097 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1294444 + presentationTimeUs = 1300317 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1316893 + presentationTimeUs = 1323537 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1339342 + presentationTimeUs = 1346757 sample: trackIndex = 1 - dataHashCode = -448902783 - size = 3956 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1364285 + presentationTimeUs = 1369977 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1386712 + presentationTimeUs = 1393197 sample: trackIndex = 1 - dataHashCode = 644553473 - size = 8360 + dataHashCode = -809762815 + size = 8192 isKeyFrame = true - presentationTimeUs = 1409160 + presentationTimeUs = 1416417 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1456553 + presentationTimeUs = 1462857 sample: trackIndex = 1 - dataHashCode = -206716671 - size = 3704 + dataHashCode = -1544807167 + size = 2456 isKeyFrame = true - presentationTimeUs = 1479002 + presentationTimeUs = 1486077 sample: trackIndex = 1 - dataHashCode = -102540799 - size = 4656 + dataHashCode = 370729729 + size = 5736 isKeyFrame = true presentationTimeUs = 1500000 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1526394 + presentationTimeUs = 1532517 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1548843 + presentationTimeUs = 1555736 sample: trackIndex = 1 - dataHashCode = 2136490497 - size = 7920 + dataHashCode = -809762815 + size = 8192 isKeyFrame = true - presentationTimeUs = 1573786 + presentationTimeUs = 1578956 sample: trackIndex = 1 - dataHashCode = -448902783 - size = 3956 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1618684 + presentationTimeUs = 1625396 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1641111 + presentationTimeUs = 1648616 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1666054 + presentationTimeUs = 1671836 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1688503 + presentationTimeUs = 1695056 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1710952 + presentationTimeUs = 1718276 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1735895 + presentationTimeUs = 1741496 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1758344 + presentationTimeUs = 1764716 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1780793 + presentationTimeUs = 1787936 sample: trackIndex = 1 - dataHashCode = 2136490497 - size = 7920 + dataHashCode = -809762815 + size = 8192 isKeyFrame = true - presentationTimeUs = 1805736 + presentationTimeUs = 1811156 sample: trackIndex = 1 - dataHashCode = -122903935 - size = 4396 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1850634 + presentationTimeUs = 1857596 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1875555 + presentationTimeUs = 1880816 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1898004 + presentationTimeUs = 1904036 sample: trackIndex = 1 - dataHashCode = 571187457 - size = 3960 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1920453 + presentationTimeUs = 1927256 sample: trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 + dataHashCode = 1742602241 + size = 4096 isKeyFrame = true - presentationTimeUs = 1942902 + presentationTimeUs = 1950476 sample: trackIndex = 1 - dataHashCode = 359941761 - size = 5644 + dataHashCode = -474907647 + size = 4640 isKeyFrame = true - presentationTimeUs = 1967845 + presentationTimeUs = 1973696 sample: trackIndex = 1 - dataHashCode = 693101697 - size = 28 - isKeyFrame = true - presentationTimeUs = 1999841 -sample: - trackIndex = 1 - dataHashCode = 243395457 - size = 7012 + dataHashCode = 1940582145 + size = 3080 isKeyFrame = true presentationTimeUs = 2000000 sample: @@ -1725,125 +1719,131 @@ sample: dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2039750 -sample: - trackIndex = 1 - dataHashCode = -1264223743 - size = 4400 - isKeyFrame = true - presentationTimeUs = 2062199 + presentationTimeUs = 2017460 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2087142 + presentationTimeUs = 2039909 +sample: + trackIndex = 1 + dataHashCode = -1264223743 + size = 4400 + isKeyFrame = true + presentationTimeUs = 2062358 +sample: + trackIndex = 1 + dataHashCode = 571187457 + size = 3960 + isKeyFrame = true + presentationTimeUs = 2087301 sample: trackIndex = 1 dataHashCode = -448902783 size = 3956 isKeyFrame = true - presentationTimeUs = 2109591 + presentationTimeUs = 2109750 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 2132018 + presentationTimeUs = 2132176 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2156961 + presentationTimeUs = 2157120 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2179410 + presentationTimeUs = 2179569 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 2201859 + presentationTimeUs = 2202018 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2226802 + presentationTimeUs = 2226961 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2249251 + presentationTimeUs = 2249410 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 2271700 + presentationTimeUs = 2271859 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2296643 + presentationTimeUs = 2296802 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2319092 + presentationTimeUs = 2319251 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2341541 + presentationTimeUs = 2341700 sample: trackIndex = 1 dataHashCode = -122903935 size = 4396 isKeyFrame = true - presentationTimeUs = 2363990 + presentationTimeUs = 2364149 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2388911 + presentationTimeUs = 2389070 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2411360 + presentationTimeUs = 2411519 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 2433809 + presentationTimeUs = 2433968 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2458752 + presentationTimeUs = 2458911 sample: trackIndex = 1 - dataHashCode = -1476683391 - size = 3316 + dataHashCode = 836580609 + size = 3288 isKeyFrame = true - presentationTimeUs = 2481201 + presentationTimeUs = 2481360 sample: trackIndex = 1 - dataHashCode = -1993784959 - size = 5044 + dataHashCode = -1141905919 + size = 5072 isKeyFrame = true presentationTimeUs = 2500000 sample: @@ -1851,125 +1851,125 @@ sample: dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2528594 + presentationTimeUs = 2528752 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2551043 + presentationTimeUs = 2551201 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 2573492 + presentationTimeUs = 2573650 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2598435 + presentationTimeUs = 2598594 sample: trackIndex = 1 dataHashCode = -448902783 size = 3956 isKeyFrame = true - presentationTimeUs = 2620884 + presentationTimeUs = 2621043 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2643310 + presentationTimeUs = 2643469 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 2665759 + presentationTimeUs = 2665918 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2690702 + presentationTimeUs = 2690861 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2713151 + presentationTimeUs = 2713310 sample: trackIndex = 1 dataHashCode = 644553473 size = 8360 isKeyFrame = true - presentationTimeUs = 2735600 + presentationTimeUs = 2735759 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2782993 + presentationTimeUs = 2783151 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 2805442 + presentationTimeUs = 2805600 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2830385 + presentationTimeUs = 2830544 sample: trackIndex = 1 dataHashCode = -448902783 size = 3956 isKeyFrame = true - presentationTimeUs = 2852834 + presentationTimeUs = 2852993 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 2875260 + presentationTimeUs = 2875419 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2900204 + presentationTimeUs = 2900362 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2922653 + presentationTimeUs = 2922811 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 2945102 + presentationTimeUs = 2945260 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 2967551 + presentationTimeUs = 2967709 sample: trackIndex = 1 - dataHashCode = 2055611009 - size = 1324 + dataHashCode = 744439297 + size = 1296 isKeyFrame = true - presentationTimeUs = 2992494 + presentationTimeUs = 2992653 sample: trackIndex = 1 - dataHashCode = -76324991 - size = 6596 + dataHashCode = -1744763903 + size = 6624 isKeyFrame = true presentationTimeUs = 3000000 sample: @@ -1977,113 +1977,113 @@ sample: dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 3037392 + presentationTimeUs = 3037551 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 3062335 + presentationTimeUs = 3062494 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 3084784 + presentationTimeUs = 3084943 sample: trackIndex = 1 dataHashCode = -122903935 size = 4396 isKeyFrame = true - presentationTimeUs = 3107233 + presentationTimeUs = 3107392 sample: trackIndex = 1 dataHashCode = 2136490497 size = 7920 isKeyFrame = true - presentationTimeUs = 3132154 + presentationTimeUs = 3132312 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 3177052 + presentationTimeUs = 3177210 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 3201995 + presentationTimeUs = 3202154 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 3224444 + presentationTimeUs = 3224603 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 3246893 + presentationTimeUs = 3247052 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 3269342 + presentationTimeUs = 3269501 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 3294285 + presentationTimeUs = 3294444 sample: trackIndex = 1 dataHashCode = 644553473 size = 8360 isKeyFrame = true - presentationTimeUs = 3316734 + presentationTimeUs = 3316893 sample: trackIndex = 1 dataHashCode = -448902783 size = 3956 isKeyFrame = true - presentationTimeUs = 3364126 + presentationTimeUs = 3364285 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 3386553 + presentationTimeUs = 3386712 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 3409002 + presentationTimeUs = 3409160 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 3433945 + presentationTimeUs = 3434104 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 3456394 + presentationTimeUs = 3456553 sample: trackIndex = 1 - dataHashCode = 1120019841 - size = 3732 + dataHashCode = -206716671 + size = 3704 isKeyFrame = true - presentationTimeUs = 3478843 + presentationTimeUs = 3479002 sample: trackIndex = 1 - dataHashCode = 454210945 - size = 4628 + dataHashCode = -102540799 + size = 4656 isKeyFrame = true presentationTimeUs = 3500000 sample: @@ -2091,107 +2091,107 @@ sample: dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 3526235 + presentationTimeUs = 3526394 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 3548684 + presentationTimeUs = 3548843 sample: trackIndex = 1 dataHashCode = 2136490497 size = 7920 isKeyFrame = true - presentationTimeUs = 3573628 + presentationTimeUs = 3573786 sample: trackIndex = 1 dataHashCode = -448902783 size = 3956 isKeyFrame = true - presentationTimeUs = 3618526 + presentationTimeUs = 3618684 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 3640952 + presentationTimeUs = 3641111 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 3665895 + presentationTimeUs = 3666054 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 3688344 + presentationTimeUs = 3688503 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 3710793 + presentationTimeUs = 3710952 sample: trackIndex = 1 dataHashCode = 2136490497 size = 7920 isKeyFrame = true - presentationTimeUs = 3735736 + presentationTimeUs = 3735895 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 3780634 + presentationTimeUs = 3780793 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 3805578 + presentationTimeUs = 3805736 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 3828027 + presentationTimeUs = 3828185 sample: trackIndex = 1 dataHashCode = -122903935 size = 4396 isKeyFrame = true - presentationTimeUs = 3850476 + presentationTimeUs = 3850634 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 3875396 + presentationTimeUs = 3875555 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 3897845 + presentationTimeUs = 3898004 sample: trackIndex = 1 dataHashCode = 644553473 size = 8360 isKeyFrame = true - presentationTimeUs = 3920294 + presentationTimeUs = 3920453 sample: trackIndex = 1 dataHashCode = -1759454975 size = 440 isKeyFrame = true - presentationTimeUs = 3967687 + presentationTimeUs = 3967845 sample: trackIndex = 1 dataHashCode = -1409159807 size = 5204 isKeyFrame = true - presentationTimeUs = 3970181 + presentationTimeUs = 3970340 released = true diff --git a/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav.48000hz.dump b/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/48000hz.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav.48000hz.dump rename to libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/48000hz.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav.aac.dump b/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/aac.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav.aac.dump rename to libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/aac.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav.concurrent.dump b/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/concurrent.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav.concurrent.dump rename to libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/concurrent.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav.concatenated_high_pitch.dump b/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/highPitch_highPitch.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav.concatenated_high_pitch.dump rename to libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/highPitch_highPitch.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav.high_pitch_then_low_pitch.dump b/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/highPitch_lowPitch.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav.high_pitch_then_low_pitch.dump rename to libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/highPitch_lowPitch.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav.concatenated.dump b/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/original_original.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav.concatenated.dump rename to libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/original_original.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav-high_pitch_then_sample.wav-high_pitch.dump b/libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav/highPitch_sample.wavHighPitch.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav-high_pitch_then_sample.wav-high_pitch.dump rename to libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav/highPitch_sample.wavHighPitch.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav-high_pitch_then_sample.wav-low_pitch.dump b/libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav/highPitch_sample.wavLowPitch.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav-high_pitch_then_sample.wav-low_pitch.dump rename to libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav/highPitch_sample.wavLowPitch.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav_then_sample.wav.dump b/libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav/original_sample.wav.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav_then_sample.wav.dump rename to libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav/original_sample.wav.dump diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/CompositionExportTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/CompositionExportTest.java index 38f86f4941..8b14c736f4 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/CompositionExportTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/CompositionExportTest.java @@ -210,7 +210,10 @@ public class CompositionExportTest { assertThat(exportResult.processedInputs).hasSize(2); DumpFileAsserts.assertOutput( - context, muxerFactory.getCreatedMuxer(), getDumpFileName(FILE_AUDIO_RAW + ".concurrent")); + context, + muxerFactory.getCreatedMuxer(), + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_RAW, /* modifications...= */ "concurrent")); } @Test diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java index 52c30d0b84..bebd4b67b0 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java @@ -171,7 +171,9 @@ public final class MediaItemExportTest { TransformerTestRunner.runLooper(transformer); DumpFileAsserts.assertOutput( - context, muxerFactory.getCreatedMuxer(), getDumpFileName(FILE_AUDIO_RAW + ".aac")); + context, + muxerFactory.getCreatedMuxer(), + getDumpFileName(/* originalFileName= */ FILE_AUDIO_RAW, /* modifications...= */ "aac")); } @Test @@ -209,7 +211,9 @@ public final class MediaItemExportTest { DumpFileAsserts.assertOutput( context, muxerFactory.getCreatedMuxer(), - getDumpFileName(FILE_AUDIO_VIDEO_INCREASING_TIMESTAMPS_15S + ".clipped")); + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_VIDEO_INCREASING_TIMESTAMPS_15S, + /* modifications...= */ "clipped")); } @Test @@ -227,7 +231,10 @@ public final class MediaItemExportTest { TransformerTestRunner.runLooper(transformer); DumpFileAsserts.assertOutput( - context, muxerFactory.getCreatedMuxer(), getDumpFileName(FILE_WITH_SUBTITLES) + ".noaudio"); + context, + muxerFactory.getCreatedMuxer(), + getDumpFileName( + /* originalFileName= */ FILE_WITH_SUBTITLES, /* modifications...= */ "noaudio")); } @Test @@ -273,7 +280,10 @@ public final class MediaItemExportTest { TransformerTestRunner.runLooper(transformer); DumpFileAsserts.assertOutput( - context, muxerFactory.getCreatedMuxer(), getDumpFileName(FILE_AUDIO_VIDEO + ".noaudio")); + context, + muxerFactory.getCreatedMuxer(), + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_VIDEO, /* modifications...= */ "noaudio")); } @Test @@ -289,7 +299,10 @@ public final class MediaItemExportTest { TransformerTestRunner.runLooper(transformer); DumpFileAsserts.assertOutput( - context, muxerFactory.getCreatedMuxer(), getDumpFileName(FILE_AUDIO_VIDEO + ".novideo")); + context, + muxerFactory.getCreatedMuxer(), + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_VIDEO, /* modifications...= */ "novideo")); } @Test @@ -347,7 +360,8 @@ public final class MediaItemExportTest { DumpFileAsserts.assertOutput( context, muxerFactory.getCreatedMuxer(), - getDumpFileName(FILE_AUDIO_VIDEO + ".silentaudio")); + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_VIDEO, /* modifications...= */ "silence")); } @Test @@ -373,7 +387,10 @@ public final class MediaItemExportTest { DumpFileAsserts.assertOutput( context, muxerFactory.getCreatedMuxer(), - getDumpFileName(FILE_AUDIO_VIDEO + ".silentaudio_48000hz")); + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_VIDEO, /* modifications...= */ + "silence", + "48000hz")); } @Test @@ -392,7 +409,10 @@ public final class MediaItemExportTest { transformer.start(composition, outputPath); TransformerTestRunner.runLooper(transformer); DumpFileAsserts.assertOutput( - context, muxerFactory.getCreatedMuxer(), getDumpFileName(FILE_AUDIO_VIDEO + ".novideo")); + context, + muxerFactory.getCreatedMuxer(), + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_VIDEO, /* modifications...= */ "novideo")); } @Test @@ -410,7 +430,10 @@ public final class MediaItemExportTest { TransformerTestRunner.runLooper(transformer); DumpFileAsserts.assertOutput( - context, muxerFactory.getCreatedMuxer(), getDumpFileName(FILE_VIDEO_ONLY + ".silentaudio")); + context, + muxerFactory.getCreatedMuxer(), + getDumpFileName( + /* originalFileName= */ FILE_VIDEO_ONLY, /* modifications...= */ "silence")); } @Test @@ -430,7 +453,9 @@ public final class MediaItemExportTest { TransformerTestRunner.runLooper(transformer); DumpFileAsserts.assertOutput( - context, muxerFactory.getCreatedMuxer(), getDumpFileName(FILE_AUDIO_RAW + ".48000hz")); + context, + muxerFactory.getCreatedMuxer(), + getDumpFileName(/* originalFileName= */ FILE_AUDIO_RAW, /* modifications...= */ "48000hz")); } @Test @@ -452,7 +477,9 @@ public final class MediaItemExportTest { transformer.start(composition, outputPath); TransformerTestRunner.runLooper(transformer); DumpFileAsserts.assertOutput( - context, muxerFactory.getCreatedMuxer(), getDumpFileName(FILE_AUDIO_RAW + ".48000hz")); + context, + muxerFactory.getCreatedMuxer(), + getDumpFileName(/* originalFileName= */ FILE_AUDIO_RAW, /* modifications...= */ "48000hz")); } @Test @@ -677,7 +704,8 @@ public final class MediaItemExportTest { DumpFileAsserts.assertOutput( context, muxerFactory.getCreatedMuxer(), - getDumpFileName(FILE_WITH_SEF_SLOW_MOTION) + ".noaudio"); + getDumpFileName( + /* originalFileName= */ FILE_WITH_SEF_SLOW_MOTION, /* modifications...= */ "noaudio")); } @Test @@ -774,7 +802,9 @@ public final class MediaItemExportTest { TransformerTestRunner.runLooper(transformer); DumpFileAsserts.assertOutput( - context, muxerFactory.getCreatedMuxer(), getDumpFileName(FILE_AUDIO_RAW + ".aac")); + context, + muxerFactory.getCreatedMuxer(), + getDumpFileName(/* originalFileName= */ FILE_AUDIO_RAW, /* modifications...= */ "aac")); verify(mockListener) .onFallbackApplied( any(Composition.class), @@ -806,7 +836,9 @@ public final class MediaItemExportTest { TransformerTestRunner.runLooper(transformer); DumpFileAsserts.assertOutput( - context, muxerFactory.getCreatedMuxer(), getDumpFileName(FILE_AUDIO_RAW + ".aac")); + context, + muxerFactory.getCreatedMuxer(), + getDumpFileName(/* originalFileName= */ FILE_AUDIO_RAW, /* modifications...= */ "aac")); verify(mockListener) .onFallbackApplied( any(Composition.class), @@ -1024,7 +1056,10 @@ public final class MediaItemExportTest { // Video transcoding in unit tests is not supported. DumpFileAsserts.assertOutput( - context, muxerFactory.getCreatedMuxer(), getDumpFileName(FILE_AUDIO_VIDEO + ".rotated")); + context, + muxerFactory.getCreatedMuxer(), + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_VIDEO, /* modifications...= */ "rotated")); } @Test diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/SequenceExportTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/SequenceExportTest.java index 70dd30ee91..a702a02ed7 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/SequenceExportTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/SequenceExportTest.java @@ -97,7 +97,11 @@ public final class SequenceExportTest { DumpFileAsserts.assertOutput( context, muxerFactory.getCreatedMuxer(), - getDumpFileName(FILE_AUDIO_VIDEO + ".concatenated_transmux")); + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_VIDEO, + /* modifications...= */ "original", + "original", + "transmux")); } @Test @@ -125,7 +129,11 @@ public final class SequenceExportTest { DumpFileAsserts.assertOutput( context, muxerFactory.getCreatedMuxer(), - getDumpFileName(FILE_AUDIO_VIDEO + ".concatenated_transmux")); + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_VIDEO, + /* modifications...= */ "original", + "original", + "transmux")); } @Test @@ -168,7 +176,10 @@ public final class SequenceExportTest { context, muxerFactory.getCreatedMuxer(), getDumpFileName( - FILE_AUDIO_VIDEO_INCREASING_TIMESTAMPS_15S + ".clipped_concatenated_transmux")); + /* originalFileName= */ FILE_AUDIO_VIDEO_INCREASING_TIMESTAMPS_15S, + /* modifications...= */ "clipped", + "clipped", + "transmux")); } @Test @@ -193,7 +204,10 @@ public final class SequenceExportTest { DumpFileAsserts.assertOutput( context, muxerFactory.getCreatedMuxer(), - getDumpFileName(FILE_AUDIO_RAW_VIDEO + ".audio_then_silence")); + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_RAW_VIDEO, + /* modifications...= */ "original", + "silence")); } @Test @@ -218,7 +232,10 @@ public final class SequenceExportTest { DumpFileAsserts.assertOutput( context, muxerFactory.getCreatedMuxer(), - getDumpFileName(FILE_AUDIO_RAW_VIDEO + ".silence_then_audio")); + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_RAW_VIDEO, + /* modifications...= */ "silence", + "original")); } @Test @@ -249,7 +266,10 @@ public final class SequenceExportTest { DumpFileAsserts.assertOutput( context, muxerFactory.getCreatedMuxer(), - getDumpFileName(FILE_AUDIO_RAW_VIDEO + ".audio_then_silence_with_effects")); + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_RAW_VIDEO, + /* modifications...= */ "highPitch", + "silenceHighPitch")); } @Test @@ -258,7 +278,7 @@ public final class SequenceExportTest { Transformer transformer = createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build(); MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW_VIDEO); - EditedMediaItem noAudioEditedMediaItem = + EditedMediaItem silenceEditedMediaItem = new EditedMediaItem.Builder(mediaItem) .setRemoveAudio(true) .setEffects(createAudioEffects(createPitchChangingAudioProcessor(/* pitch= */ 2f))) @@ -269,7 +289,7 @@ public final class SequenceExportTest { .build(); Composition composition = new Composition.Builder( - new EditedMediaItemSequence(noAudioEditedMediaItem, audioEditedMediaItem)) + new EditedMediaItemSequence(silenceEditedMediaItem, audioEditedMediaItem)) .experimentalSetForceAudioTrack(true) .setTransmuxVideo(true) .build(); @@ -280,7 +300,10 @@ public final class SequenceExportTest { DumpFileAsserts.assertOutput( context, muxerFactory.getCreatedMuxer(), - getDumpFileName(FILE_AUDIO_RAW_VIDEO + ".silence_then_audio_with_effects")); + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_RAW_VIDEO, + /* modifications...= */ "silenceHighPitch", + "highPitch")); } @Test @@ -303,7 +326,10 @@ public final class SequenceExportTest { DumpFileAsserts.assertOutput( context, muxerFactory.getCreatedMuxer(), - getDumpFileName(FILE_AUDIO_RAW_VIDEO + ".silence_then_silence")); + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_RAW_VIDEO, + /* modifications...= */ "silence", + "silence")); } @Test @@ -318,10 +344,7 @@ public final class SequenceExportTest { .setEffects(createAudioEffects(createPitchChangingAudioProcessor(/* pitch= */ 2f))) .build(); EditedMediaItem silenceItem = - new EditedMediaItem.Builder(mediaItem) - .setRemoveAudio(true) - .setEffects(createAudioEffects(createPitchChangingAudioProcessor(/* pitch= */ 2f))) - .build(); + new EditedMediaItem.Builder(mediaItem).setRemoveAudio(true).build(); Composition composition = new Composition.Builder(new EditedMediaItemSequence(silenceWithEffectsItem, silenceItem)) .experimentalSetForceAudioTrack(true) @@ -334,7 +357,10 @@ public final class SequenceExportTest { DumpFileAsserts.assertOutput( context, muxerFactory.getCreatedMuxer(), - getDumpFileName(FILE_AUDIO_RAW_VIDEO + ".silence-effects_then_silence")); + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_RAW_VIDEO, + /* modifications...= */ "silenceHighPitch", + "silence")); } @Test @@ -343,12 +369,9 @@ public final class SequenceExportTest { Transformer transformer = createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build(); MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW_VIDEO); - EditedMediaItem silenceWithEffectsItem = - new EditedMediaItem.Builder(mediaItem) - .setRemoveAudio(true) - .setEffects(createAudioEffects(createPitchChangingAudioProcessor(/* pitch= */ 2f))) - .build(); EditedMediaItem silenceItem = + new EditedMediaItem.Builder(mediaItem).setRemoveAudio(true).build(); + EditedMediaItem silenceWithEffectsItem = new EditedMediaItem.Builder(mediaItem) .setRemoveAudio(true) .setEffects(createAudioEffects(createPitchChangingAudioProcessor(/* pitch= */ 2f))) @@ -365,7 +388,10 @@ public final class SequenceExportTest { DumpFileAsserts.assertOutput( context, muxerFactory.getCreatedMuxer(), - getDumpFileName(FILE_AUDIO_RAW_VIDEO + ".silence_then_silence-effects")); + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_RAW_VIDEO, + /* modifications...= */ "silence", + "silenceHighPitch")); } @Test @@ -396,7 +422,10 @@ public final class SequenceExportTest { DumpFileAsserts.assertOutput( context, muxerFactory.getCreatedMuxer(), - getDumpFileName(FILE_AUDIO_RAW_VIDEO + ".silence_then_silence_with_effects")); + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_RAW_VIDEO, + /* modifications...= */ "silenceHighPitch", + "silenceHighPitch")); } @Test @@ -413,7 +442,12 @@ public final class SequenceExportTest { TransformerTestRunner.runLooper(transformer); DumpFileAsserts.assertOutput( - context, muxerFactory.getCreatedMuxer(), getDumpFileName(FILE_AUDIO_RAW + ".concatenated")); + context, + muxerFactory.getCreatedMuxer(), + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_RAW, /* modifications...= */ + "original", + "original")); } @Test @@ -436,7 +470,10 @@ public final class SequenceExportTest { DumpFileAsserts.assertOutput( context, muxerFactory.getCreatedMuxer(), - getDumpFileName(FILE_AUDIO_RAW + ".concatenated_high_pitch")); + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_RAW, + /* modifications...= */ "highPitch", + "highPitch")); } @Test @@ -465,7 +502,10 @@ public final class SequenceExportTest { DumpFileAsserts.assertOutput( context, muxerFactory.getCreatedMuxer(), - getDumpFileName(FILE_AUDIO_RAW + ".high_pitch_then_low_pitch")); + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_RAW, + /* modifications...= */ "highPitch", + "lowPitch")); } @Test @@ -488,7 +528,10 @@ public final class SequenceExportTest { DumpFileAsserts.assertOutput( context, muxerFactory.getCreatedMuxer(), - getDumpFileName(FILE_AUDIO_RAW_STEREO_48000KHZ + "_then_sample.wav")); + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_RAW_STEREO_48000KHZ, + /* modifications...= */ "original", + "sample.wav")); } @Test @@ -516,7 +559,10 @@ public final class SequenceExportTest { DumpFileAsserts.assertOutput( context, muxerFactory.getCreatedMuxer(), - getDumpFileName(FILE_AUDIO_RAW_STEREO_48000KHZ + "-high_pitch_then_sample.wav-high_pitch")); + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_RAW_STEREO_48000KHZ, + /* modifications...= */ "highPitch", + "sample.wavHighPitch")); } @Test @@ -545,6 +591,9 @@ public final class SequenceExportTest { DumpFileAsserts.assertOutput( context, muxerFactory.getCreatedMuxer(), - getDumpFileName(FILE_AUDIO_RAW_STEREO_48000KHZ + "-high_pitch_then_sample.wav-low_pitch")); + getDumpFileName( + /* originalFileName= */ FILE_AUDIO_RAW_STEREO_48000KHZ, + /* modifications...= */ "highPitch", + "sample.wavLowPitch")); } } diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/TestUtil.java b/libraries/transformer/src/test/java/androidx/media3/transformer/TestUtil.java index 11b6f2409d..539bd31c69 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/TestUtil.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/TestUtil.java @@ -78,8 +78,14 @@ public final class TestUtil { return sonicAudioProcessor; } - public static String getDumpFileName(String originalFileName) { - return DUMP_FILE_OUTPUT_DIRECTORY + '/' + originalFileName + '.' + DUMP_FILE_EXTENSION; + public static String getDumpFileName(String originalFileName, String... modifications) { + String fileName = DUMP_FILE_OUTPUT_DIRECTORY + '/' + originalFileName + '/'; + if (modifications.length == 0) { + fileName += "original"; + } else { + fileName += String.join("_", modifications); + } + return fileName + '.' + DUMP_FILE_EXTENSION; } /** diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerWithInAppMuxerEndToEndTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerWithInAppMuxerEndToEndTest.java index c7f955a987..9b3adac45f 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerWithInAppMuxerEndToEndTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerWithInAppMuxerEndToEndTest.java @@ -16,6 +16,8 @@ package androidx.media3.transformer; import static androidx.media3.common.util.Assertions.checkNotNull; +import static androidx.media3.transformer.TestUtil.ASSET_URI_PREFIX; +import static androidx.media3.transformer.TestUtil.FILE_AUDIO_VIDEO; import static com.google.common.truth.Truth.assertThat; import android.content.Context; @@ -43,8 +45,6 @@ import org.junit.runner.RunWith; /** End-to-end test for {@link Transformer} with {@link InAppMuxer}. */ @RunWith(AndroidJUnit4.class) public class TransformerWithInAppMuxerEndToEndTest { - private static final String MP4_FILE_ASSET_DIRECTORY = "asset:///media/"; - private static final String H264_MP4 = "mp4/sample.mp4"; private static final String XMP_SAMPLE_DATA = "media/xmp/sample_datetime_xmp.xmp"; private Context context; private String outputPath; @@ -74,7 +74,7 @@ public class TransformerWithInAppMuxerEndToEndTest { .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setMuxerFactory(inAppMuxerFactory) .build(); - MediaItem mediaItem = MediaItem.fromUri(Uri.parse(MP4_FILE_ASSET_DIRECTORY + H264_MP4)); + MediaItem mediaItem = MediaItem.fromUri(Uri.parse(ASSET_URI_PREFIX + FILE_AUDIO_VIDEO)); transformer.start(mediaItem, outputPath); TransformerTestRunner.runLooper(transformer); @@ -86,7 +86,9 @@ public class TransformerWithInAppMuxerEndToEndTest { DumpFileAsserts.assertOutput( context, fakeExtractorOutput, - TestUtil.getDumpFileName(H264_MP4 + ".with_location_metadata")); + TestUtil.getDumpFileName( + /* originalFileName= */ FILE_AUDIO_VIDEO, + /* modifications...= */ "with_location_metadata")); } @Test @@ -101,7 +103,7 @@ public class TransformerWithInAppMuxerEndToEndTest { .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setMuxerFactory(inAppMuxerFactory) .build(); - MediaItem mediaItem = MediaItem.fromUri(Uri.parse(MP4_FILE_ASSET_DIRECTORY + H264_MP4)); + MediaItem mediaItem = MediaItem.fromUri(Uri.parse(ASSET_URI_PREFIX + FILE_AUDIO_VIDEO)); transformer.start(mediaItem, outputPath); ExportResult exportResult = TransformerTestRunner.runLooper(transformer); @@ -129,7 +131,7 @@ public class TransformerWithInAppMuxerEndToEndTest { .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setMuxerFactory(inAppMuxerFactory) .build(); - MediaItem mediaItem = MediaItem.fromUri(Uri.parse(MP4_FILE_ASSET_DIRECTORY + H264_MP4)); + MediaItem mediaItem = MediaItem.fromUri(Uri.parse(ASSET_URI_PREFIX + FILE_AUDIO_VIDEO)); transformer.start(mediaItem, outputPath); TransformerTestRunner.runLooper(transformer); @@ -139,7 +141,10 @@ public class TransformerWithInAppMuxerEndToEndTest { new Mp4Extractor(), checkNotNull(outputPath)); // [mdta: key=com.android.capture.fps, value=60.0] in video track metadata dump. DumpFileAsserts.assertOutput( - context, fakeExtractorOutput, TestUtil.getDumpFileName(H264_MP4 + ".with_capture_fps")); + context, + fakeExtractorOutput, + TestUtil.getDumpFileName( + /* originalFileName= */ FILE_AUDIO_VIDEO, /* modifications...= */ "with_capture_fps")); } @Test @@ -155,7 +160,7 @@ public class TransformerWithInAppMuxerEndToEndTest { .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setMuxerFactory(inAppMuxerFactory) .build(); - MediaItem mediaItem = MediaItem.fromUri(Uri.parse(MP4_FILE_ASSET_DIRECTORY + H264_MP4)); + MediaItem mediaItem = MediaItem.fromUri(Uri.parse(ASSET_URI_PREFIX + FILE_AUDIO_VIDEO)); transformer.start(mediaItem, outputPath); TransformerTestRunner.runLooper(transformer); @@ -165,7 +170,11 @@ public class TransformerWithInAppMuxerEndToEndTest { new Mp4Extractor(), checkNotNull(outputPath)); // [Creation time: 2_000_000_000_000] in track metadata dump. DumpFileAsserts.assertOutput( - context, fakeExtractorOutput, TestUtil.getDumpFileName(H264_MP4 + ".with_creation_time")); + context, + fakeExtractorOutput, + TestUtil.getDumpFileName( + /* originalFileName= */ FILE_AUDIO_VIDEO, /* modifications...= */ + "with_creation_time")); } @Test @@ -196,7 +205,7 @@ public class TransformerWithInAppMuxerEndToEndTest { .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .setMuxerFactory(inAppMuxerFactory) .build(); - MediaItem mediaItem = MediaItem.fromUri(Uri.parse(MP4_FILE_ASSET_DIRECTORY + H264_MP4)); + MediaItem mediaItem = MediaItem.fromUri(Uri.parse(ASSET_URI_PREFIX + FILE_AUDIO_VIDEO)); transformer.start(mediaItem, outputPath); TransformerTestRunner.runLooper(transformer); @@ -207,6 +216,10 @@ public class TransformerWithInAppMuxerEndToEndTest { // [mdta: key=StringKey, value=StringValue, mdta: key=FloatKey, value=600.0] in track metadata // dump DumpFileAsserts.assertOutput( - context, fakeExtractorOutput, TestUtil.getDumpFileName(H264_MP4 + ".with_custom_metadata")); + context, + fakeExtractorOutput, + TestUtil.getDumpFileName( + /* originalFileName= */ FILE_AUDIO_VIDEO, /* modifications...= */ + "with_custom_metadata")); } }