Fix CapturingMuxer writing of final PCM audio sample to dump file.

Last buffer was not flipped, so was writing the garbage data between limit and capacity, rather than the actual data between position and limit. As a result, all PCM audio dump files need updating. PiperOrigin-RevId: 676452990
androidx · Sep 19, 2024 · 3c5e764 · 3c5e764
1 parent 75c7ee7
commit 3c5e764
Show file tree

Hide file tree

Showing 113 changed files with 251 additions and 219 deletions.
diff --git a/...ts/transformerdumps/composition/seq-sample.wav+seq-sample.wav_clipped_100ms_to_400ms.dump b/...ts/transformerdumps/composition/seq-sample.wav+seq-sample.wav_clipped_100ms_to_400ms.dump
@@ -111,7 +111,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = 1077088737
-  size = 1912
+  dataHashCode = 1128351030
+  size = 2184
   isKeyFrame = true
 released = true
diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence.dump
@@ -246,8 +246,8 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = 1976404865
-  size = 3684
+  dataHashCode = -1355500415
+  size = 412
   isKeyFrame = true
 sample:
   trackType = video

diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence_48000hz.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence_48000hz.dump
@@ -266,8 +266,8 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = 2031626369
-  size = 4092
+  dataHashCode = 923521
+  size = 4
   isKeyFrame = true
 sample:
   trackType = video

diff --git a/...s/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/silence.dump b/...s/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/silence.dump
@@ -242,8 +242,8 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = 1987567745
-  size = 3644
+  dataHashCode = -433692799
+  size = 452
   isKeyFrame = true
 sample:
   trackType = video

diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/toInt16.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/toInt16.dump
@@ -148,8 +148,8 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -1759454975
-  size = 440
+  dataHashCode = 1370367745
+  size = 3656
   isKeyFrame = true
 sample:
   trackType = video

diff --git a/.../src/test/assets/transformerdumps/mp4/sowt-with-video.mov/highPitch_silenceHighPitch.dump b/.../src/test/assets/transformerdumps/mp4/sowt-with-video.mov/highPitch_silenceHighPitch.dump
@@ -963,8 +963,8 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = 1472958721
-  size = 2040
+  dataHashCode = -382505215
+  size = 2056
   isKeyFrame = true
 sample:
   trackType = video

diff --git a/..._data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/mixed_sample_rf64.wav.dump b/..._data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/mixed_sample_rf64.wav.dump
@@ -493,8 +493,8 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -27182462
-  size = 1024
+  dataHashCode = -1813305126
+  size = 3072
   isKeyFrame = true
 sample:
   trackType = video

diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original.dump
@@ -493,8 +493,8 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -27182462
-  size = 1024
+  dataHashCode = -1813305126
+  size = 3072
   isKeyFrame = true
 sample:
   trackType = video

diff --git a/...ata/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times.dump b/...ata/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times.dump
@@ -1433,8 +1433,8 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = 464061918
-  size = 3072
+  dataHashCode = 815816062
+  size = 1024
   isKeyFrame = true
 sample:
   trackType = video

diff --git a/...p4/sowt-with-video.mov/sequence_repeated3Times_mixed_loopingAudiosowt-with-video.mov.dump b/...p4/sowt-with-video.mov/sequence_repeated3Times_mixed_loopingAudiosowt-with-video.mov.dump
@@ -1433,8 +1433,8 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = 1908962033
-  size = 3072
+  dataHashCode = -587460036
+  size = 1024
   isKeyFrame = true
 sample:
   trackType = video

diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence.dump
@@ -456,8 +456,8 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -803568639
-  size = 3552
+  dataHashCode = -204243967
+  size = 544
   isKeyFrame = true
 sample:
   trackType = video

diff --git a/...test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceFromEffect.dump b/...test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceFromEffect.dump
@@ -493,8 +493,8 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -1174962175
-  size = 1024
+  dataHashCode = -303661055
+  size = 3072
   isKeyFrame = true
 sample:
   trackType = video

diff --git a/.../src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_highPitch.dump b/.../src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_highPitch.dump
@@ -886,8 +886,8 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -1129774498
-  size = 3032
+  dataHashCode = -866548203
+  size = 1064
   isKeyFrame = true
 sample:
   trackType = video

diff --git a/...ta/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silence.dump b/...ta/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silence.dump
@@ -886,8 +886,8 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -195367807
-  size = 3036
+  dataHashCode = 1205818241
+  size = 1060
   isKeyFrame = true
 sample:
   trackType = video

diff --git a/...st/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silenceHighPitch.dump b/...st/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silenceHighPitch.dump
@@ -886,8 +886,8 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -1052569343
-  size = 3064
+  dataHashCode = -1631850751
+  size = 1032
   isKeyFrame = true
 sample:
   trackType = video

diff --git a/.../test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_original.dump b/.../test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_original.dump
@@ -886,8 +886,8 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -775647826
-  size = 3004
+  dataHashCode = -1964183239
+  size = 1092
   isKeyFrame = true
 sample:
   trackType = video

diff --git a/...s/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silence.dump b/...s/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silence.dump
@@ -886,8 +886,8 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = 1550256129
-  size = 3008
+  dataHashCode = -1950943231
+  size = 1088
   isKeyFrame = true
 sample:
   trackType = video

diff --git a/...ta/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silenceHighPitch.dump b/...ta/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silenceHighPitch.dump
@@ -886,8 +886,8 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -195367807
-  size = 3036
+  dataHashCode = 1205818241
+  size = 1060
   isKeyFrame = true
 sample:
   trackType = video

diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sample.wav.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sample.wav.dump
@@ -111,7 +111,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = 1077088737
-  size = 1912
+  dataHashCode = 1128351030
+  size = 2184
   isKeyFrame = true
 released = true
diff --git a/.../test_data/src/test/assets/transformerdumps/sequence/sample.wav/sample.wav_halfPitch.dump b/.../test_data/src/test/assets/transformerdumps/sequence/sample.wav/sample.wav_halfPitch.dump
@@ -221,7 +221,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = 1485349377
-  size = 3816
+  dataHashCode = 830951653
+  size = 280
   isKeyFrame = true
 released = true
diff --git a/...s/sequence/sample.wav/sample.wav_halfPitch/sowt-with-video.mov_halfPitch_removeVideo.dump b/...s/sequence/sample.wav/sample.wav_halfPitch/sowt-with-video.mov_halfPitch_removeVideo.dump
@@ -436,7 +436,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -39420967
-  size = 3542
+  dataHashCode = -879237679
+  size = 554
   isKeyFrame = true
 released = true
diff --git a/...formerdumps/sequence/sample.wav/sample.wav_halfPitch/sowt-with-video.mov_removeVideo.dump b/...formerdumps/sequence/sample.wav/sample.wav_halfPitch/sowt-with-video.mov_removeVideo.dump
@@ -436,7 +436,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -221728649
-  size = 3542
+  dataHashCode = 1747164953
+  size = 554
   isKeyFrame = true
 released = true
diff --git a/...ssets/transformerdumps/sequence/sample.wav/sowt-with-video.mov_halfPitch_removeVideo.dump b/...ssets/transformerdumps/sequence/sample.wav/sowt-with-video.mov_halfPitch_removeVideo.dump
@@ -326,7 +326,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = 674573822
-  size = 1638
+  dataHashCode = 302450668
+  size = 2458
   isKeyFrame = true
 released = true
diff --git a/...s/sequence/sample.wav/sowt-with-video.mov_halfPitch_removeVideo/sample.wav_halfPitch.dump b/...s/sequence/sample.wav/sowt-with-video.mov_halfPitch_removeVideo/sample.wav_halfPitch.dump
@@ -436,7 +436,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -665090803
-  size = 3542
+  dataHashCode = -268010279
+  size = 554
   isKeyFrame = true
 released = true
diff --git a/...sample.wav/sowt-with-video.mov_halfPitch_removeVideo/sowt-with-video.mov_removeVideo.dump b/...sample.wav/sowt-with-video.mov_halfPitch_removeVideo/sowt-with-video.mov_removeVideo.dump
@@ -541,7 +541,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -2105333854
-  size = 1364
+  dataHashCode = 1638216174
+  size = 2732
   isKeyFrame = true
 released = true
diff --git a/...src/test/assets/transformerdumps/sequence/sample.wav/sowt-with-video.mov_removeVideo.dump b/...src/test/assets/transformerdumps/sequence/sample.wav/sowt-with-video.mov_removeVideo.dump
@@ -326,7 +326,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = 1472088527
-  size = 1638
+  dataHashCode = -1337329727
+  size = 2458
   isKeyFrame = true
 released = true
diff --git a/...formerdumps/sequence/sample.wav/sowt-with-video.mov_removeVideo/sample.wav_halfPitch.dump b/...formerdumps/sequence/sample.wav/sowt-with-video.mov_removeVideo/sample.wav_halfPitch.dump
@@ -436,7 +436,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -665090803
-  size = 3542
+  dataHashCode = -268010279
+  size = 554
   isKeyFrame = true
 released = true
diff --git a/...sample.wav/sowt-with-video.mov_removeVideo/sowt-with-video.mov_halfPitch_removeVideo.dump b/...sample.wav/sowt-with-video.mov_removeVideo/sowt-with-video.mov_halfPitch_removeVideo.dump
@@ -541,7 +541,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = 1844992323
-  size = 1364
+  dataHashCode = 183219559
+  size = 2732
   isKeyFrame = true
 released = true
diff --git a/libraries/test_data/src/test/assets/transformerdumps/sequence/sample.wav_halfPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/sequence/sample.wav_halfPitch.dump
@@ -111,7 +111,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -1518061899
-  size = 1904
+  dataHashCode = 1532290097
+  size = 2192
   isKeyFrame = true
 released = true
diff --git a/.../test_data/src/test/assets/transformerdumps/sequence/sample.wav_halfPitch/sample.wav.dump b/.../test_data/src/test/assets/transformerdumps/sequence/sample.wav_halfPitch/sample.wav.dump
@@ -221,7 +221,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -321115052
-  size = 3816
+  dataHashCode = 44413891
+  size = 280
   isKeyFrame = true
 released = true
diff --git a/...s/sequence/sample.wav_halfPitch/sample.wav/sowt-with-video.mov_halfPitch_removeVideo.dump b/...s/sequence/sample.wav_halfPitch/sample.wav/sowt-with-video.mov_halfPitch_removeVideo.dump
@@ -436,7 +436,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -39420967
-  size = 3542
+  dataHashCode = -879237679
+  size = 554
   isKeyFrame = true
 released = true
diff --git a/...formerdumps/sequence/sample.wav_halfPitch/sample.wav/sowt-with-video.mov_removeVideo.dump b/...formerdumps/sequence/sample.wav_halfPitch/sample.wav/sowt-with-video.mov_removeVideo.dump
@@ -436,7 +436,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -221728649
-  size = 3542
+  dataHashCode = 1747164953
+  size = 554
   isKeyFrame = true
 released = true
diff --git a/...sformerdumps/sequence/sample.wav_halfPitch/sowt-with-video.mov_halfPitch_removeVideo.dump b/...sformerdumps/sequence/sample.wav_halfPitch/sowt-with-video.mov_halfPitch_removeVideo.dump
@@ -326,7 +326,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -1859721427
-  size = 1630
+  dataHashCode = -635553923
+  size = 2466
   isKeyFrame = true
 released = true
diff --git a/...s/sequence/sample.wav_halfPitch/sowt-with-video.mov_halfPitch_removeVideo/sample.wav.dump b/...s/sequence/sample.wav_halfPitch/sowt-with-video.mov_halfPitch_removeVideo/sample.wav.dump
@@ -436,7 +436,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -2063017723
-  size = 3542
+  dataHashCode = -990371054
+  size = 554
   isKeyFrame = true
 released = true
diff --git a/..._halfPitch/sowt-with-video.mov_halfPitch_removeVideo/sowt-with-video.mov_removeVideo.dump b/..._halfPitch/sowt-with-video.mov_halfPitch_removeVideo/sowt-with-video.mov_removeVideo.dump
@@ -541,7 +541,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -201083611
-  size = 1356
+  dataHashCode = -1754074901
+  size = 2740
   isKeyFrame = true
 released = true
diff --git a/...ssets/transformerdumps/sequence/sample.wav_halfPitch/sowt-with-video.mov_removeVideo.dump b/...ssets/transformerdumps/sequence/sample.wav_halfPitch/sowt-with-video.mov_removeVideo.dump
@@ -326,7 +326,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = 2079911726
-  size = 1630
+  dataHashCode = 2064476194
+  size = 2466
   isKeyFrame = true
 released = true
diff --git a/...formerdumps/sequence/sample.wav_halfPitch/sowt-with-video.mov_removeVideo/sample.wav.dump b/...formerdumps/sequence/sample.wav_halfPitch/sowt-with-video.mov_removeVideo/sample.wav.dump
@@ -436,7 +436,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -2063017723
-  size = 3542
+  dataHashCode = -990371054
+  size = 554
   isKeyFrame = true
 released = true
diff --git a/..._halfPitch/sowt-with-video.mov_removeVideo/sowt-with-video.mov_halfPitch_removeVideo.dump b/..._halfPitch/sowt-with-video.mov_removeVideo/sowt-with-video.mov_halfPitch_removeVideo.dump
@@ -541,7 +541,7 @@ sample:
   isKeyFrame = true
 sample:
   trackType = audio
-  dataHashCode = -384172005
-  size = 1356
+  dataHashCode = -1321718641
+  size = 2740
   isKeyFrame = true
 released = true