Group together PCM audio samples by fixed size in CapturingMuxer dumps.

Reduces flakiness of tests that assert on PCM audio. Tests now have to clearly choose how they want the capturing muxer to handle pcm audio. Note that the only dump files that have changed are those that deal with PCM audio (.wav, sowt, twos, silence). Because of the continuous nature of PCM, timestamps are not part of the dump. PiperOrigin-RevId: 623155302
2026-03-25 09:25:53 +00:00 · 2024-04-09 07:02:03 -07:00 · 2024-04-09 07:02:03 -07:00 · 24b86e73cb
commit 24b86e73cb
parent 9c72fa8a7a
45 changed files with 6206 additions and 6932 deletions
--- 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
@ -25,265 +25,226 @@ sample:
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 23219
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 46439
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 69659
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 92879
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 116099
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 139319
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 162539
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 185759
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 208979
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 232199
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 255419
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 278639
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 301859
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 325079
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 348299
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 371519
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 394739
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 417959
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 441179
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 464399
-sample:
-  trackType = audio
-  dataHashCode = 1728208641
-  size = 2184
-  isKeyFrame = true
-  presentationTimeUs = 487619
-sample:
-  trackType = audio
-  dataHashCode = 620404993
-  size = 6008
-  isKeyFrame = true
-  presentationTimeUs = 500000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 534058
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 557278
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 580498
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 603718
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 626938
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 650158
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 673378
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 696598
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 719818
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 743038
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 766258
-sample:
-  trackType = audio
-  dataHashCode = -809762815
-  size = 8192
-  isKeyFrame = true
-  presentationTimeUs = 789478
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 835918
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 859138
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 882358
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 905578
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 928798
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 952018
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 975238
 sample:
  trackType = audio
-  dataHashCode = 1097317889
-  size = 272
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 998458
 sample:
  trackType = audio
-  dataHashCode = -1506281855
-  size = 4236
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1976404865
+  size = 3684
  isKeyFrame = true
-  presentationTimeUs = 1000000
 sample:
  trackType = video
  dataHashCode = -770308242
--- 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
@ -22,274 +22,249 @@ format video:
 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:
  trackType = audio
-  dataHashCode = 864256769
-  size = 4456
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 23208
 sample:
  trackType = audio
-  dataHashCode = 864256769
-  size = 4456
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 46437
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 69645
 sample:
  trackType = audio
-  dataHashCode = 864256769
-  size = 4456
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 92875
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 116083
 sample:
  trackType = audio
-  dataHashCode = 864256769
-  size = 4456
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 139312
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 162520
 sample:
  trackType = audio
-  dataHashCode = 864256769
-  size = 4456
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 185750
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 208958
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 232187
 sample:
  trackType = audio
-  dataHashCode = 864256769
-  size = 4456
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 255416
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 278625
 sample:
  trackType = audio
-  dataHashCode = 864256769
-  size = 4456
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 301854
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 325062
 sample:
  trackType = audio
-  dataHashCode = 864256769
-  size = 4456
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 348291
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 371500
 sample:
  trackType = audio
-  dataHashCode = 864256769
-  size = 4456
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 394729
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 417937
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 441166
 sample:
  trackType = audio
-  dataHashCode = 864256769
-  size = 4456
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 464395
 sample:
  trackType = audio
-  dataHashCode = -907321727
-  size = 2380
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 487604
 sample:
  trackType = audio
-  dataHashCode = -813809919
-  size = 6536
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 500000
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 534041
 sample:
  trackType = audio
-  dataHashCode = 864256769
-  size = 4456
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 557270
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 580479
 sample:
  trackType = audio
-  dataHashCode = 864256769
-  size = 4456
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 603708
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 626916
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 650145
 sample:
  trackType = audio
-  dataHashCode = 864256769
-  size = 4456
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 673375
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 696583
 sample:
  trackType = audio
-  dataHashCode = 864256769
-  size = 4456
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 719812
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 743020
 sample:
  trackType = audio
-  dataHashCode = 864256769
-  size = 4456
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 766250
 sample:
  trackType = audio
-  dataHashCode = -2002051711
-  size = 8916
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 789458
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 835895
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 859125
 sample:
  trackType = audio
-  dataHashCode = 864256769
-  size = 4456
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 882354
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 905562
 sample:
  trackType = audio
-  dataHashCode = 864256769
-  size = 4456
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 928791
 sample:
  trackType = audio
-  dataHashCode = -266855807
-  size = 4460
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 952000
 sample:
  trackType = audio
-  dataHashCode = 864256769
-  size = 4456
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 975229
 sample:
  trackType = audio
-  dataHashCode = 634299009
-  size = 300
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 998437
 sample:
  trackType = audio
-  dataHashCode = 1020903425
-  size = 4608
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1000000
 sample:
  trackType = audio
-  dataHashCode = 923521
-  size = 4
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 2031626369
+  size = 4092
  isKeyFrame = true
-  presentationTimeUs = 1024000
 sample:
  trackType = video
  dataHashCode = -770308242
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/silence.dump
@ -28,265 +28,221 @@ sample:
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 23219
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 46439
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 69659
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 92879
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 116099
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 139319
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 162539
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 185759
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 208979
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 232199
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 255419
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 278639
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 301859
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 325079
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 348299
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 371519
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 394739
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 417959
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 441179
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 464399
-sample:
-  trackType = audio
-  dataHashCode = 1728208641
-  size = 2184
-  isKeyFrame = true
-  presentationTimeUs = 487619
-sample:
-  trackType = audio
-  dataHashCode = 620404993
-  size = 6008
-  isKeyFrame = true
-  presentationTimeUs = 500000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 534058
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 557278
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 580498
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 603718
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 626938
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 650158
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 673378
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 696598
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 719818
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 743038
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 766258
-sample:
-  trackType = audio
-  dataHashCode = -809762815
-  size = 8192
-  isKeyFrame = true
-  presentationTimeUs = 789478
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 835918
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 859138
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 882358
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 905578
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 928798
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 952018
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 975238
 sample:
  trackType = audio
-  dataHashCode = 1097317889
-  size = 272
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 998458
 sample:
  trackType = audio
-  dataHashCode = -1268670079
-  size = 180
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1987567745
+  size = 3644
  isKeyFrame = true
-  presentationTimeUs = 1000000
 sample:
  trackType = video
  dataHashCode = -770308242
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/original.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/original.dump
@ -27,169 +27,111 @@ sample:
  dataHashCode = -1438864202
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = -2092433631
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 46439
-sample:
-  trackType = audio
-  dataHashCode = -1653024696
+  dataHashCode = 934871277
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 69659
 sample:
  trackType = audio
-  dataHashCode = -547495917
-  size = 2048
+  dataHashCode = 1134999182
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 116099
 sample:
  trackType = audio
  dataHashCode = -174912532
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 139319
 sample:
  trackType = audio
-  dataHashCode = -252010560
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 185759
-sample:
-  trackType = audio
-  dataHashCode = 1063293362
+  dataHashCode = -1005624952
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 208979
 sample:
  trackType = audio
-  dataHashCode = 998418179
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 255419
-sample:
-  trackType = audio
-  dataHashCode = 2144320390
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 278639
-sample:
-  trackType = audio
-  dataHashCode = 1323607601
+  dataHashCode = -1678870804
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 301859
 sample:
  trackType = audio
-  dataHashCode = 121927353
-  size = 2048
+  dataHashCode = -1663719904
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1735249329
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 348299
 sample:
  trackType = audio
  dataHashCode = 1127436171
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 371519
 sample:
  trackType = audio
-  dataHashCode = -1046171005
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 417959
-sample:
-  trackType = audio
-  dataHashCode = 117482046
+  dataHashCode = -508990108
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 441179
 sample:
  trackType = audio
-  dataHashCode = -581689894
-  size = 1092
-  isKeyFrame = true
-  presentationTimeUs = 487619
-sample:
-  trackType = audio
-  dataHashCode = 295292320
-  size = 3004
-  isKeyFrame = true
-  presentationTimeUs = 500000
-sample:
-  trackType = audio
-  dataHashCode = 1468767877
+  dataHashCode = 1930479446
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 534058
 sample:
  trackType = audio
-  dataHashCode = 768969434
-  size = 2048
+  dataHashCode = -167569148
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 202160218
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 580498
 sample:
  trackType = audio
  dataHashCode = 1519515939
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 603718
 sample:
  trackType = audio
-  dataHashCode = 541671067
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 650158
-sample:
-  trackType = audio
-  dataHashCode = 1995710324
+  dataHashCode = -1072406739
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 673378
 sample:
  trackType = audio
-  dataHashCode = 1112434809
-  size = 2048
+  dataHashCode = 33449818
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 719818
 sample:
  trackType = audio
  dataHashCode = -271975432
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 743038
 sample:
  trackType = audio
-  dataHashCode = -2122603520
-  size = 2048
+  dataHashCode = -1029917087
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 789478
 sample:
  trackType = audio
-  dataHashCode = -653258142
-  size = 2048
+  dataHashCode = 1547114815
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 812698
 sample:
  trackType = audio
-  dataHashCode = 2145903672
-  size = 8192
+  dataHashCode = 1307364090
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 835918
 sample:
  trackType = audio
-  dataHashCode = -323774996
-  size = 6280
+  dataHashCode = 1545711502
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 928798
 sample:
  trackType = audio
-  dataHashCode = 1561565732
-  size = 1912
+  dataHashCode = -1034138750
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1000000
 sample:
  trackType = video
  dataHashCode = -770308242
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/silence.dump
@ -25,277 +25,236 @@ sample:
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 23219
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 46439
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 69659
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 92879
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 116099
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 139319
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 162539
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 185759
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 208979
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 232199
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 255419
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 278639
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 301859
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 325079
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 348299
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 371519
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 394739
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 417959
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 441179
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 464399
-sample:
-  trackType = audio
-  dataHashCode = 1728208641
-  size = 2184
-  isKeyFrame = true
-  presentationTimeUs = 487619
-sample:
-  trackType = audio
-  dataHashCode = 620404993
-  size = 6008
-  isKeyFrame = true
-  presentationTimeUs = 500000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 534058
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 557278
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 580498
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 603718
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 626938
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 650158
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 673378
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 696598
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 719818
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 743038
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 766258
-sample:
-  trackType = audio
-  dataHashCode = -809762815
-  size = 8192
-  isKeyFrame = true
-  presentationTimeUs = 789478
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 835918
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 859138
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 882358
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 905578
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 928798
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 952018
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 975238
-sample:
-  trackType = audio
-  dataHashCode = 1097317889
-  size = 272
-  isKeyFrame = true
-  presentationTimeUs = 998458
-sample:
-  trackType = audio
-  dataHashCode = 2136490497
-  size = 7920
-  isKeyFrame = true
-  presentationTimeUs = 1000000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1044897
 sample:
  trackType = audio
-  dataHashCode = 1976404865
-  size = 3684
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1355500415
+  size = 412
  isKeyFrame = true
-  presentationTimeUs = 1068117
 sample:
  trackType = video
  dataHashCode = -770308242
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/silenceFromEffect.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/silenceFromEffect.dump
@ -27,169 +27,111 @@ sample:
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
-sample:
-  trackType = audio
-  dataHashCode = -1276182527
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 46439
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 69659
-sample:
-  trackType = audio
-  dataHashCode = -1276182527
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 116099
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 139319
-sample:
-  trackType = audio
-  dataHashCode = -1276182527
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 185759
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 208979
-sample:
-  trackType = audio
-  dataHashCode = -1276182527
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 255419
-sample:
-  trackType = audio
-  dataHashCode = -1276182527
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 278639
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 301859
-sample:
-  trackType = audio
-  dataHashCode = -1276182527
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 348299
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 371519
-sample:
-  trackType = audio
-  dataHashCode = -1276182527
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 417959
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 441179
-sample:
-  trackType = audio
-  dataHashCode = 1737035649
-  size = 1092
-  isKeyFrame = true
-  presentationTimeUs = 487619
-sample:
-  trackType = audio
-  dataHashCode = -345689983
-  size = 3004
-  isKeyFrame = true
-  presentationTimeUs = 500000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 534058
-sample:
-  trackType = audio
-  dataHashCode = -1276182527
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 580498
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 603718
-sample:
-  trackType = audio
-  dataHashCode = -1276182527
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 650158
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 673378
-sample:
-  trackType = audio
-  dataHashCode = -1276182527
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 719818
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 743038
 sample:
  trackType = audio
-  dataHashCode = -1276182527
-  size = 2048
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 789478
 sample:
  trackType = audio
-  dataHashCode = -1276182527
-  size = 2048
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 812698
 sample:
  trackType = audio
-  dataHashCode = -809762815
-  size = 8192
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 835918
 sample:
  trackType = audio
-  dataHashCode = 820010753
-  size = 6280
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 928798
 sample:
  trackType = audio
-  dataHashCode = 521969921
-  size = 1912
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1000000
 sample:
  trackType = video
  dataHashCode = -770308242
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/highPitch_silenceHighPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/highPitch_silenceHighPitch.dump
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/mixed_sample_rf64.wav.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/mixed_sample_rf64.wav.dump
@ -29,571 +29,471 @@ sample:
  dataHashCode = 1831484889
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
  dataHashCode = 249663982
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 21333
 sample:
  trackType = audio
  dataHashCode = -952375988
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 42666
 sample:
  trackType = audio
  dataHashCode = -1104767232
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 64000
 sample:
  trackType = audio
  dataHashCode = 1071735193
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 85333
 sample:
  trackType = audio
  dataHashCode = 11797379
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 106666
 sample:
  trackType = audio
  dataHashCode = -1312208757
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 128000
 sample:
  trackType = audio
  dataHashCode = -1049109782
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 149333
 sample:
  trackType = audio
  dataHashCode = -1406320840
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 170666
 sample:
  trackType = audio
  dataHashCode = 554600029
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 192000
 sample:
  trackType = audio
  dataHashCode = 1771684952
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 213333
 sample:
  trackType = audio
  dataHashCode = 1475714894
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 234666
 sample:
  trackType = audio
  dataHashCode = -1988052938
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 256000
 sample:
  trackType = audio
  dataHashCode = -22374423
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 277333
 sample:
  trackType = audio
  dataHashCode = 173831080
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 298666
 sample:
  trackType = audio
  dataHashCode = -1779394374
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 320000
 sample:
  trackType = audio
  dataHashCode = 773790323
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 341333
 sample:
  trackType = audio
  dataHashCode = -570703176
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 362666
 sample:
  trackType = audio
  dataHashCode = -1176598744
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 384000
 sample:
  trackType = audio
  dataHashCode = -913365417
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 405333
 sample:
  trackType = audio
  dataHashCode = 521709915
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 426666
 sample:
  trackType = audio
  dataHashCode = 1512550842
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 448000
 sample:
  trackType = audio
-  dataHashCode = 1765254183
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 469333
-sample:
-  trackType = audio
-  dataHashCode = 339365731
-  size = 3840
-  isKeyFrame = true
-  presentationTimeUs = 480000
-sample:
-  trackType = audio
-  dataHashCode = 1278884562
-  size = 4352
-  isKeyFrame = true
-  presentationTimeUs = 500000
-sample:
-  trackType = audio
-  dataHashCode = 1174956589
+  dataHashCode = -977083996
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 522666
 sample:
  trackType = audio
-  dataHashCode = 54236254
+  dataHashCode = 151766236
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 544000
 sample:
  trackType = audio
-  dataHashCode = -501338117
+  dataHashCode = 290836596
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 565333
 sample:
  trackType = audio
-  dataHashCode = 1365906255
+  dataHashCode = 1293204143
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 586666
 sample:
  trackType = audio
-  dataHashCode = 2043204335
+  dataHashCode = 1583378414
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 608000
 sample:
  trackType = audio
-  dataHashCode = 528997522
+  dataHashCode = 1010598904
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 629333
 sample:
  trackType = audio
-  dataHashCode = 2133982452
+  dataHashCode = -1601131727
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 650666
 sample:
  trackType = audio
-  dataHashCode = 1762417191
+  dataHashCode = 476052144
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 672000
 sample:
  trackType = audio
-  dataHashCode = -624574789
+  dataHashCode = -1722819382
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 693333
 sample:
  trackType = audio
-  dataHashCode = -1817205509
+  dataHashCode = -104073993
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 714666
 sample:
  trackType = audio
-  dataHashCode = -112912892
+  dataHashCode = -1183326444
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 736000
 sample:
  trackType = audio
-  dataHashCode = 900141333
+  dataHashCode = -1471701996
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 757333
 sample:
  trackType = audio
-  dataHashCode = 784519479
+  dataHashCode = 1721028706
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 778666
 sample:
  trackType = audio
-  dataHashCode = -409071905
+  dataHashCode = -835928084
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 800000
 sample:
  trackType = audio
-  dataHashCode = 344790067
+  dataHashCode = -752755934
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 821333
 sample:
  trackType = audio
-  dataHashCode = -1164444623
+  dataHashCode = -1014841053
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 842666
 sample:
  trackType = audio
-  dataHashCode = 1795739959
+  dataHashCode = -5244765
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 864000
 sample:
  trackType = audio
-  dataHashCode = 1614373437
+  dataHashCode = -189896781
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 885333
 sample:
  trackType = audio
-  dataHashCode = 1292287631
+  dataHashCode = -816272711
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 906666
 sample:
  trackType = audio
-  dataHashCode = -113996230
+  dataHashCode = 287875876
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 928000
 sample:
  trackType = audio
-  dataHashCode = 1943059757
-  size = 2048
+  dataHashCode = -493356528
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1683631739
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -861196079
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 949333
 sample:
  trackType = audio
  dataHashCode = 1804207347
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 960000
 sample:
  trackType = audio
-  dataHashCode = 43993965
-  size = 3584
+  dataHashCode = 196164772
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 981333
 sample:
  trackType = audio
-  dataHashCode = 984760779
-  size = 4608
+  dataHashCode = -1100787564
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1000000
 sample:
  trackType = audio
  dataHashCode = -1345957974
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1024000
 sample:
  trackType = audio
  dataHashCode = -488143400
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1045333
 sample:
  trackType = audio
  dataHashCode = -10223628
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1066666
 sample:
  trackType = audio
  dataHashCode = 1536847847
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1088000
 sample:
  trackType = audio
  dataHashCode = 753825301
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1109333
 sample:
  trackType = audio
  dataHashCode = 462774015
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1130666
 sample:
  trackType = audio
  dataHashCode = 1959522750
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1152000
 sample:
  trackType = audio
  dataHashCode = -852953535
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1173333
 sample:
  trackType = audio
  dataHashCode = -795715262
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1194666
 sample:
  trackType = audio
  dataHashCode = -1096849459
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1216000
 sample:
  trackType = audio
  dataHashCode = -10453887
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1237333
 sample:
  trackType = audio
  dataHashCode = 1764903846
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1258666
 sample:
  trackType = audio
  dataHashCode = 383125128
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1280000
 sample:
  trackType = audio
  dataHashCode = -1991155096
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1301333
 sample:
  trackType = audio
  dataHashCode = -2077760291
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1322666
 sample:
  trackType = audio
  dataHashCode = 2096309171
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1344000
 sample:
  trackType = audio
  dataHashCode = 306595787
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1365333
 sample:
  trackType = audio
  dataHashCode = -2137344472
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1386666
 sample:
  trackType = audio
  dataHashCode = 1093707365
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1408000
 sample:
  trackType = audio
-  dataHashCode = -997378617
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 1429333
-sample:
-  trackType = audio
-  dataHashCode = -1670770694
+  dataHashCode = -826848566
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1440000
 sample:
  trackType = audio
-  dataHashCode = 1442792767
+  dataHashCode = 598267634
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1461333
 sample:
  trackType = audio
-  dataHashCode = 674218658
-  size = 3328
-  isKeyFrame = true
-  presentationTimeUs = 1482666
-sample:
-  trackType = audio
-  dataHashCode = -324278615
-  size = 4864
-  isKeyFrame = true
-  presentationTimeUs = 1500000
-sample:
-  trackType = audio
-  dataHashCode = 496920829
+  dataHashCode = -864852241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1525333
 sample:
  trackType = audio
-  dataHashCode = -99594500
+  dataHashCode = 1809702128
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1546666
 sample:
  trackType = audio
-  dataHashCode = -264618293
+  dataHashCode = -1614324273
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1568000
 sample:
  trackType = audio
-  dataHashCode = -1415739289
+  dataHashCode = -671278854
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1589333
 sample:
  trackType = audio
-  dataHashCode = -703388491
+  dataHashCode = -1596428232
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1610666
 sample:
  trackType = audio
-  dataHashCode = 9593536
+  dataHashCode = -1491661393
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1632000
 sample:
  trackType = audio
-  dataHashCode = -381626353
+  dataHashCode = -1345324901
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1653333
 sample:
  trackType = audio
-  dataHashCode = -717477106
+  dataHashCode = -494252355
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1674666
 sample:
  trackType = audio
-  dataHashCode = 1194530025
+  dataHashCode = 628101539
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1696000
 sample:
  trackType = audio
-  dataHashCode = 238709606
+  dataHashCode = 1559329530
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1717333
 sample:
  trackType = audio
-  dataHashCode = 1182260137
+  dataHashCode = 33458315
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1738666
 sample:
  trackType = audio
-  dataHashCode = 1312602451
+  dataHashCode = -346868389
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1760000
 sample:
  trackType = audio
-  dataHashCode = 284338052
+  dataHashCode = 793986204
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1781333
 sample:
  trackType = audio
-  dataHashCode = 1253567481
+  dataHashCode = -790083813
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1802666
 sample:
  trackType = audio
-  dataHashCode = 1182777058
+  dataHashCode = 318703351
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1824000
 sample:
  trackType = audio
-  dataHashCode = 1565790276
+  dataHashCode = -1886284670
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1845333
 sample:
  trackType = audio
-  dataHashCode = 75312942
+  dataHashCode = 1358755786
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1866666
 sample:
  trackType = audio
-  dataHashCode = 625727388
+  dataHashCode = -1054390499
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1888000
 sample:
  trackType = audio
-  dataHashCode = 2077456650
-  size = 2048
+  dataHashCode = -797666266
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1248986964
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -843257838
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1909333
 sample:
  trackType = audio
  dataHashCode = 640691272
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1920000
 sample:
  trackType = audio
-  dataHashCode = -1922462961
-  size = 8192
+  dataHashCode = -622869771
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1941333
 sample:
  trackType = audio
-  dataHashCode = -1813305126
-  size = 3072
+  dataHashCode = 1995556891
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -27182462
+  size = 1024
  isKeyFrame = true
-  presentationTimeUs = 1984000
 sample:
  trackType = video
  dataHashCode = 33691269
--- 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
@ -29,571 +29,471 @@ sample:
  dataHashCode = 1831484889
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
  dataHashCode = 1124113244
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 21333
 sample:
  trackType = audio
  dataHashCode = -1544973874
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 42666
 sample:
  trackType = audio
  dataHashCode = -582482821
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 64000
 sample:
  trackType = audio
  dataHashCode = -191772359
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 85333
 sample:
  trackType = audio
  dataHashCode = -505360091
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 106666
 sample:
  trackType = audio
  dataHashCode = -1981702659
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 128000
 sample:
  trackType = audio
  dataHashCode = 566215790
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 149333
 sample:
  trackType = audio
  dataHashCode = 1512511272
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 170666
 sample:
  trackType = audio
  dataHashCode = 379933452
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 192000
 sample:
  trackType = audio
  dataHashCode = 2123773516
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 213333
 sample:
  trackType = audio
  dataHashCode = -387676769
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 234666
 sample:
  trackType = audio
  dataHashCode = 699592678
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 256000
 sample:
  trackType = audio
  dataHashCode = -1267707870
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 277333
 sample:
  trackType = audio
  dataHashCode = -58916173
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 298666
 sample:
  trackType = audio
  dataHashCode = -1097526806
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 320000
 sample:
  trackType = audio
  dataHashCode = -295108001
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 341333
 sample:
  trackType = audio
  dataHashCode = -570703176
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 362666
 sample:
  trackType = audio
  dataHashCode = -1176598744
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 384000
 sample:
  trackType = audio
  dataHashCode = -913365417
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 405333
 sample:
  trackType = audio
  dataHashCode = 521709915
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 426666
 sample:
  trackType = audio
  dataHashCode = 1512550842
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 448000
 sample:
  trackType = audio
-  dataHashCode = 1765254183
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 469333
-sample:
-  trackType = audio
-  dataHashCode = 339365731
-  size = 3840
-  isKeyFrame = true
-  presentationTimeUs = 480000
-sample:
-  trackType = audio
-  dataHashCode = 1278884562
-  size = 4352
-  isKeyFrame = true
-  presentationTimeUs = 500000
-sample:
-  trackType = audio
-  dataHashCode = 1174956589
+  dataHashCode = -977083996
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 522666
 sample:
  trackType = audio
-  dataHashCode = 54236254
+  dataHashCode = 151766236
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 544000
 sample:
  trackType = audio
-  dataHashCode = -501338117
+  dataHashCode = 290836596
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 565333
 sample:
  trackType = audio
-  dataHashCode = 1365906255
+  dataHashCode = 1293204143
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 586666
 sample:
  trackType = audio
-  dataHashCode = 2043204335
+  dataHashCode = 1583378414
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 608000
 sample:
  trackType = audio
-  dataHashCode = 528997522
+  dataHashCode = 1010598904
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 629333
 sample:
  trackType = audio
-  dataHashCode = 2133982452
+  dataHashCode = -1601131727
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 650666
 sample:
  trackType = audio
-  dataHashCode = 1762417191
+  dataHashCode = 476052144
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 672000
 sample:
  trackType = audio
-  dataHashCode = -624574789
+  dataHashCode = -1722819382
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 693333
 sample:
  trackType = audio
-  dataHashCode = -1817205509
+  dataHashCode = -104073993
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 714666
 sample:
  trackType = audio
-  dataHashCode = -112912892
+  dataHashCode = -1183326444
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 736000
 sample:
  trackType = audio
-  dataHashCode = 900141333
+  dataHashCode = -1471701996
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 757333
 sample:
  trackType = audio
-  dataHashCode = 784519479
+  dataHashCode = 1721028706
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 778666
 sample:
  trackType = audio
-  dataHashCode = -409071905
+  dataHashCode = -835928084
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 800000
 sample:
  trackType = audio
-  dataHashCode = 344790067
+  dataHashCode = -752755934
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 821333
 sample:
  trackType = audio
-  dataHashCode = -1164444623
+  dataHashCode = -1014841053
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 842666
 sample:
  trackType = audio
-  dataHashCode = 1795739959
+  dataHashCode = -5244765
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 864000
 sample:
  trackType = audio
-  dataHashCode = 1614373437
+  dataHashCode = -189896781
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 885333
 sample:
  trackType = audio
-  dataHashCode = 1292287631
+  dataHashCode = -816272711
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 906666
 sample:
  trackType = audio
-  dataHashCode = -113996230
+  dataHashCode = 287875876
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 928000
 sample:
  trackType = audio
-  dataHashCode = 1943059757
-  size = 2048
+  dataHashCode = -493356528
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1683631739
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -861196079
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 949333
 sample:
  trackType = audio
  dataHashCode = 1804207347
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 960000
 sample:
  trackType = audio
-  dataHashCode = 43993965
-  size = 3584
+  dataHashCode = 196164772
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 981333
 sample:
  trackType = audio
-  dataHashCode = 984760779
-  size = 4608
+  dataHashCode = -1100787564
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1000000
 sample:
  trackType = audio
  dataHashCode = -1345957974
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1024000
 sample:
  trackType = audio
  dataHashCode = -488143400
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1045333
 sample:
  trackType = audio
  dataHashCode = -10223628
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1066666
 sample:
  trackType = audio
  dataHashCode = 1536847847
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1088000
 sample:
  trackType = audio
  dataHashCode = 753825301
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1109333
 sample:
  trackType = audio
  dataHashCode = 462774015
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1130666
 sample:
  trackType = audio
  dataHashCode = 1959522750
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1152000
 sample:
  trackType = audio
  dataHashCode = -852953535
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1173333
 sample:
  trackType = audio
  dataHashCode = -795715262
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1194666
 sample:
  trackType = audio
  dataHashCode = -1096849459
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1216000
 sample:
  trackType = audio
  dataHashCode = -10453887
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1237333
 sample:
  trackType = audio
  dataHashCode = 1764903846
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1258666
 sample:
  trackType = audio
  dataHashCode = 383125128
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1280000
 sample:
  trackType = audio
  dataHashCode = -1991155096
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1301333
 sample:
  trackType = audio
  dataHashCode = -2077760291
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1322666
 sample:
  trackType = audio
  dataHashCode = 2096309171
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1344000
 sample:
  trackType = audio
  dataHashCode = 306595787
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1365333
 sample:
  trackType = audio
  dataHashCode = -2137344472
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1386666
 sample:
  trackType = audio
  dataHashCode = 1093707365
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1408000
 sample:
  trackType = audio
-  dataHashCode = -997378617
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 1429333
-sample:
-  trackType = audio
-  dataHashCode = -1670770694
+  dataHashCode = -826848566
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1440000
 sample:
  trackType = audio
-  dataHashCode = 1442792767
+  dataHashCode = 598267634
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1461333
 sample:
  trackType = audio
-  dataHashCode = 674218658
-  size = 3328
-  isKeyFrame = true
-  presentationTimeUs = 1482666
-sample:
-  trackType = audio
-  dataHashCode = -324278615
-  size = 4864
-  isKeyFrame = true
-  presentationTimeUs = 1500000
-sample:
-  trackType = audio
-  dataHashCode = 496920829
+  dataHashCode = -864852241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1525333
 sample:
  trackType = audio
-  dataHashCode = -99594500
+  dataHashCode = 1809702128
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1546666
 sample:
  trackType = audio
-  dataHashCode = -264618293
+  dataHashCode = -1614324273
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1568000
 sample:
  trackType = audio
-  dataHashCode = -1415739289
+  dataHashCode = -671278854
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1589333
 sample:
  trackType = audio
-  dataHashCode = -703388491
+  dataHashCode = -1596428232
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1610666
 sample:
  trackType = audio
-  dataHashCode = 9593536
+  dataHashCode = -1491661393
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1632000
 sample:
  trackType = audio
-  dataHashCode = -381626353
+  dataHashCode = -1345324901
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1653333
 sample:
  trackType = audio
-  dataHashCode = -717477106
+  dataHashCode = -494252355
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1674666
 sample:
  trackType = audio
-  dataHashCode = 1194530025
+  dataHashCode = 628101539
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1696000
 sample:
  trackType = audio
-  dataHashCode = 238709606
+  dataHashCode = 1559329530
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1717333
 sample:
  trackType = audio
-  dataHashCode = 1182260137
+  dataHashCode = 33458315
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1738666
 sample:
  trackType = audio
-  dataHashCode = 1312602451
+  dataHashCode = -346868389
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1760000
 sample:
  trackType = audio
-  dataHashCode = 284338052
+  dataHashCode = 793986204
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1781333
 sample:
  trackType = audio
-  dataHashCode = 1253567481
+  dataHashCode = -790083813
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1802666
 sample:
  trackType = audio
-  dataHashCode = 1182777058
+  dataHashCode = 318703351
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1824000
 sample:
  trackType = audio
-  dataHashCode = 1565790276
+  dataHashCode = -1886284670
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1845333
 sample:
  trackType = audio
-  dataHashCode = 75312942
+  dataHashCode = 1358755786
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1866666
 sample:
  trackType = audio
-  dataHashCode = 625727388
+  dataHashCode = -1054390499
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1888000
 sample:
  trackType = audio
-  dataHashCode = 2077456650
-  size = 2048
+  dataHashCode = -797666266
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1248986964
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -843257838
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1909333
 sample:
  trackType = audio
  dataHashCode = 640691272
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1920000
 sample:
  trackType = audio
-  dataHashCode = -1922462961
-  size = 8192
+  dataHashCode = -622869771
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1941333
 sample:
  trackType = audio
-  dataHashCode = -1813305126
-  size = 3072
+  dataHashCode = 1995556891
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -27182462
+  size = 1024
  isKeyFrame = true
-  presentationTimeUs = 1984000
 sample:
  trackType = video
  dataHashCode = 33691269
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original_silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original_silence.dump
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times.dump
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times_mixed_loopingAudiosowt-with-video.mov.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times_mixed_loopingAudiosowt-with-video.mov.dump
--- 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
@ -27,505 +27,436 @@ sample:
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 23219
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 46439
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 69659
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 92879
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 116099
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 139319
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 162539
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 185759
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 208979
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 232199
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 255419
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 278639
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 301859
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 325079
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 348299
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 371519
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 394739
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 417959
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 441179
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 464399
 sample:
  trackType = audio
-  dataHashCode = 1728208641
-  size = 2184
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 487619
 sample:
  trackType = audio
-  dataHashCode = 620404993
-  size = 6008
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 500000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 534058
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 557278
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 580498
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 603718
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 626938
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 650158
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 673378
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 696598
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 719818
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 743038
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 766258
 sample:
  trackType = audio
-  dataHashCode = -809762815
-  size = 8192
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 789478
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 835918
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 859138
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 882358
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 905578
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 928798
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 952018
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 975238
 sample:
  trackType = audio
-  dataHashCode = 1097317889
-  size = 272
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 998458
 sample:
  trackType = audio
-  dataHashCode = 2136490497
-  size = 7920
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1000000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1044897
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1068117
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1091337
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1114557
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1137777
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1160997
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1184217
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1207437
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1230657
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1253877
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1277097
 sample:
  trackType = audio
-  dataHashCode = -809762815
-  size = 8192
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1300317
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1346757
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1369977
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1393197
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1416417
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1439637
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1462857
 sample:
  trackType = audio
-  dataHashCode = -1544807167
-  size = 2456
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1486077
 sample:
  trackType = audio
-  dataHashCode = 370729729
-  size = 5736
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1500000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1532517
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1555736
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1578956
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1602176
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1625396
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1648616
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1671836
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1695056
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1718276
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1741496
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1764716
 sample:
  trackType = audio
-  dataHashCode = -809762815
-  size = 8192
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1787936
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1834376
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1857596
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1880816
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1904036
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1927256
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1950476
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1973696
 sample:
  trackType = audio
-  dataHashCode = -204243967
-  size = 544
+  dataHashCode = -803568639
+  size = 3552
  isKeyFrame = true
-  presentationTimeUs = 1996916
 sample:
  trackType = video
  dataHashCode = 33691269
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceFromEffect.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceFromEffect.dump
@ -29,571 +29,471 @@ sample:
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 21333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 42666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 64000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 85333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 106666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 128000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 149333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 170666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 192000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 213333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 234666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 256000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 277333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 298666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 320000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 341333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 362666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 384000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 405333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 426666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 448000
 sample:
  trackType = audio
-  dataHashCode = -1276182527
-  size = 2048
-  isKeyFrame = true
-  presentationTimeUs = 469333
-sample:
-  trackType = audio
-  dataHashCode = -1017110527
-  size = 3840
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 480000
 sample:
  trackType = audio
-  dataHashCode = -1873027071
-  size = 4352
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 500000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 522666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 544000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 565333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 586666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 608000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 629333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 650666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 672000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 693333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 714666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 736000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 757333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 778666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 800000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 821333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 842666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 864000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 885333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 906666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 928000
 sample:
  trackType = audio
-  dataHashCode = -1276182527
-  size = 2048
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 949333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 960000
 sample:
  trackType = audio
-  dataHashCode = -1562230783
-  size = 3584
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 981333
 sample:
  trackType = audio
-  dataHashCode = 1020903425
-  size = 4608
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1000000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1024000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1045333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1066666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1088000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1109333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1130666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1152000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1173333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1194666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1216000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1237333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1258666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1280000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1301333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1322666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1344000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1365333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1386666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1408000
 sample:
  trackType = audio
-  dataHashCode = -1276182527
-  size = 2048
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1429333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1440000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1461333
 sample:
  trackType = audio
-  dataHashCode = 107241473
-  size = 3328
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1482666
 sample:
  trackType = audio
-  dataHashCode = 1834459137
-  size = 4864
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1500000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1525333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1546666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1568000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1589333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1610666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1632000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1653333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1674666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1696000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1717333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1738666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1760000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1781333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1802666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1824000
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1845333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1866666
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1888000
 sample:
  trackType = audio
-  dataHashCode = -1276182527
-  size = 2048
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1909333
 sample:
  trackType = audio
  dataHashCode = 1742602241
  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1920000
 sample:
  trackType = audio
-  dataHashCode = -809762815
-  size = 8192
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1941333
 sample:
  trackType = audio
-  dataHashCode = -303661055
-  size = 3072
+  dataHashCode = -1174962175
+  size = 1024
  isKeyFrame = true
-  presentationTimeUs = 1984000
 sample:
  trackType = video
  dataHashCode = 33691269
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_highPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_highPitch.dump
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silence.dump
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silenceHighPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silenceHighPitch.dump
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_original.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_original.dump
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silence.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silence.dump
--- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silenceHighPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silenceHighPitch.dump
--- 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
@ -6,68 +6,122 @@ format audio:
  pcmEncoding = 2
 sample:
  trackType = audio
-  dataHashCode = -206878443
-  size = 9598
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = 1925380271
-  size = 9600
+  dataHashCode = 1865979287
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 99979
 sample:
  trackType = audio
-  dataHashCode = -1463691457
-  size = 9600
+  dataHashCode = -1115288170
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 199979
 sample:
  trackType = audio
-  dataHashCode = -1949646832
-  size = 9600
+  dataHashCode = -681025203
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 299979
 sample:
  trackType = audio
-  dataHashCode = 448289446
-  size = 9600
+  dataHashCode = 1252072549
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 399979
 sample:
  trackType = audio
-  dataHashCode = 774
-  size = 2
+  dataHashCode = -776922413
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 499979
 sample:
  trackType = audio
-  dataHashCode = 389300669
-  size = 19198
+  dataHashCode = -1711721139
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 500000
 sample:
  trackType = audio
-  dataHashCode = 1861606067
-  size = 9600
+  dataHashCode = 237489105
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 699979
 sample:
  trackType = audio
-  dataHashCode = -1038569478
-  size = 9600
+  dataHashCode = -1106450958
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 799979
 sample:
  trackType = audio
-  dataHashCode = 646441790
-  size = 9600
+  dataHashCode = 681835765
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 899979
 sample:
  trackType = audio
-  dataHashCode = 340
-  size = 2
+  dataHashCode = 1588549876
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -932919793
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1774998140
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1061245027
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1536105885
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1242991676
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 2085407024
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -195897488
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1050064135
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 112662828
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 16037415
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1890915913
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1109003450
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1868615162
+  size = 2304
  isKeyFrame = true
-  presentationTimeUs = 999979
 released = true
--- a/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/48000hzViaComposition.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/48000hzViaComposition.dump
@ -6,68 +6,122 @@ format audio:
  pcmEncoding = 2
 sample:
  trackType = audio
-  dataHashCode = -206878443
-  size = 9598
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = 1925380271
-  size = 9600
+  dataHashCode = 1865979287
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 99979
 sample:
  trackType = audio
-  dataHashCode = -1463691457
-  size = 9600
+  dataHashCode = -1115288170
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 199979
 sample:
  trackType = audio
-  dataHashCode = -1949646832
-  size = 9600
+  dataHashCode = -681025203
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 299979
 sample:
  trackType = audio
-  dataHashCode = 448289446
-  size = 9600
+  dataHashCode = 1252072549
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 399979
 sample:
  trackType = audio
-  dataHashCode = 1075917616
-  size = 9600
+  dataHashCode = -776922413
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 499979
 sample:
  trackType = audio
-  dataHashCode = -2108784941
-  size = 9600
+  dataHashCode = -1711721139
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 599979
 sample:
  trackType = audio
-  dataHashCode = 1861606067
-  size = 9600
+  dataHashCode = 237489105
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 699979
 sample:
  trackType = audio
-  dataHashCode = -1038569478
-  size = 9600
+  dataHashCode = -1106450958
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 799979
 sample:
  trackType = audio
-  dataHashCode = 646441790
-  size = 9600
+  dataHashCode = 681835765
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 899979
 sample:
  trackType = audio
-  dataHashCode = 340
-  size = 2
+  dataHashCode = 1588549876
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -932919793
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1774998140
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1061245027
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1536105885
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1242991676
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 2085407024
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -195897488
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1050064135
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 112662828
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 16037415
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1890915913
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1109003450
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1868615162
+  size = 2304
  isKeyFrame = true
-  presentationTimeUs = 999979
 released = true
--- a/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/clipped.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/clipped.dump
@ -6,26 +6,47 @@ format audio:
  pcmEncoding = 2
 sample:
  trackType = audio
-  dataHashCode = -8136122
-  size = 8820
+  dataHashCode = 769857189
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = 1750866613
-  size = 8820
+  dataHashCode = 1319774907
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 100000
 sample:
  trackType = audio
-  dataHashCode = -1100753636
-  size = 8820
+  dataHashCode = 1874886243
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 200000
 sample:
  trackType = audio
-  dataHashCode = 507833230
-  size = 8820
+  dataHashCode = 280469483
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1687790211
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1859443538
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -541754167
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 394157818
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1315880378
+  size = 1584
  isKeyFrame = true
-  presentationTimeUs = 300000
 released = true
--- a/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/highPitch_highPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/highPitch_highPitch.dump
@ -6,134 +6,222 @@ format audio:
  pcmEncoding = 2
 sample:
  trackType = audio
-  dataHashCode = 2042155098
-  size = 6482
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = 1417355469
-  size = 8556
+  dataHashCode = -1246841621
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 73492
 sample:
  trackType = audio
-  dataHashCode = -2107697498
-  size = 8754
+  dataHashCode = 1217270269
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 170498
 sample:
  trackType = audio
-  dataHashCode = 736072795
-  size = 8908
+  dataHashCode = -1536036726
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 269750
 sample:
  trackType = audio
-  dataHashCode = -1913553170
-  size = 9208
+  dataHashCode = -1896009897
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 370748
 sample:
  trackType = audio
-  dataHashCode = -1241547797
-  size = 2192
+  dataHashCode = -1302654735
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 475147
 sample:
  trackType = audio
-  dataHashCode = -1607988131
-  size = 15364
+  dataHashCode = -2098810092
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 500000
 sample:
  trackType = audio
-  dataHashCode = -1693065958
-  size = 8778
+  dataHashCode = 1571288763
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 674195
 sample:
  trackType = audio
-  dataHashCode = 2071205641
-  size = 8736
+  dataHashCode = 1492183034
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 773718
 sample:
  trackType = audio
-  dataHashCode = 1433538831
-  size = 8636
+  dataHashCode = -1224768894
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 872766
 sample:
  trackType = audio
-  dataHashCode = 992130724
-  size = 2580
+  dataHashCode = 1602573019
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 970680
 sample:
  trackType = audio
-  dataHashCode = 887503681
-  size = 6
+  dataHashCode = -1371878993
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 999931
 sample:
  trackType = audio
-  dataHashCode = -1294750618
-  size = 15032
+  dataHashCode = -2040447586
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1000000
 sample:
  trackType = audio
-  dataHashCode = -2107697498
-  size = 8754
+  dataHashCode = -303881903
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1170430
 sample:
  trackType = audio
-  dataHashCode = 736072795
-  size = 8908
+  dataHashCode = -257026275
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1269682
 sample:
  trackType = audio
-  dataHashCode = -1913553170
-  size = 9208
+  dataHashCode = 1688238734
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1370680
 sample:
  trackType = audio
-  dataHashCode = 1453487712
-  size = 2198
+  dataHashCode = 583964586
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1475079
 sample:
  trackType = audio
-  dataHashCode = 209617192
-  size = 15358
+  dataHashCode = 269242131
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1500000
 sample:
  trackType = audio
-  dataHashCode = -1693065958
-  size = 8778
+  dataHashCode = 1900116530
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1674126
 sample:
  trackType = audio
-  dataHashCode = 2071205641
-  size = 8736
+  dataHashCode = -1795286207
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1773650
 sample:
  trackType = audio
-  dataHashCode = 1433538831
-  size = 8636
+  dataHashCode = -1839661951
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1872698
 sample:
  trackType = audio
-  dataHashCode = 992130724
-  size = 2580
+  dataHashCode = -1753287452
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 648546295
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 746594457
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -907049377
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 468947287
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 374853918
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1227524103
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 736458372
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1073974809
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 76114384
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 249657921
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 418752571
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1653432263
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 222887147
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -398667165
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -425450713
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1769555479
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1077451355
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -975701693
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 902750566
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1038533954
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1107748966
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 505988910
+  size = 3836
  isKeyFrame = true
-  presentationTimeUs = 1970612
 released = true
--- a/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/highPitch_lowPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/highPitch_lowPitch.dump
@ -6,140 +6,222 @@ format audio:
  pcmEncoding = 2
 sample:
  trackType = audio
-  dataHashCode = 2042155098
-  size = 6482
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = 1417355469
-  size = 8556
+  dataHashCode = -1246841621
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 73492
 sample:
  trackType = audio
-  dataHashCode = -2107697498
-  size = 8754
+  dataHashCode = 1217270269
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 170498
 sample:
  trackType = audio
-  dataHashCode = 736072795
-  size = 8908
+  dataHashCode = -1536036726
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 269750
 sample:
  trackType = audio
-  dataHashCode = -1913553170
-  size = 9208
+  dataHashCode = -1896009897
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 370748
 sample:
  trackType = audio
-  dataHashCode = -1241547797
-  size = 2192
+  dataHashCode = -1302654735
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 475147
 sample:
  trackType = audio
-  dataHashCode = -1607988131
-  size = 15364
+  dataHashCode = -2098810092
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 500000
 sample:
  trackType = audio
-  dataHashCode = -1693065958
-  size = 8778
+  dataHashCode = 1571288763
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 674195
 sample:
  trackType = audio
-  dataHashCode = 2071205641
-  size = 8736
+  dataHashCode = 1492183034
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 773718
 sample:
  trackType = audio
-  dataHashCode = 1433538831
-  size = 8636
+  dataHashCode = -1224768894
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 872766
 sample:
  trackType = audio
-  dataHashCode = 992130724
-  size = 2580
+  dataHashCode = 1602573019
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 970680
 sample:
  trackType = audio
-  dataHashCode = 887503681
-  size = 6
+  dataHashCode = -1371878993
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 999931
 sample:
  trackType = audio
-  dataHashCode = -1218473605
-  size = 15732
+  dataHashCode = -2040447586
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1000000
 sample:
  trackType = audio
-  dataHashCode = 1101737790
-  size = 8026
+  dataHashCode = -303881903
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1178367
 sample:
  trackType = audio
-  dataHashCode = 942749699
-  size = 9580
+  dataHashCode = -257026275
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1269365
 sample:
  trackType = audio
-  dataHashCode = 1696779430
-  size = 9176
+  dataHashCode = 1688238734
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1377981
 sample:
  trackType = audio
-  dataHashCode = 403097819
-  size = 1586
+  dataHashCode = 583964586
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1482018
 sample:
  trackType = audio
-  dataHashCode = 1889137981
-  size = 15556
+  dataHashCode = 269242131
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1500000
 sample:
  trackType = audio
-  dataHashCode = 1527742727
-  size = 8614
+  dataHashCode = 1900116530
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1676371
 sample:
  trackType = audio
-  dataHashCode = -771072152
-  size = 8408
+  dataHashCode = -1795286207
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1774036
 sample:
  trackType = audio
-  dataHashCode = -307907100
-  size = 10212
+  dataHashCode = -1839661951
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1869365
 sample:
  trackType = audio
-  dataHashCode = -1794283843
-  size = 1310
+  dataHashCode = -1753287452
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1985147
 sample:
  trackType = audio
-  dataHashCode = 1302
-  size = 2
+  dataHashCode = 736968887
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -996259377
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 381474348
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1936702924
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -109208214
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1273086460
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1613472513
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -2016821547
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1034210803
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 792255198
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 293085032
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1095941488
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1424391541
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -2035692412
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -846338004
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -621835681
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 740553340
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1803399326
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -85529281
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -163099964
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -30119868
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1106486435
+  size = 3822
  isKeyFrame = true
-  presentationTimeUs = 2000000
 released = true
--- a/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/mixed_sample.wav.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/mixed_sample.wav.dump
@ -6,62 +6,112 @@ format audio:
  pcmEncoding = 2
 sample:
  trackType = audio
-  dataHashCode = 1365664853
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = -1466730976
-  size = 8820
+  dataHashCode = -70676106
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 100000
 sample:
  trackType = audio
-  dataHashCode = 1178728837
-  size = 8820
+  dataHashCode = 1215922983
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 200000
 sample:
  trackType = audio
-  dataHashCode = -216459624
-  size = 8820
+  dataHashCode = -2026137911
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 300000
 sample:
  trackType = audio
-  dataHashCode = 1990341112
-  size = 8820
+  dataHashCode = -1674669139
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 400000
 sample:
  trackType = audio
-  dataHashCode = 1561236782
-  size = 8820
+  dataHashCode = 175313544
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 500000
 sample:
  trackType = audio
-  dataHashCode = 1146352887
-  size = 8820
+  dataHashCode = -1191102815
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 600000
 sample:
  trackType = audio
-  dataHashCode = 1061204212
-  size = 8820
+  dataHashCode = -733079956
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 700000
 sample:
  trackType = audio
-  dataHashCode = 840187559
-  size = 8820
+  dataHashCode = 1646865600
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 800000
 sample:
  trackType = audio
-  dataHashCode = -29240395
-  size = 8820
+  dataHashCode = 400109847
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1601753342
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1582983195
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 2020865891
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1816188055
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1161314208
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 177113009
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1251534682
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -738878919
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -424593340
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1075792131
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1552813500
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -456386217
+  size = 1912
  isKeyFrame = true
-  presentationTimeUs = 900000
 released = true
--- a/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/mixed_sample.wav_48000hz.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/mixed_sample.wav_48000hz.dump
@ -6,68 +6,122 @@ format audio:
  pcmEncoding = 2
 sample:
  trackType = audio
-  dataHashCode = 1079020216
-  size = 9598
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = -1587539971
-  size = 9600
+  dataHashCode = 1926739562
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 99979
 sample:
  trackType = audio
-  dataHashCode = 1662487784
-  size = 9600
+  dataHashCode = 1399967642
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 199979
 sample:
  trackType = audio
-  dataHashCode = 2046052835
-  size = 9600
+  dataHashCode = -486907126
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 299979
 sample:
  trackType = audio
-  dataHashCode = 662989576
-  size = 9600
+  dataHashCode = 2140677852
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 399979
 sample:
  trackType = audio
-  dataHashCode = 493382594
-  size = 9600
+  dataHashCode = -1781690660
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 499979
 sample:
  trackType = audio
-  dataHashCode = -936959003
-  size = 9600
+  dataHashCode = 2076304248
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 599979
 sample:
  trackType = audio
-  dataHashCode = -373052102
-  size = 9600
+  dataHashCode = -1815320092
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 699979
 sample:
  trackType = audio
-  dataHashCode = -2008343760
-  size = 9600
+  dataHashCode = -1221127888
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 799979
 sample:
  trackType = audio
-  dataHashCode = -1783150403
-  size = 9600
+  dataHashCode = 890925357
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 899979
 sample:
  trackType = audio
-  dataHashCode = -280
-  size = 2
+  dataHashCode = 1820225884
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -443962413
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1732517477
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1776323525
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -570936489
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 351779608
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1404074815
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -91335939
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -421585681
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1500950979
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1129302486
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 2117315688
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -2064665213
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1362894340
+  size = 2304
  isKeyFrame = true
-  presentationTimeUs = 999979
 released = true
--- a/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/original.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/original.dump
@ -6,62 +6,112 @@ format audio:
  pcmEncoding = 2
 sample:
  trackType = audio
-  dataHashCode = -85819864
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = 566487491
-  size = 8820
+  dataHashCode = -77784020
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 100000
 sample:
  trackType = audio
-  dataHashCode = -1256531710
-  size = 8820
+  dataHashCode = 1487579866
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 200000
 sample:
  trackType = audio
-  dataHashCode = 793455796
-  size = 8820
+  dataHashCode = -955640128
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 300000
 sample:
  trackType = audio
-  dataHashCode = -268235582
-  size = 8820
+  dataHashCode = -1797926221
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 400000
 sample:
  trackType = audio
-  dataHashCode = -8136122
-  size = 8820
+  dataHashCode = 1304162335
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 500000
 sample:
  trackType = audio
-  dataHashCode = 1750866613
-  size = 8820
+  dataHashCode = 87515422
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 600000
 sample:
  trackType = audio
-  dataHashCode = -1100753636
-  size = 8820
+  dataHashCode = -1134039798
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 700000
 sample:
  trackType = audio
-  dataHashCode = 507833230
-  size = 8820
+  dataHashCode = -2131288947
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 800000
 sample:
  trackType = audio
-  dataHashCode = 1472467506
-  size = 8820
+  dataHashCode = 1159697593
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -889164698
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1380568930
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1722863050
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1365744081
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -81471997
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -6915052
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1634845963
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1252305359
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 2127515647
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 2077308846
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1055925064
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1077088737
+  size = 1912
  isKeyFrame = true
-  presentationTimeUs = 900000
 released = true
--- a/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/original_original.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/original_original.dump
@ -6,122 +6,222 @@ format audio:
  pcmEncoding = 2
 sample:
  trackType = audio
-  dataHashCode = -85819864
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = 566487491
-  size = 8820
+  dataHashCode = -77784020
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 100000
 sample:
  trackType = audio
-  dataHashCode = -1256531710
-  size = 8820
+  dataHashCode = 1487579866
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 200000
 sample:
  trackType = audio
-  dataHashCode = 793455796
-  size = 8820
+  dataHashCode = -955640128
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 300000
 sample:
  trackType = audio
-  dataHashCode = -268235582
-  size = 8820
+  dataHashCode = -1797926221
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 400000
 sample:
  trackType = audio
-  dataHashCode = -8136122
-  size = 8820
+  dataHashCode = 1304162335
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 500000
 sample:
  trackType = audio
-  dataHashCode = 1750866613
-  size = 8820
+  dataHashCode = 87515422
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 600000
 sample:
  trackType = audio
-  dataHashCode = -1100753636
-  size = 8820
+  dataHashCode = -1134039798
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 700000
 sample:
  trackType = audio
-  dataHashCode = 507833230
-  size = 8820
+  dataHashCode = -2131288947
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 800000
 sample:
  trackType = audio
-  dataHashCode = 1472467506
-  size = 8820
+  dataHashCode = 1159697593
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 900000
 sample:
  trackType = audio
-  dataHashCode = -85819864
-  size = 8820
+  dataHashCode = -889164698
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1000000
 sample:
  trackType = audio
-  dataHashCode = 566487491
-  size = 8820
+  dataHashCode = 1380568930
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1100000
 sample:
  trackType = audio
-  dataHashCode = -1256531710
-  size = 8820
+  dataHashCode = 1722863050
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1200000
 sample:
  trackType = audio
-  dataHashCode = 793455796
-  size = 8820
+  dataHashCode = -1365744081
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1300000
 sample:
  trackType = audio
-  dataHashCode = -268235582
-  size = 8820
+  dataHashCode = -81471997
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1400000
 sample:
  trackType = audio
-  dataHashCode = -8136122
-  size = 8820
+  dataHashCode = -6915052
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1500000
 sample:
  trackType = audio
-  dataHashCode = 1750866613
-  size = 8820
+  dataHashCode = 1634845963
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1600000
 sample:
  trackType = audio
-  dataHashCode = -1100753636
-  size = 8820
+  dataHashCode = -1252305359
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1700000
 sample:
  trackType = audio
-  dataHashCode = 507833230
-  size = 8820
+  dataHashCode = 2127515647
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1800000
 sample:
  trackType = audio
-  dataHashCode = 1472467506
-  size = 8820
+  dataHashCode = 2077308846
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1055925064
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1806711606
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 214420497
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 64142874
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 741854640
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1403890693
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -2010662757
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 481146154
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -875288738
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -964955596
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1798445572
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -371820518
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1658037326
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 595814442
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -594142815
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -465978177
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1970036641
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 30588816
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1058872332
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 2137553641
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1187916155
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -2135974564
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 512448415
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -819535570
+  size = 3824
  isKeyFrame = true
-  presentationTimeUs = 1900000
 released = true
--- a/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/silenceFromEffect.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/silenceFromEffect.dump
@ -6,62 +6,112 @@ format audio:
  pcmEncoding = 2
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 100000
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 200000
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 300000
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 400000
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 500000
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 600000
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 700000
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 800000
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 521969921
+  size = 1912
  isKeyFrame = true
-  presentationTimeUs = 900000
 released = true
--- a/libraries/test_data/src/test/assets/transformerdumps/wav/sample_ima_adpcm.wav/original.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/wav/sample_ima_adpcm.wav/original.dump
@ -6,68 +6,112 @@ format audio:
  pcmEncoding = 2
 sample:
  trackType = audio
-  dataHashCode = -385202820
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = -361135248
-  size = 8820
+  dataHashCode = 1074436356
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 100000
 sample:
  trackType = audio
-  dataHashCode = -1518413431
-  size = 8820
+  dataHashCode = -1738221261
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 200000
 sample:
  trackType = audio
-  dataHashCode = -1956112362
-  size = 8820
+  dataHashCode = 881920542
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 300000
 sample:
  trackType = audio
-  dataHashCode = 1209498603
-  size = 8820
+  dataHashCode = 688199454
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 400000
 sample:
  trackType = audio
-  dataHashCode = 1880717174
-  size = 8820
+  dataHashCode = -1283463059
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 500000
 sample:
  trackType = audio
-  dataHashCode = -615889148
-  size = 8820
+  dataHashCode = -1902294545
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 600000
 sample:
  trackType = audio
-  dataHashCode = -2069551664
-  size = 8820
+  dataHashCode = 417985077
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 700000
 sample:
  trackType = audio
-  dataHashCode = 427443063
-  size = 8820
+  dataHashCode = 641834918
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 800000
 sample:
  trackType = audio
-  dataHashCode = 1770175633
-  size = 8820
+  dataHashCode = 1453896280
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 900000
 sample:
  trackType = audio
-  dataHashCode = 1038969069
-  size = 1604
+  dataHashCode = 1357522663
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1994904969
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1667402106
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1734250920
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 453747484
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -412707723
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 2004305378
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 992783871
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 291554801
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -899544260
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -619347252
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1352014058
+  size = 308
  isKeyFrame = true
-  presentationTimeUs = 1000000
 released = true
--- a/libraries/test_data/src/test/assets/transformerdumps/wav/sample_ima_adpcm.wav/silenceFromEffect.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/wav/sample_ima_adpcm.wav/silenceFromEffect.dump
@ -6,68 +6,112 @@ format audio:
  pcmEncoding = 2
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 100000
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 200000
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 300000
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 400000
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 500000
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 600000
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 700000
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 800000
 sample:
  trackType = audio
-  dataHashCode = -1157240447
-  size = 8820
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 900000
 sample:
  trackType = audio
-  dataHashCode = -1163604095
-  size = 1604
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 2089324929
+  size = 308
  isKeyFrame = true
-  presentationTimeUs = 1000000
 released = true
--- a/libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav/highPitch_sample.wavHighPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav/highPitch_sample.wavHighPitch.dump
@ -6,104 +6,322 @@ format audio:
  pcmEncoding = 2
 sample:
  trackType = audio
-  dataHashCode = -226169394
-  size = 15528
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = -1654106973
-  size = 17436
+  dataHashCode = -1980417785
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 80875
 sample:
  trackType = audio
-  dataHashCode = 1078555669
-  size = 19384
+  dataHashCode = 2071165902
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 171687
 sample:
  trackType = audio
-  dataHashCode = -1783495042
-  size = 8904
+  dataHashCode = -1513375065
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 272645
 sample:
  trackType = audio
-  dataHashCode = 1369234850
-  size = 5688
+  dataHashCode = 992321088
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 319020
 sample:
  trackType = audio
-  dataHashCode = 340823895
-  size = 14108
+  dataHashCode = -713898258
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 348645
 sample:
  trackType = audio
-  dataHashCode = 554484641
-  size = 14952
+  dataHashCode = -1232027444
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 422125
 sample:
  trackType = audio
-  dataHashCode = -1596995303
-  size = 22728
+  dataHashCode = -732726224
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 500000
 sample:
  trackType = audio
-  dataHashCode = -1644849415
-  size = 19392
+  dataHashCode = -805988807
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 618375
 sample:
  trackType = audio
-  dataHashCode = 660809049
-  size = 20044
+  dataHashCode = -749828954
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 719375
 sample:
  trackType = audio
-  dataHashCode = -601805369
-  size = 19524
+  dataHashCode = -1043162267
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 823770
 sample:
  trackType = audio
-  dataHashCode = 1994534499
-  size = 14312
+  dataHashCode = -536236206
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 925458
 sample:
  trackType = audio
-  dataHashCode = -258879331
-  size = 23492
+  dataHashCode = -385979597
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1000000
 sample:
  trackType = audio
-  dataHashCode = -1278785599
-  size = 19016
+  dataHashCode = -324393371
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1122354
 sample:
  trackType = audio
-  dataHashCode = -809901361
-  size = 18800
+  dataHashCode = -900848124
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1221395
 sample:
  trackType = audio
-  dataHashCode = 163546833
-  size = 5616
+  dataHashCode = 1906051026
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1319312
 sample:
  trackType = audio
-  dataHashCode = 743627
-  size = 4
+  dataHashCode = 1425176967
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 15846007
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1755494257
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 55704031
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1219808665
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1014864819
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1579478155
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1108443173
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -2059263619
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -64179003
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1979713881
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 157440525
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -411470485
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 904304615
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -480981525
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -2071295351
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1911163553
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -199835949
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1108646363
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -181257819
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 755613751
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1102989467
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1058748017
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1619830499
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -134444003
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 500069009
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1612323397
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1307392951
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -747310253
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1141037249
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1002274355
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1448899259
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1939559747
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 610363287
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1667867135
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 102801113
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1471532989
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1572941347
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1772255089
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1053390271
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -2066504549
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1407985649
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 395257497
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -472933397
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1680972379
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1861460605
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1665961375
+  size = 3216
  isKeyFrame = true
-  presentationTimeUs = 1348562
 released = true
--- a/libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav/highPitch_sample.wavLowPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav/highPitch_sample.wavLowPitch.dump
@ -6,104 +6,322 @@ format audio:
  pcmEncoding = 2
 sample:
  trackType = audio
-  dataHashCode = -226169394
-  size = 15528
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = -1654106973
-  size = 17436
+  dataHashCode = -1980417785
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 80875
 sample:
  trackType = audio
-  dataHashCode = 1078555669
-  size = 19384
+  dataHashCode = 2071165902
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 171687
 sample:
  trackType = audio
-  dataHashCode = -1783495042
-  size = 8904
+  dataHashCode = -1513375065
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 272645
 sample:
  trackType = audio
-  dataHashCode = 1369234850
-  size = 5688
+  dataHashCode = 992321088
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 319020
 sample:
  trackType = audio
-  dataHashCode = 711439073
-  size = 14040
+  dataHashCode = -713898258
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 348645
 sample:
  trackType = audio
-  dataHashCode = 804848209
-  size = 15020
+  dataHashCode = -1232027444
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 421770
 sample:
  trackType = audio
-  dataHashCode = -95210289
-  size = 22668
+  dataHashCode = -732726224
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 500000
 sample:
  trackType = audio
-  dataHashCode = -416119019
-  size = 20856
+  dataHashCode = -805988807
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 618062
 sample:
  trackType = audio
-  dataHashCode = -2060733789
-  size = 19976
+  dataHashCode = -749828954
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 726687
 sample:
  trackType = audio
-  dataHashCode = 212454167
-  size = 17192
+  dataHashCode = -1043162267
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 830729
 sample:
  trackType = audio
-  dataHashCode = 1298593295
-  size = 15308
+  dataHashCode = -536236206
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 920270
 sample:
  trackType = audio
-  dataHashCode = -1669619067
-  size = 23564
+  dataHashCode = -385979597
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1000000
 sample:
  trackType = audio
-  dataHashCode = 636945085
-  size = 18304
+  dataHashCode = -324393371
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1122729
 sample:
  trackType = audio
-  dataHashCode = -754285165
-  size = 22232
+  dataHashCode = -900848124
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1218062
 sample:
  trackType = audio
-  dataHashCode = -1967816889
-  size = 2856
+  dataHashCode = 1906051026
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1333854
 sample:
  trackType = audio
-  dataHashCode = 1012987
-  size = 4
+  dataHashCode = 1425176967
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1335242253
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 829923845
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1115476555
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -105128483
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1441440805
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -2130915595
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -777295755
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1766737361
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -2047189083
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -433314243
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -944382247
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -977592099
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1327299411
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1802052115
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1186642865
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1435750819
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1593750121
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1361923955
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 9884929
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -2095297655
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 120560659
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 679589675
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1614480797
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1858960727
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -357482745
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -336908621
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 191847901
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1261181873
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 715668855
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1032430295
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1544704213
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1811227373
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 33630447
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1746520315
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -82626345
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -423179601
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1655245319
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -934423303
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1002566763
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 532122865
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 118591501
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -520907599
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 547513455
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 718853767
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1028490415
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1183781769
+  size = 3184
  isKeyFrame = true
-  presentationTimeUs = 1348729
 released = true
--- a/libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav/original.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav/original.dump
@ -6,26 +6,87 @@ format audio:
  pcmEncoding = 2
 sample:
  trackType = audio
-  dataHashCode = -278103001
-  size = 19200
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = 1522105084
-  size = 19200
+  dataHashCode = 384290309
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 100000
 sample:
  trackType = audio
-  dataHashCode = 932319027
-  size = 19200
+  dataHashCode = -870817687
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 200000
 sample:
  trackType = audio
-  dataHashCode = 325000240
-  size = 9336
+  dataHashCode = 1808572161
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -222243808
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -389012840
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -885538348
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -2060650539
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 2046745469
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1391664573
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 4049044
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1683113674
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1895625271
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -2044834771
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -31691173
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -2042379990
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -2102469729
+  size = 2696
  isKeyFrame = true
-  presentationTimeUs = 300000
 released = true
--- a/libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav/original_sample.wav.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav/original_sample.wav.dump
@ -6,92 +6,322 @@ format audio:
  pcmEncoding = 2
 sample:
  trackType = audio
-  dataHashCode = -278103001
-  size = 19200
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = 1522105084
-  size = 19200
+  dataHashCode = 384290309
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 100000
 sample:
  trackType = audio
-  dataHashCode = 932319027
-  size = 19200
+  dataHashCode = -870817687
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 200000
 sample:
  trackType = audio
-  dataHashCode = 325000240
-  size = 9336
+  dataHashCode = 1808572161
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 300000
 sample:
  trackType = audio
-  dataHashCode = -717358295
-  size = 19196
+  dataHashCode = -222243808
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 348625
 sample:
  trackType = audio
-  dataHashCode = -1794464029
-  size = 9868
+  dataHashCode = -389012840
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 448604
 sample:
  trackType = audio
-  dataHashCode = -328768009
-  size = 28532
+  dataHashCode = -885538348
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 500000
 sample:
  trackType = audio
-  dataHashCode = -1424006305
-  size = 19200
+  dataHashCode = -2060650539
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 648604
 sample:
  trackType = audio
-  dataHashCode = -1450884853
-  size = 19200
+  dataHashCode = 2046745469
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 748604
 sample:
  trackType = audio
-  dataHashCode = 1566382623
-  size = 19200
+  dataHashCode = -1391664573
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 848604
 sample:
  trackType = audio
-  dataHashCode = -437038979
-  size = 9868
+  dataHashCode = 4049044
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 948604
 sample:
  trackType = audio
-  dataHashCode = 409224589
-  size = 28532
+  dataHashCode = 1683113674
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1000000
 sample:
  trackType = audio
-  dataHashCode = -1421600077
-  size = 19200
+  dataHashCode = -1895625271
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1148604
 sample:
  trackType = audio
-  dataHashCode = 722747579
-  size = 19200
+  dataHashCode = -2044834771
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1248604
 sample:
  trackType = audio
-  dataHashCode = 326119
-  size = 4
+  dataHashCode = -31691173
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -2042379990
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 105373225
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 757782701
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 482819663
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 743496387
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 530698561
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1983136355
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -282256373
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -568556997
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1218329205
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 209467417
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -483591869
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 503354003
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1753843595
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1512759967
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 562499661
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1298785041
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1881149087
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -365802657
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1785910747
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1763760505
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -930458223
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 832726473
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1792884701
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -396256979
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1474114355
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1630291245
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1872150533
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1861873103
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 361564805
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 777257659
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1258840657
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 755876683
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1912566643
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1365097147
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -748375401
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 5502473
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 693942975
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 841426881
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -2004762311
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1661654579
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 684321891
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1535548319
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1891404153
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 763237491
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -364653199
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 77809471
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -290679023
+  size = 3208
  isKeyFrame = true
-  presentationTimeUs = 1348604
 released = true
--- a/libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav/original_sample.wav_highPitch.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav/original_sample.wav_highPitch.dump
@ -6,92 +6,322 @@ format audio:
  pcmEncoding = 2
 sample:
  trackType = audio
-  dataHashCode = -226169394
-  size = 15528
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = -1654106973
-  size = 17436
+  dataHashCode = -1980417785
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 80875
 sample:
  trackType = audio
-  dataHashCode = 1078555669
-  size = 19384
+  dataHashCode = 2071165902
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 171687
 sample:
  trackType = audio
-  dataHashCode = -1783495042
-  size = 8904
+  dataHashCode = -1513375065
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 272645
 sample:
  trackType = audio
-  dataHashCode = 1415708326
-  size = 19232
+  dataHashCode = 992321088
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 319020
 sample:
  trackType = audio
-  dataHashCode = -907128755
-  size = 9688
+  dataHashCode = -713898258
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 419187
 sample:
  trackType = audio
-  dataHashCode = -855583041
-  size = 28564
+  dataHashCode = -1232027444
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 469645
 sample:
  trackType = audio
-  dataHashCode = -141401047
-  size = 19388
+  dataHashCode = -732726224
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 618416
 sample:
  trackType = audio
-  dataHashCode = -1258167167
-  size = 19680
+  dataHashCode = -805988807
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 719395
 sample:
  trackType = audio
-  dataHashCode = -1950277707
-  size = 19796
+  dataHashCode = -749828954
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 821895
 sample:
  trackType = audio
-  dataHashCode = -71854735
-  size = 9096
+  dataHashCode = -1043162267
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 925000
 sample:
  trackType = audio
-  dataHashCode = -1667813033
-  size = 28344
+  dataHashCode = -536236206
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 972375
 sample:
  trackType = audio
-  dataHashCode = 473686109
-  size = 18848
+  dataHashCode = -385979597
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1120000
 sample:
  trackType = audio
-  dataHashCode = 283620169
-  size = 19384
+  dataHashCode = -324393371
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 1218166
 sample:
  trackType = audio
-  dataHashCode = 581004623
-  size = 5668
+  dataHashCode = -900848124
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1906051026
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1175185583
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1657607783
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1875628651
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 926484201
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1139616447
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1189503193
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1098150479
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1215822869
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1930272847
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -18057319
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 511816895
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1495149381
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -896278109
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1049527761
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1600050505
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 611794233
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1816619345
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1095707991
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 193860773
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1024859117
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 738657875
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1046679783
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1738612067
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1530599789
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 2094122851
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -669252823
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 509485967
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1488063263
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 172720895
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 764212609
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1891905039
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 806000041
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1706622451
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -290340625
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1342674011
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 951078783
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1789662615
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1362834087
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 2096042551
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 267637225
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -953025233
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1969103755
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1369595875
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1917900437
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 2077420603
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 244635321
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -163435827
+  size = 3204
  isKeyFrame = true
-  presentationTimeUs = 1319125
 released = true
--- a/libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav/silenceFromEffect.dump
+++ b/libraries/test_data/src/test/assets/transformerdumps/wav/sample_rf64.wav/silenceFromEffect.dump
@ -6,26 +6,87 @@ format audio:
  pcmEncoding = 2
 sample:
  trackType = audio
-  dataHashCode = -119496703
-  size = 19200
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 0
 sample:
  trackType = audio
-  dataHashCode = -119496703
-  size = 19200
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 100000
 sample:
  trackType = audio
-  dataHashCode = -119496703
-  size = 19200
+  dataHashCode = 1742602241
+  size = 4096
  isKeyFrame = true
-  presentationTimeUs = 200000
 sample:
  trackType = audio
-  dataHashCode = 197067009
-  size = 9336
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = 1742602241
+  size = 4096
+  isKeyFrame = true
+sample:
+  trackType = audio
+  dataHashCode = -1472323839
+  size = 2696
  isKeyFrame = true
-  presentationTimeUs = 300000
 released = true
--- a/libraries/transformer/src/test/java/androidx/media3/transformer/CapturingMuxer.java
+++ b/libraries/transformer/src/test/java/androidx/media3/transformer/CapturingMuxer.java
@ -16,6 +16,7 @@
 package androidx.media3.transformer;

 import static androidx.media3.common.util.Assertions.checkNotNull;
+import static androidx.media3.common.util.Assertions.checkState;
 import static androidx.media3.transformer.TransformerUtil.getProcessedTrackType;

 import android.util.SparseArray;
@ -29,6 +30,7 @@ import androidx.media3.test.utils.Dumper;
 import androidx.media3.test.utils.Dumper.Dumpable;
 import com.google.common.collect.ImmutableList;
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@ -48,10 +50,17 @@ public final class CapturingMuxer implements Muxer, Dumpable {
   */
  public static final class Factory implements Muxer.Factory {
    private final Muxer.Factory wrappedFactory;
-
+    private final boolean handleAudioAsPcm;
    @Nullable private CapturingMuxer muxer;

-    public Factory() {
+    /**
+     * Creates an instance.
+     *
+     * @param handleAudioAsPcm Whether audio should be treated as PCM for {@linkplain Dumpable
+     *     dumping}, where PCM audio is captured in batches of a fixed size.
+     */
+    public Factory(boolean handleAudioAsPcm) {
+      this.handleAudioAsPcm = handleAudioAsPcm;
      this.wrappedFactory = new DefaultMuxer.Factory();
    }

@ -62,7 +71,7 @@ public final class CapturingMuxer implements Muxer, Dumpable {

    @Override
    public Muxer create(String path) throws Muxer.MuxerException {
-      muxer = new CapturingMuxer(wrappedFactory.create(path));
+      muxer = new CapturingMuxer(wrappedFactory.create(path), handleAudioAsPcm);
      return muxer;
    }

@ -73,17 +82,19 @@ public final class CapturingMuxer implements Muxer, Dumpable {
  }

  private final Muxer wrappedMuxer;
+  private final boolean handleAudioAsPcm;
  private final SparseArray<DumpableFormat> dumpableFormatByTrackType;
-  private final SparseArray<ArrayList<DumpableSample>> dumpableSamplesByTrackType;
+  private final SparseArray<DumpableStream> dumpableStreamByTrackType;
  private final Map<Integer, Integer> trackIndexToType;
  private final ArrayList<Metadata> metadataList;
  private boolean released;

  /** Creates a new test muxer. */
-  private CapturingMuxer(Muxer wrappedMuxer) {
+  private CapturingMuxer(Muxer wrappedMuxer, boolean handleAudioAsPcm) {
    this.wrappedMuxer = wrappedMuxer;
-    dumpableSamplesByTrackType = new SparseArray<>();
+    this.handleAudioAsPcm = handleAudioAsPcm;
    dumpableFormatByTrackType = new SparseArray<>();
+    dumpableStreamByTrackType = new SparseArray<>();
    trackIndexToType = new HashMap<>();
    metadataList = new ArrayList<>();
  }
@ -99,7 +110,12 @@ public final class CapturingMuxer implements Muxer, Dumpable {

    dumpableFormatByTrackType.append(
        trackType, new DumpableFormat(format, /* tag= */ Util.getTrackTypeString(trackType)));
-    dumpableSamplesByTrackType.append(trackType, new ArrayList<>());
+
+    dumpableStreamByTrackType.append(
+        trackType,
+        trackType == C.TRACK_TYPE_AUDIO && handleAudioAsPcm
+            ? new DumpablePcmAudioStream(trackType)
+            : new DumpableStream(trackType));

    return trackIndex;
  }
@ -109,14 +125,10 @@ public final class CapturingMuxer implements Muxer, Dumpable {
      int trackIndex, ByteBuffer data, long presentationTimeUs, @C.BufferFlags int flags)
      throws MuxerException {
    @C.TrackType int trackType = checkNotNull(trackIndexToType.get(trackIndex));
-    dumpableSamplesByTrackType
+    dumpableStreamByTrackType
        .get(trackType)
-        .add(
-            new DumpableSample(
-                trackType,
-                data,
-                (flags & C.BUFFER_FLAG_KEY_FRAME) == C.BUFFER_FLAG_KEY_FRAME,
-                presentationTimeUs));
+        .addSample(
+            data, (flags & C.BUFFER_FLAG_KEY_FRAME) == C.BUFFER_FLAG_KEY_FRAME, presentationTimeUs);
    wrappedMuxer.writeSampleData(trackIndex, data, presentationTimeUs, flags);
  }

@ -145,15 +157,89 @@ public final class CapturingMuxer implements Muxer, Dumpable {
      dumper.add("container metadata", metadata);
    }

-    for (int i = 0; i < dumpableSamplesByTrackType.size(); i++) {
-      for (DumpableSample sample : dumpableSamplesByTrackType.valueAt(i)) {
-        sample.dump(dumper);
-      }
+    for (int i = 0; i < dumpableStreamByTrackType.size(); i++) {
+      dumpableStreamByTrackType.valueAt(i).dump(dumper);
    }

    dumper.add("released", released);
  }

+  private static class DumpableStream implements Dumpable {
+    private final @C.TrackType int trackType;
+    protected final ArrayList<DumpableSample> dumpableSamples;
+
+    public DumpableStream(@C.TrackType int trackType) {
+      this.trackType = trackType;
+      this.dumpableSamples = new ArrayList<>();
+    }
+
+    public void addSample(ByteBuffer sample, boolean isKeyFrame, long presentationTimeUs) {
+      dumpableSamples.add(new DumpableSample(trackType, sample, isKeyFrame, presentationTimeUs));
+    }
+
+    @Override
+    public void dump(Dumper dumper) {
+      for (DumpableSample dumpableSample : dumpableSamples) {
+        dumpableSample.dump(dumper);
+      }
+    }
+  }
+
+  /**
+   * A {@link DumpableStream} for PCM audio.
+   *
+   * <p>{@linkplain Util#isEncodingLinearPcm Linear PCM audio} is represented as frames (or PCM
+   * samples), with the {@linkplain Util#getPcmFrameSize size} based on the encoding and channel
+   * count. Each frame contains the data for one sample (based on the sample rate) for each channel.
+   */
+  private static final class DumpablePcmAudioStream extends DumpableStream {
+    private static final int BYTES_PER_DUMPABLE = 4096;
+
+    private final ByteBuffer currentPendingData;
+
+    public DumpablePcmAudioStream(@C.TrackType int trackType) {
+      super(trackType);
+      checkState(trackType == C.TRACK_TYPE_AUDIO);
+      currentPendingData =
+          ByteBuffer.allocateDirect(BYTES_PER_DUMPABLE).order(ByteOrder.nativeOrder());
+    }
+
+    @Override
+    public void addSample(ByteBuffer sample, boolean isKeyFrame, long presentationTimeUs) {
+      int samplePosition = sample.position();
+
+      while (sample.hasRemaining()) {
+        // Small input sample will not fill the buffer. Add to pending and wait for more data.
+        if (currentPendingData.remaining() > sample.remaining()) {
+          currentPendingData.put(sample);
+          break;
+        }
+
+        int bytesToProgress = currentPendingData.remaining();
+        byte[] byteHolder = new byte[bytesToProgress];
+        sample.get(byteHolder);
+        currentPendingData.put(byteHolder);
+        currentPendingData.position(0);
+        dumpableSamples.add(
+            new DumpableSample(
+                C.TRACK_TYPE_AUDIO, currentPendingData, /* isKeyFrame= */ true, C.TIME_UNSET));
+        currentPendingData.clear();
+      }
+
+      sample.position(samplePosition);
+    }
+
+    @Override
+    public void dump(Dumper dumper) {
+      if (currentPendingData.position() != 0) {
+        dumpableSamples.add(
+            new DumpableSample(
+                C.TRACK_TYPE_AUDIO, currentPendingData, /* isKeyFrame= */ true, C.TIME_UNSET));
+      }
+      super.dump(dumper);
+    }
+  }
+
  private static final class DumpableSample implements Dumpable {

    private final @C.TrackType int trackType;
@ -185,9 +271,11 @@ public final class CapturingMuxer implements Muxer, Dumpable {
          .add("trackType", Util.getTrackTypeString(trackType))
          .add("dataHashCode", sampleDataHashCode)
          .add("size", sampleSize)
-          .add("isKeyFrame", isKeyFrame)
-          .add("presentationTimeUs", presentationTimeUs)
-          .endBlock();
+          .add("isKeyFrame", isKeyFrame);
+      if (presentationTimeUs != C.TIME_UNSET) {
+        dumper.add("presentationTimeUs", presentationTimeUs);
+      }
+      dumper.endBlock();
    }
  }
 }
--- a/libraries/transformer/src/test/java/androidx/media3/transformer/CompositionExportTest.java
+++ b/libraries/transformer/src/test/java/androidx/media3/transformer/CompositionExportTest.java
@ -56,7 +56,6 @@ public class CompositionExportTest {
  @Rule public final TemporaryFolder outputDir = new TemporaryFolder();

  private final Context context = ApplicationProvider.getApplicationContext();
-  private final CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory();

  @Before
  public void setUp() {
@ -72,6 +71,7 @@ public class CompositionExportTest {
  @Test
  public void start_audioVideoTransmuxedFromDifferentSequences_matchesSingleSequenceResult()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_VIDEO);
@ -96,6 +96,8 @@ public class CompositionExportTest {

  @Test
  public void start_loopingTransmuxedAudio_producesExpectedResult() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
+
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    EditedMediaItem audioEditedMediaItem =
@ -129,6 +131,7 @@ public class CompositionExportTest {

  @Test
  public void start_loopingTransmuxedVideo_producesExpectedResult() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    EditedMediaItem audioEditedMediaItem =
@ -162,6 +165,7 @@ public class CompositionExportTest {

  @Test
  public void start_longVideoCompositionWithLoopingAudio_producesExpectedResult() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    EditedMediaItemSequence loopingAudioSequence =
@ -192,6 +196,7 @@ public class CompositionExportTest {

  @Test
  public void start_compositionOfConcurrentAudio_isCorrect() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    EditedMediaItem rawAudioEditedMediaItem =
@ -215,6 +220,7 @@ public class CompositionExportTest {

  @Test
  public void start_audioVideoCompositionWithExtraAudio_isCorrect() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    EditedMediaItem audioVideoEditedMediaItem =
@ -247,6 +253,7 @@ public class CompositionExportTest {

  @Test
  public void start_audioVideoCompositionWithMutedAudio_matchesSingleSequence() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    EditedMediaItem audioVideoEditedMediaItem =
@ -282,6 +289,7 @@ public class CompositionExportTest {

  @Test
  public void start_audioVideoCompositionWithLoopingAudio_isCorrect() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    EditedMediaItem audioVideoEditedMediaItem =
@ -318,6 +326,7 @@ public class CompositionExportTest {

  @Test
  public void start_adjustSampleRateWithComposition_completesSuccessfully() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    SonicAudioProcessor sonicAudioProcessor = new SonicAudioProcessor();
    sonicAudioProcessor.setOutputSampleRateHz(48000);
    Transformer transformer =
@ -344,6 +353,7 @@ public class CompositionExportTest {

  @Test
  public void start_compositionOfConcurrentAudio_changesSampleRateWithEffect() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    SonicAudioProcessor sonicAudioProcessor = new SonicAudioProcessor();
    sonicAudioProcessor.setOutputSampleRateHz(48000);
    Transformer transformer =
--- a/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java
+++ b/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java
@ -120,7 +120,6 @@ public final class MediaItemExportTest {
  @Rule public final TemporaryFolder outputDir = new TemporaryFolder();

  private final Context context = ApplicationProvider.getApplicationContext();
-  private final CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory();

  @Before
  public void setUp() {
@ -136,6 +135,7 @@ public final class MediaItemExportTest {
  @Test
  public void start_audioAndVideoPassthrough_withClippingStartAtKeyFrame_completesSuccessfully()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem =
@ -163,6 +163,7 @@ public final class MediaItemExportTest {
  @Test
  public void start_trimOptimizationEnabled_clippingConfigurationUnset_outputMatchesOriginal()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false)
            .experimentalSetTrimOptimizationEnabled(true)
@ -190,6 +191,8 @@ public final class MediaItemExportTest {
  public void
      start_trimOptimizationEnabled_clippingConfigurationUnsetAndRotated_outputMatchesOriginalRotated()
          throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
+
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false)
            .experimentalSetTrimOptimizationEnabled(true)
@ -222,6 +225,8 @@ public final class MediaItemExportTest {
  @Test
  public void start_trimOptimizationEnabled_withClippingStartAtKeyFrame_completesSuccessfully()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
+
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false)
            .experimentalSetTrimOptimizationEnabled(true)
@ -253,6 +258,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_trimOptimizationEnabled_fileNotMp4_fallbackToNormalExport() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false)
            .experimentalSetTrimOptimizationEnabled(true)
@ -281,6 +287,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_withSubtitlesVideoOnly_completesSuccessfully() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false)
            .setAudioMimeType(MimeTypes.AUDIO_AAC)
@ -302,6 +309,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_successiveExports_completesSuccessfully() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_VIDEO);
@ -320,6 +328,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_concurrentExports_throwsError() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_VIDEO_ONLY);
@ -333,6 +342,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_removeAudio_completesSuccessfully() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    EditedMediaItem editedMediaItem =
@ -352,6 +362,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_removeVideo_completesSuccessfully() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    EditedMediaItem editedMediaItem =
@ -371,6 +382,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_forceAudioTrackOnAudioOnly_isIgnored() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_AMR_NB);
@ -389,6 +401,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_forceAudioTrackOnAudioVideo_isIgnored() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_VIDEO);
@ -408,6 +421,7 @@ public final class MediaItemExportTest {
  @Test
  public void start_forceAudioTrackAndRemoveAudioWithEffects_generatesSilentAudio()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    SonicAudioProcessor sonicAudioProcessor = new SonicAudioProcessor();
@ -436,6 +450,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_forceAudioTrackAndRemoveVideo_isIgnored() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    EditedMediaItem editedMediaItem =
@ -458,6 +473,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_forceAudioTrackOnVideoOnly_generatesSilentAudio() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_VIDEO_ONLY);
@ -479,6 +495,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_adjustSampleRate_completesSuccessfully() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    SonicAudioProcessor sonicAudioProcessor = new SonicAudioProcessor();
    sonicAudioProcessor.setOutputSampleRateHz(48000);
    Transformer transformer =
@ -501,6 +518,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_singleMediaItemAndTransmux_ignoresTransmux() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    SonicAudioProcessor sonicAudioProcessor = new SonicAudioProcessor();
    sonicAudioProcessor.setOutputSampleRateHz(48000);
    Transformer transformer =
@ -525,6 +543,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_withMultipleListeners_callsEachOnCompletion() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    ArgumentCaptor<Composition> compositionArgumentCaptor =
        ArgumentCaptor.forClass(Composition.class);
    Transformer.Listener mockListener1 = mock(Transformer.Listener.class);
@ -549,6 +568,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_withMultipleListeners_callsEachOnError() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    ArgumentCaptor<Composition> compositionArgumentCaptor =
        ArgumentCaptor.forClass(Composition.class);
    Transformer.Listener mockListener1 = mock(Transformer.Listener.class);
@ -576,6 +596,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_withMultipleListeners_callsEachOnFallback() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    ArgumentCaptor<Composition> compositionArgumentCaptor =
        ArgumentCaptor.forClass(Composition.class);
    Transformer.Listener mockListener1 = mock(Transformer.Listener.class);
@ -613,6 +634,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_success_callsDeprecatedCompletionCallbacks() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    AtomicBoolean deprecatedFallbackCalled1 = new AtomicBoolean();
    AtomicBoolean deprecatedFallbackCalled2 = new AtomicBoolean();
    Transformer transformer =
@ -644,6 +666,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_withError_callsDeprecatedErrorCallbacks() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    AtomicBoolean deprecatedFallbackCalled1 = new AtomicBoolean();
    AtomicBoolean deprecatedFallbackCalled2 = new AtomicBoolean();
    AtomicBoolean deprecatedFallbackCalled3 = new AtomicBoolean();
@ -691,6 +714,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_withFallback_callsDeprecatedFallbackCallbacks() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    AtomicBoolean deprecatedFallbackCalled = new AtomicBoolean();
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ true)
@ -717,6 +741,7 @@ public final class MediaItemExportTest {
  @Test
  public void start_afterBuildUponWithListenerRemoved_onlyCallsRemainingListeners()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    ArgumentCaptor<Composition> compositionArgumentCaptor =
        ArgumentCaptor.forClass(Composition.class);
    Transformer.Listener mockListener1 = mock(Transformer.Listener.class);
@ -741,6 +766,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_flattenForSlowMotionVideoOnly_completesSuccessfully() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    EditedMediaItem editedMediaItem =
@ -761,6 +787,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_completesWithValidBitrate() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_VIDEO);
@ -774,6 +801,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_whenCodecFailsToConfigure_completesWithError() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    String expectedFailureMessage = "Format not valid. AMR NB (3gpp)";
    ShadowMediaCodec.CodecConfig throwOnConfigureCodecConfig =
        new ShadowMediaCodec.CodecConfig(
@ -813,6 +841,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_withAudioFormatUnsupportedByDecoder_completesWithError() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false)
            .setAudioMimeType(MimeTypes.AUDIO_AAC) // supported by encoder and muxer
@ -837,6 +866,7 @@ public final class MediaItemExportTest {
    // AAC supported by encoder and muxer.
    addAudioEncoders(MimeTypes.AUDIO_RAW, MimeTypes.AUDIO_AAC);

+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer.Listener mockListener = mock(Transformer.Listener.class);
    TransformationRequest originalTransformationRequest =
        new TransformationRequest.Builder().build();
@ -870,6 +900,7 @@ public final class MediaItemExportTest {
    // AAC supported by encoder and muxer.
    addAudioEncoders(MimeTypes.AUDIO_RAW, MimeTypes.AUDIO_AAC);

+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer.Listener mockListener = mock(Transformer.Listener.class);
    TransformationRequest originalTransformationRequest =
        new TransformationRequest.Builder().build();
@ -895,6 +926,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_withIoError_completesWithError() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri("asset:///non-existing-path.mp4");
@ -908,6 +940,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_withSlowOutputSampleRate_completesWithError() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    MediaSource.Factory mediaSourceFactory =
        new DefaultMediaSourceFactory(
            context, new SlowExtractorsFactory(/* delayBetweenReadsMs= */ 10));
@ -918,7 +951,6 @@ public final class MediaItemExportTest {
            decoderFactory,
            new FakeClock(/* isAutoAdvancing= */ true),
            mediaSourceFactory);
-    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory();
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false)
            .setMaxDelayBetweenMuxerSamplesMs(1)
@ -935,7 +967,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_withUnsetMaxDelayBetweenSamples_completesSuccessfully() throws Exception {
-    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory();
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false)
            .setMaxDelayBetweenMuxerSamplesMs(C.TIME_UNSET)
@ -951,6 +983,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_afterCancellation_completesSuccessfully() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_VIDEO);
@ -968,6 +1001,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_fromSpecifiedThread_completesSuccessfully() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    HandlerThread anotherThread = new HandlerThread("AnotherThread");
    anotherThread.start();
    Looper looper = anotherThread.getLooper();
@ -1000,6 +1034,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_fromWrongThread_throwsError() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_VIDEO);
@ -1028,6 +1063,7 @@ public final class MediaItemExportTest {
  @Test
  @Ignore("TODO: b/294389961 - Add valid assertion for whether exporter expects decoded/encoded.")
  public void start_withAssetLoaderAlwaysDecoding_exporterExpectsDecoded() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    AtomicReference<SampleConsumer> sampleConsumerRef = new AtomicReference<>();
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false)
@ -1046,6 +1082,7 @@ public final class MediaItemExportTest {
  @Test
  public void start_withAssetLoaderNotDecodingAndDecodingNeeded_completesWithError()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false)
            .setAssetLoaderFactory(
@ -1067,6 +1104,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_withNoOpEffects_transmuxes() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_VIDEO_ONLY);
@ -1091,6 +1129,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_withOnlyRegularRotationEffect_transmuxesAndRotates() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_VIDEO);
@ -1116,6 +1155,7 @@ public final class MediaItemExportTest {

  @Test
  public void start_regularRotationsAndNoOps_transmuxes() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    // Total rotation is 270.
@ -1143,6 +1183,7 @@ public final class MediaItemExportTest {

  @Test
  public void getProgress_unknownDuration_returnsConsistentStates() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_UNKNOWN_DURATION);
@ -1188,6 +1229,7 @@ public final class MediaItemExportTest {

  @Test
  public void getProgress_knownDuration_returnsConsistentStates() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_VIDEO_ONLY);
@ -1236,6 +1278,7 @@ public final class MediaItemExportTest {

  @Test
  public void getProgress_knownDuration_givesIncreasingPercentages() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_VIDEO_ONLY);
@ -1272,6 +1315,7 @@ public final class MediaItemExportTest {

  @Test
  public void getProgress_noCurrentExport_returnsNotStarted() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_VIDEO_ONLY);
@ -1289,6 +1333,7 @@ public final class MediaItemExportTest {
  public void
      getProgress_trimOptimizationEnabledButNotApplied_withClippingConfigurationUnset_returnsConsistentStates()
          throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false)
            .experimentalSetTrimOptimizationEnabled(true)
@ -1341,6 +1386,7 @@ public final class MediaItemExportTest {
  public void
      getProgress_trimOptimizationEnabledButNotApplied_withClippingConfigurationUnset_givesIncreasingPercentages()
          throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false)
            .experimentalSetTrimOptimizationEnabled(true)
@ -1381,6 +1427,7 @@ public final class MediaItemExportTest {
  public void
      getProgress_trimOptimizationEnabledButNotApplied_withClippingConfigurationUnset_noCurrentExport_returnsNotStarted()
          throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false)
            .experimentalSetTrimOptimizationEnabled(true)
@ -1398,6 +1445,7 @@ public final class MediaItemExportTest {

  @Test
  public void getProgress_fromWrongThread_throwsError() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    HandlerThread anotherThread = new HandlerThread("AnotherThread");
@ -1423,6 +1471,7 @@ public final class MediaItemExportTest {

  @Test
  public void cancel_afterCompletion_doesNotThrow() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_VIDEO_ONLY);
@ -1434,6 +1483,7 @@ public final class MediaItemExportTest {

  @Test
  public void cancel_fromWrongThread_throwsError() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    HandlerThread anotherThread = new HandlerThread("AnotherThread");
@ -1461,6 +1511,7 @@ public final class MediaItemExportTest {
  @Config(minSdk = 30)
  // This test requires Android SDK >= 30 for MediaMuxer negative PTS support.
  public void transmux_audioWithEditList_api30_correctDuration() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_ELST_SKIP_500MS);
@ -1509,6 +1560,7 @@ public final class MediaItemExportTest {
  // This test requires Android SDK < 30 for lack of MediaMuxer negative PTS support
  // and SDK >= 25 for B-frame support.
  public void transmux_trimsFirstIDRDuration() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_VIDEO_ELST_TRIM_IDR_DURATION);
--- a/libraries/transformer/src/test/java/androidx/media3/transformer/MuxerWrapperTest.java
+++ b/libraries/transformer/src/test/java/androidx/media3/transformer/MuxerWrapperTest.java
@ -320,7 +320,7 @@ public class MuxerWrapperTest {
          throws Exception {
    String testId = testName.getMethodName();
    Context context = ApplicationProvider.getApplicationContext();
-    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory();
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    muxerWrapper =
        new MuxerWrapper(
            temporaryFolder.newFile().getPath(),
--- a/libraries/transformer/src/test/java/androidx/media3/transformer/ParameterizedAudioExportTest.java
+++ b/libraries/transformer/src/test/java/androidx/media3/transformer/ParameterizedAudioExportTest.java
@ -117,7 +117,8 @@ public final class ParameterizedAudioExportTest {

  @Parameter public SequenceConfig sequence;

-  private final CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory();
+  private final CapturingMuxer.Factory muxerFactory =
+      new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);

  @Before
  public void setUp() {
--- a/libraries/transformer/src/test/java/androidx/media3/transformer/ParameterizedItemExportTest.java
+++ b/libraries/transformer/src/test/java/androidx/media3/transformer/ParameterizedItemExportTest.java
@ -37,6 +37,7 @@ import androidx.media3.common.MimeTypes;
 import androidx.media3.test.utils.DumpFileAsserts;
 import androidx.test.core.app.ApplicationProvider;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@ -73,6 +74,9 @@ public final class ParameterizedItemExportTest {

  private static final ImmutableList<String> VIDEO_ONLY_ASSETS = ImmutableList.of(FILE_VIDEO_ONLY);

+  private static final ImmutableSet<String> ENCODED_AUDIO_ASSETS =
+      ImmutableSet.of(FILE_AUDIO_VIDEO, FILE_AUDIO_AMR_NB);
+
  @Parameters(name = "{0}")
  public static ImmutableList<String> params() {
    return new ImmutableList.Builder<String>()
@ -86,8 +90,6 @@ public final class ParameterizedItemExportTest {

  @Parameter public String assetFile;

-  private final CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory();
-
  @Before
  public void setUp() {
    // Only add RAW decoder, so non-RAW audio has no options for decoding.
@ -103,6 +105,8 @@ public final class ParameterizedItemExportTest {

  @Test
  public void export() throws Exception {
+    boolean handleAudioAsPcm = !ENCODED_AUDIO_ASSETS.contains(assetFile);
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(handleAudioAsPcm);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();

@ -119,6 +123,7 @@ public final class ParameterizedItemExportTest {
  @Test
  public void generateSilence() throws Exception {
    assumeFalse(AUDIO_ONLY_ASSETS.contains(assetFile));
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();

@ -145,7 +150,8 @@ public final class ParameterizedItemExportTest {
    assumeFalse(VIDEO_ONLY_ASSETS.contains(assetFile));
    assumeFalse(
        "Audio effects in Robolectric tests require PCM input",
-        assetFile.equals(FILE_AUDIO_VIDEO) || assetFile.equals(FILE_AUDIO_AMR_NB));
+        ENCODED_AUDIO_ASSETS.contains(assetFile));
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();

@ -169,7 +175,8 @@ public final class ParameterizedItemExportTest {
    assumeFalse(VIDEO_ONLY_ASSETS.contains(assetFile));
    assumeFalse(
        "Audio effects in Robolectric tests require PCM input",
-        assetFile.equals(FILE_AUDIO_VIDEO) || assetFile.equals(FILE_AUDIO_AMR_NB));
+        ENCODED_AUDIO_ASSETS.contains(assetFile));
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();

--- a/libraries/transformer/src/test/java/androidx/media3/transformer/SequenceExportTest.java
+++ b/libraries/transformer/src/test/java/androidx/media3/transformer/SequenceExportTest.java
@ -64,7 +64,6 @@ public final class SequenceExportTest {
  @Rule public final TemporaryFolder outputDir = new TemporaryFolder();

  private final Context context = ApplicationProvider.getApplicationContext();
-  private final CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory();

  @Before
  public void setUp() {
@ -79,6 +78,7 @@ public final class SequenceExportTest {

  @Test
  public void start_concatenateSameMediaItemWithTransmux_completesSuccessfully() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_VIDEO);
@ -105,6 +105,7 @@ public final class SequenceExportTest {
  @Test
  public void start_concatenateSameMediaItemWithEffectsAndTransmux_ignoresEffects()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_VIDEO);
@ -137,6 +138,7 @@ public final class SequenceExportTest {
  @Test
  public void start_concatenateClippedMediaItemsWithTransmux_completesSuccessfully()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem.ClippingConfiguration clippingConfiguration1 =
@ -184,6 +186,7 @@ public final class SequenceExportTest {
  public void
      start_trimOptimizationEnabled_concatenateClippedMediaItemsWithTransmux_completesSuccessfully()
          throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ false);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false)
            .experimentalSetTrimOptimizationEnabled(true)
@ -233,6 +236,7 @@ public final class SequenceExportTest {
  @Test
  public void concatenateAudioAndSilence_withTransmuxVideo_completesSuccessfully()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW_VIDEO);
@ -261,6 +265,7 @@ public final class SequenceExportTest {
  @Test
  public void concatenateSilenceAndAudio_withTransmuxVideo_completesSuccessfully()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW_VIDEO);
@ -289,6 +294,7 @@ public final class SequenceExportTest {
  @Test
  public void concatenateAudioAndSilence_withEffectsAndTransmuxVideo_completesSuccessfully()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW_VIDEO);
@ -323,6 +329,7 @@ public final class SequenceExportTest {
  @Test
  public void concatenateSilenceAndAudio_withEffectsAndTransmuxVideo_completesSuccessfully()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW_VIDEO);
@ -357,6 +364,7 @@ public final class SequenceExportTest {
  @Test
  public void concatenateSilenceAndSilence_withTransmuxVideo_completesSuccessfully()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW_VIDEO);
@ -383,6 +391,7 @@ public final class SequenceExportTest {
  @Test
  public void concatenateEditedSilenceAndSilence_withTransmuxVideo_completesSuccessfully()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW_VIDEO);
@ -414,6 +423,7 @@ public final class SequenceExportTest {
  @Test
  public void concatenateSilenceAndEditedSilence_withTransmuxVideo_completesSuccessfully()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW_VIDEO);
@ -445,6 +455,7 @@ public final class SequenceExportTest {
  @Test
  public void concatenateSilenceAndSilence_withEffectsAndTransmuxVideo_completesSuccessfully()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW_VIDEO);
@ -478,6 +489,7 @@ public final class SequenceExportTest {

  @Test
  public void concatenateTwoAudioItems_withSameFormat_completesSuccessfully() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem audioOnlyMediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW);
@ -501,6 +513,7 @@ public final class SequenceExportTest {
  @Test
  public void concatenateTwoAudioItems_withSameFormatAndSameEffects_completesSuccessfully()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem audioOnlyMediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW);
@ -527,6 +540,7 @@ public final class SequenceExportTest {
  @Test
  public void concatenateTwoAudioItems_withSameFormatAndDiffEffects_completesSuccessfully()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem audioOnlyMediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW);
@ -558,6 +572,7 @@ public final class SequenceExportTest {

  @Test
  public void concatenateTwoAudioItems_withDiffFormat_completesSuccessfully() throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem stereo48000Audio =
@ -585,6 +600,7 @@ public final class SequenceExportTest {
  @Test
  public void concatenateTwoAudioItems_withDiffFormatAndSameEffects_completesSuccessfully()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();

@ -616,6 +632,7 @@ public final class SequenceExportTest {
  @Test
  public void concatenateTwoAudioItems_withDiffFormatAndDiffEffects_completesSuccessfully()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();

@ -648,6 +665,7 @@ public final class SequenceExportTest {
  @Test
  public void concatenateTwoAudioItems_withDiffFormatAndCompositionEffects_completesSuccessfully()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem stereo48000Audio =
@ -679,6 +697,7 @@ public final class SequenceExportTest {
  @Test
  public void concatenateTwoAudioItems_withDiffEffectsAndCompositionEffects_completesSuccessfully()
      throws Exception {
+    CapturingMuxer.Factory muxerFactory = new CapturingMuxer.Factory(/* handleAudioAsPcm= */ true);
    Transformer transformer =
        createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
    MediaItem audioOnlyMediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW);