From d43fe3470f6fd4bac1d49647d3fff895de4f7fad Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Tue, 11 Apr 2023 16:33:38 +0100 Subject: [PATCH] Fix audio encode timestamp off by one Simplify the audio encoder input timestamp calculation. The new calculation avoids drifting by tracking the total number of bytes encoded rather than tracking the timestamp and remainder separately, and also makes the timestamps match the decoder output buffer timestamps. Also switch one of the export tests that was passing through AMR samples over to using WAVE audio. The problem with using AMR is that the compressed samples are not necessarily an integer number of audio frames and the shadow decoder would pass them from input to output, so the audio encoder was receiving non-integer numbers of audio frames. Tested by logging the timestamps at the decoder output and encoder input with forcing transcoding audio, and verifying that after this change the audio timestamps are no longer off by one. PiperOrigin-RevId: 523409869 --- .../amr/sample_nb.amr.aac.dump | 1314 ----------------- .../mkv/sample_with_srt.mkv.dump | 56 +- .../mp4/sample.mp4.48000hz.dump | 74 +- ...atenated_with_high_pitch_and_no_video.dump | 64 +- .../mp4/sample.mp4.silence_then_audio.dump | 178 +-- ...e.mp4.silence_then_audio_with_effects.dump | 124 +- .../mp4/sample.mp4.silentaudio.dump | 88 +- ...mple_18byte_nclx_colr.mp4.silentaudio.dump | 86 +- .../mp4/sample_ac3.mp4.fallback.dump | 12 +- .../mp4/sample_sef_slow_motion.mp4.dump | 28 +- .../transformerdumps/wav/sample.wav.aac.dump | 66 + .../transformer/AudioSamplePipeline.java | 28 +- .../transformer/MediaItemExportTest.java | 7 +- .../androidx/media3/transformer/TestUtil.java | 3 +- 14 files changed, 433 insertions(+), 1695 deletions(-) delete mode 100644 libraries/test_data/src/test/assets/transformerdumps/amr/sample_nb.amr.aac.dump create mode 100644 libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav.aac.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/amr/sample_nb.amr.aac.dump b/libraries/test_data/src/test/assets/transformerdumps/amr/sample_nb.amr.aac.dump deleted file mode 100644 index 696ddec7a4..0000000000 --- a/libraries/test_data/src/test/assets/transformerdumps/amr/sample_nb.amr.aac.dump +++ /dev/null @@ -1,1314 +0,0 @@ -format 0: - sampleMimeType = audio/mp4a-latm - channelCount = 1 - sampleRate = 8000 - pcmEncoding = 2 -sample: - trackIndex = 0 - dataHashCode = 924517484 - size = 13 - isKeyFrame = true - presentationTimeUs = 0 -sample: - trackIndex = 0 - dataHashCode = -835666085 - size = 13 - isKeyFrame = true - presentationTimeUs = 813 -sample: - trackIndex = 0 - dataHashCode = 430283125 - size = 13 - isKeyFrame = true - presentationTimeUs = 1625 -sample: - trackIndex = 0 - dataHashCode = 1215919932 - size = 13 - isKeyFrame = true - presentationTimeUs = 2438 -sample: - trackIndex = 0 - dataHashCode = -386387943 - size = 13 - isKeyFrame = true - presentationTimeUs = 3250 -sample: - trackIndex = 0 - dataHashCode = -765080119 - size = 13 - isKeyFrame = true - presentationTimeUs = 4063 -sample: - trackIndex = 0 - dataHashCode = -1855636054 - size = 13 - isKeyFrame = true - presentationTimeUs = 4875 -sample: - trackIndex = 0 - dataHashCode = -946579722 - size = 13 - isKeyFrame = true - presentationTimeUs = 5688 -sample: - trackIndex = 0 - dataHashCode = -841202654 - size = 13 - isKeyFrame = true - presentationTimeUs = 6500 -sample: - trackIndex = 0 - dataHashCode = -638764303 - size = 13 - isKeyFrame = true - presentationTimeUs = 7313 -sample: - trackIndex = 0 - dataHashCode = -1162388941 - size = 13 - isKeyFrame = true - presentationTimeUs = 8125 -sample: - trackIndex = 0 - dataHashCode = 572634367 - size = 13 - isKeyFrame = true - presentationTimeUs = 8938 -sample: - trackIndex = 0 - dataHashCode = -1774188021 - size = 13 - isKeyFrame = true - presentationTimeUs = 9750 -sample: - trackIndex = 0 - dataHashCode = 92464891 - size = 13 - isKeyFrame = true - presentationTimeUs = 10563 -sample: - trackIndex = 0 - dataHashCode = -991397659 - size = 13 - isKeyFrame = true - presentationTimeUs = 11375 -sample: - trackIndex = 0 - dataHashCode = -934698563 - size = 13 - isKeyFrame = true - presentationTimeUs = 12188 -sample: - trackIndex = 0 - dataHashCode = -811030035 - size = 13 - isKeyFrame = true - presentationTimeUs = 13000 -sample: - trackIndex = 0 - dataHashCode = 1892305159 - size = 13 - isKeyFrame = true - presentationTimeUs = 13813 -sample: - trackIndex = 0 - dataHashCode = -1266858924 - size = 13 - isKeyFrame = true - presentationTimeUs = 14625 -sample: - trackIndex = 0 - dataHashCode = 673814721 - size = 13 - isKeyFrame = true - presentationTimeUs = 15438 -sample: - trackIndex = 0 - dataHashCode = 1061124709 - size = 13 - isKeyFrame = true - presentationTimeUs = 16250 -sample: - trackIndex = 0 - dataHashCode = -869356712 - size = 13 - isKeyFrame = true - presentationTimeUs = 17063 -sample: - trackIndex = 0 - dataHashCode = 664729362 - size = 13 - isKeyFrame = true - presentationTimeUs = 17875 -sample: - trackIndex = 0 - dataHashCode = -1439741143 - size = 13 - isKeyFrame = true - presentationTimeUs = 18688 -sample: - trackIndex = 0 - dataHashCode = -151627580 - size = 13 - isKeyFrame = true - presentationTimeUs = 19500 -sample: - trackIndex = 0 - dataHashCode = -673268457 - size = 13 - isKeyFrame = true - presentationTimeUs = 20313 -sample: - trackIndex = 0 - dataHashCode = 1839962647 - size = 13 - isKeyFrame = true - presentationTimeUs = 21125 -sample: - trackIndex = 0 - dataHashCode = 1858999665 - size = 13 - isKeyFrame = true - presentationTimeUs = 21938 -sample: - trackIndex = 0 - dataHashCode = -1278193537 - size = 13 - isKeyFrame = true - presentationTimeUs = 22750 -sample: - trackIndex = 0 - dataHashCode = 568547001 - size = 13 - isKeyFrame = true - presentationTimeUs = 23563 -sample: - trackIndex = 0 - dataHashCode = 68217362 - size = 13 - isKeyFrame = true - presentationTimeUs = 24375 -sample: - trackIndex = 0 - dataHashCode = 1396217256 - size = 13 - isKeyFrame = true - presentationTimeUs = 25188 -sample: - trackIndex = 0 - dataHashCode = -971293094 - size = 13 - isKeyFrame = true - presentationTimeUs = 26000 -sample: - trackIndex = 0 - dataHashCode = -1742638874 - size = 13 - isKeyFrame = true - presentationTimeUs = 26813 -sample: - trackIndex = 0 - dataHashCode = 2047109317 - size = 13 - isKeyFrame = true - presentationTimeUs = 27625 -sample: - trackIndex = 0 - dataHashCode = -1668945241 - size = 13 - isKeyFrame = true - presentationTimeUs = 28438 -sample: - trackIndex = 0 - dataHashCode = -1229766218 - size = 13 - isKeyFrame = true - presentationTimeUs = 29250 -sample: - trackIndex = 0 - dataHashCode = 1765233454 - size = 13 - isKeyFrame = true - presentationTimeUs = 30063 -sample: - trackIndex = 0 - dataHashCode = -1930255456 - size = 13 - isKeyFrame = true - presentationTimeUs = 30875 -sample: - trackIndex = 0 - dataHashCode = -764925242 - size = 13 - isKeyFrame = true - presentationTimeUs = 31688 -sample: - trackIndex = 0 - dataHashCode = -1144688369 - size = 13 - isKeyFrame = true - presentationTimeUs = 32500 -sample: - trackIndex = 0 - dataHashCode = 1493699436 - size = 13 - isKeyFrame = true - presentationTimeUs = 33313 -sample: - trackIndex = 0 - dataHashCode = -468614511 - size = 13 - isKeyFrame = true - presentationTimeUs = 34125 -sample: - trackIndex = 0 - dataHashCode = -1578782058 - size = 13 - isKeyFrame = true - presentationTimeUs = 34938 -sample: - trackIndex = 0 - dataHashCode = -675743397 - size = 13 - isKeyFrame = true - presentationTimeUs = 35750 -sample: - trackIndex = 0 - dataHashCode = -863790111 - size = 13 - isKeyFrame = true - presentationTimeUs = 36563 -sample: - trackIndex = 0 - dataHashCode = -732307506 - size = 13 - isKeyFrame = true - presentationTimeUs = 37375 -sample: - trackIndex = 0 - dataHashCode = -693298708 - size = 13 - isKeyFrame = true - presentationTimeUs = 38188 -sample: - trackIndex = 0 - dataHashCode = -799131843 - size = 13 - isKeyFrame = true - presentationTimeUs = 39000 -sample: - trackIndex = 0 - dataHashCode = 1782866119 - size = 13 - isKeyFrame = true - presentationTimeUs = 39813 -sample: - trackIndex = 0 - dataHashCode = -912205505 - size = 13 - isKeyFrame = true - presentationTimeUs = 40625 -sample: - trackIndex = 0 - dataHashCode = 1067981287 - size = 13 - isKeyFrame = true - presentationTimeUs = 41438 -sample: - trackIndex = 0 - dataHashCode = 490520060 - size = 13 - isKeyFrame = true - presentationTimeUs = 42250 -sample: - trackIndex = 0 - dataHashCode = -1950632957 - size = 13 - isKeyFrame = true - presentationTimeUs = 43063 -sample: - trackIndex = 0 - dataHashCode = 565485817 - size = 13 - isKeyFrame = true - presentationTimeUs = 43875 -sample: - trackIndex = 0 - dataHashCode = -1057414703 - size = 13 - isKeyFrame = true - presentationTimeUs = 44688 -sample: - trackIndex = 0 - dataHashCode = 1568746155 - size = 13 - isKeyFrame = true - presentationTimeUs = 45500 -sample: - trackIndex = 0 - dataHashCode = 1355412472 - size = 13 - isKeyFrame = true - presentationTimeUs = 46313 -sample: - trackIndex = 0 - dataHashCode = 1546368465 - size = 13 - isKeyFrame = true - presentationTimeUs = 47125 -sample: - trackIndex = 0 - dataHashCode = 1811529381 - size = 13 - isKeyFrame = true - presentationTimeUs = 47938 -sample: - trackIndex = 0 - dataHashCode = 658031078 - size = 13 - isKeyFrame = true - presentationTimeUs = 48750 -sample: - trackIndex = 0 - dataHashCode = 1606584486 - size = 13 - isKeyFrame = true - presentationTimeUs = 49563 -sample: - trackIndex = 0 - dataHashCode = 2123252778 - size = 13 - isKeyFrame = true - presentationTimeUs = 50375 -sample: - trackIndex = 0 - dataHashCode = -1364579398 - size = 13 - isKeyFrame = true - presentationTimeUs = 51188 -sample: - trackIndex = 0 - dataHashCode = 1311427887 - size = 13 - isKeyFrame = true - presentationTimeUs = 52000 -sample: - trackIndex = 0 - dataHashCode = -691467569 - size = 13 - isKeyFrame = true - presentationTimeUs = 52813 -sample: - trackIndex = 0 - dataHashCode = 1876470084 - size = 13 - isKeyFrame = true - presentationTimeUs = 53625 -sample: - trackIndex = 0 - dataHashCode = -1472873479 - size = 13 - isKeyFrame = true - presentationTimeUs = 54438 -sample: - trackIndex = 0 - dataHashCode = -143574992 - size = 13 - isKeyFrame = true - presentationTimeUs = 55250 -sample: - trackIndex = 0 - dataHashCode = 984180453 - size = 13 - isKeyFrame = true - presentationTimeUs = 56063 -sample: - trackIndex = 0 - dataHashCode = -113645527 - size = 13 - isKeyFrame = true - presentationTimeUs = 56875 -sample: - trackIndex = 0 - dataHashCode = 1987501641 - size = 13 - isKeyFrame = true - presentationTimeUs = 57688 -sample: - trackIndex = 0 - dataHashCode = -1816426230 - size = 13 - isKeyFrame = true - presentationTimeUs = 58500 -sample: - trackIndex = 0 - dataHashCode = -1250050360 - size = 13 - isKeyFrame = true - presentationTimeUs = 59313 -sample: - trackIndex = 0 - dataHashCode = 1722852790 - size = 13 - isKeyFrame = true - presentationTimeUs = 60125 -sample: - trackIndex = 0 - dataHashCode = 225656333 - size = 13 - isKeyFrame = true - presentationTimeUs = 60938 -sample: - trackIndex = 0 - dataHashCode = -2137778394 - size = 13 - isKeyFrame = true - presentationTimeUs = 61750 -sample: - trackIndex = 0 - dataHashCode = 1433327155 - size = 13 - isKeyFrame = true - presentationTimeUs = 62563 -sample: - trackIndex = 0 - dataHashCode = -974261023 - size = 13 - isKeyFrame = true - presentationTimeUs = 63375 -sample: - trackIndex = 0 - dataHashCode = 1797813317 - size = 13 - isKeyFrame = true - presentationTimeUs = 64188 -sample: - trackIndex = 0 - dataHashCode = -594033497 - size = 13 - isKeyFrame = true - presentationTimeUs = 65000 -sample: - trackIndex = 0 - dataHashCode = -628310540 - size = 13 - isKeyFrame = true - presentationTimeUs = 65813 -sample: - trackIndex = 0 - dataHashCode = 1868627831 - size = 13 - isKeyFrame = true - presentationTimeUs = 66625 -sample: - trackIndex = 0 - dataHashCode = 1051863958 - size = 13 - isKeyFrame = true - presentationTimeUs = 67438 -sample: - trackIndex = 0 - dataHashCode = -1279059211 - size = 13 - isKeyFrame = true - presentationTimeUs = 68250 -sample: - trackIndex = 0 - dataHashCode = 408201874 - size = 13 - isKeyFrame = true - presentationTimeUs = 69063 -sample: - trackIndex = 0 - dataHashCode = 1686644299 - size = 13 - isKeyFrame = true - presentationTimeUs = 69875 -sample: - trackIndex = 0 - dataHashCode = 1288226241 - size = 13 - isKeyFrame = true - presentationTimeUs = 70688 -sample: - trackIndex = 0 - dataHashCode = 432829731 - size = 13 - isKeyFrame = true - presentationTimeUs = 71500 -sample: - trackIndex = 0 - dataHashCode = -1679312600 - size = 13 - isKeyFrame = true - presentationTimeUs = 72313 -sample: - trackIndex = 0 - dataHashCode = 1206680829 - size = 13 - isKeyFrame = true - presentationTimeUs = 73125 -sample: - trackIndex = 0 - dataHashCode = -325844704 - size = 13 - isKeyFrame = true - presentationTimeUs = 73938 -sample: - trackIndex = 0 - dataHashCode = 1941808848 - size = 13 - isKeyFrame = true - presentationTimeUs = 74750 -sample: - trackIndex = 0 - dataHashCode = -87346412 - size = 13 - isKeyFrame = true - presentationTimeUs = 75563 -sample: - trackIndex = 0 - dataHashCode = -329133765 - size = 13 - isKeyFrame = true - presentationTimeUs = 76375 -sample: - trackIndex = 0 - dataHashCode = -1299416212 - size = 13 - isKeyFrame = true - presentationTimeUs = 77188 -sample: - trackIndex = 0 - dataHashCode = -1314599219 - size = 13 - isKeyFrame = true - presentationTimeUs = 78000 -sample: - trackIndex = 0 - dataHashCode = 1456741286 - size = 13 - isKeyFrame = true - presentationTimeUs = 78813 -sample: - trackIndex = 0 - dataHashCode = 151296500 - size = 13 - isKeyFrame = true - presentationTimeUs = 79625 -sample: - trackIndex = 0 - dataHashCode = 1708763603 - size = 13 - isKeyFrame = true - presentationTimeUs = 80438 -sample: - trackIndex = 0 - dataHashCode = 227542220 - size = 13 - isKeyFrame = true - presentationTimeUs = 81250 -sample: - trackIndex = 0 - dataHashCode = 1094305517 - size = 13 - isKeyFrame = true - presentationTimeUs = 82063 -sample: - trackIndex = 0 - dataHashCode = -990377604 - size = 13 - isKeyFrame = true - presentationTimeUs = 82875 -sample: - trackIndex = 0 - dataHashCode = -1798036230 - size = 13 - isKeyFrame = true - presentationTimeUs = 83688 -sample: - trackIndex = 0 - dataHashCode = -1027148291 - size = 13 - isKeyFrame = true - presentationTimeUs = 84500 -sample: - trackIndex = 0 - dataHashCode = 359763976 - size = 13 - isKeyFrame = true - presentationTimeUs = 85313 -sample: - trackIndex = 0 - dataHashCode = 1332016420 - size = 13 - isKeyFrame = true - presentationTimeUs = 86125 -sample: - trackIndex = 0 - dataHashCode = -102753250 - size = 13 - isKeyFrame = true - presentationTimeUs = 86938 -sample: - trackIndex = 0 - dataHashCode = 1959063156 - size = 13 - isKeyFrame = true - presentationTimeUs = 87750 -sample: - trackIndex = 0 - dataHashCode = 2129089853 - size = 13 - isKeyFrame = true - presentationTimeUs = 88563 -sample: - trackIndex = 0 - dataHashCode = 1658742073 - size = 13 - isKeyFrame = true - presentationTimeUs = 89375 -sample: - trackIndex = 0 - dataHashCode = 2136916514 - size = 13 - isKeyFrame = true - presentationTimeUs = 90188 -sample: - trackIndex = 0 - dataHashCode = 105121407 - size = 13 - isKeyFrame = true - presentationTimeUs = 91000 -sample: - trackIndex = 0 - dataHashCode = -839464484 - size = 13 - isKeyFrame = true - presentationTimeUs = 91813 -sample: - trackIndex = 0 - dataHashCode = -1956791168 - size = 13 - isKeyFrame = true - presentationTimeUs = 92625 -sample: - trackIndex = 0 - dataHashCode = -1387546109 - size = 13 - isKeyFrame = true - presentationTimeUs = 93438 -sample: - trackIndex = 0 - dataHashCode = 128410432 - size = 13 - isKeyFrame = true - presentationTimeUs = 94250 -sample: - trackIndex = 0 - dataHashCode = 907081136 - size = 13 - isKeyFrame = true - presentationTimeUs = 95063 -sample: - trackIndex = 0 - dataHashCode = 1124845067 - size = 13 - isKeyFrame = true - presentationTimeUs = 95875 -sample: - trackIndex = 0 - dataHashCode = -1714479962 - size = 13 - isKeyFrame = true - presentationTimeUs = 96688 -sample: - trackIndex = 0 - dataHashCode = 322029323 - size = 13 - isKeyFrame = true - presentationTimeUs = 97500 -sample: - trackIndex = 0 - dataHashCode = -1116281187 - size = 13 - isKeyFrame = true - presentationTimeUs = 98313 -sample: - trackIndex = 0 - dataHashCode = 1571181228 - size = 13 - isKeyFrame = true - presentationTimeUs = 99125 -sample: - trackIndex = 0 - dataHashCode = 997979854 - size = 13 - isKeyFrame = true - presentationTimeUs = 99938 -sample: - trackIndex = 0 - dataHashCode = -1413492413 - size = 13 - isKeyFrame = true - presentationTimeUs = 100750 -sample: - trackIndex = 0 - dataHashCode = -381390490 - size = 13 - isKeyFrame = true - presentationTimeUs = 101563 -sample: - trackIndex = 0 - dataHashCode = -331348340 - size = 13 - isKeyFrame = true - presentationTimeUs = 102375 -sample: - trackIndex = 0 - dataHashCode = -1568238592 - size = 13 - isKeyFrame = true - presentationTimeUs = 103188 -sample: - trackIndex = 0 - dataHashCode = -941591445 - size = 13 - isKeyFrame = true - presentationTimeUs = 104000 -sample: - trackIndex = 0 - dataHashCode = 1616911281 - size = 13 - isKeyFrame = true - presentationTimeUs = 104813 -sample: - trackIndex = 0 - dataHashCode = -1755664741 - size = 13 - isKeyFrame = true - presentationTimeUs = 105625 -sample: - trackIndex = 0 - dataHashCode = -1950609742 - size = 13 - isKeyFrame = true - presentationTimeUs = 106438 -sample: - trackIndex = 0 - dataHashCode = 1476082149 - size = 13 - isKeyFrame = true - presentationTimeUs = 107250 -sample: - trackIndex = 0 - dataHashCode = 1289547483 - size = 13 - isKeyFrame = true - presentationTimeUs = 108063 -sample: - trackIndex = 0 - dataHashCode = -367599018 - size = 13 - isKeyFrame = true - presentationTimeUs = 108875 -sample: - trackIndex = 0 - dataHashCode = 679378334 - size = 13 - isKeyFrame = true - presentationTimeUs = 109688 -sample: - trackIndex = 0 - dataHashCode = 1437306809 - size = 13 - isKeyFrame = true - presentationTimeUs = 110500 -sample: - trackIndex = 0 - dataHashCode = 311988463 - size = 13 - isKeyFrame = true - presentationTimeUs = 111313 -sample: - trackIndex = 0 - dataHashCode = -1870442665 - size = 13 - isKeyFrame = true - presentationTimeUs = 112125 -sample: - trackIndex = 0 - dataHashCode = 1530013920 - size = 13 - isKeyFrame = true - presentationTimeUs = 112938 -sample: - trackIndex = 0 - dataHashCode = -585506443 - size = 13 - isKeyFrame = true - presentationTimeUs = 113750 -sample: - trackIndex = 0 - dataHashCode = -293690558 - size = 13 - isKeyFrame = true - presentationTimeUs = 114563 -sample: - trackIndex = 0 - dataHashCode = -616893325 - size = 13 - isKeyFrame = true - presentationTimeUs = 115375 -sample: - trackIndex = 0 - dataHashCode = 632210495 - size = 13 - isKeyFrame = true - presentationTimeUs = 116188 -sample: - trackIndex = 0 - dataHashCode = -291767937 - size = 13 - isKeyFrame = true - presentationTimeUs = 117000 -sample: - trackIndex = 0 - dataHashCode = -270265 - size = 13 - isKeyFrame = true - presentationTimeUs = 117813 -sample: - trackIndex = 0 - dataHashCode = -1095959376 - size = 13 - isKeyFrame = true - presentationTimeUs = 118625 -sample: - trackIndex = 0 - dataHashCode = -1363867284 - size = 13 - isKeyFrame = true - presentationTimeUs = 119438 -sample: - trackIndex = 0 - dataHashCode = 185415707 - size = 13 - isKeyFrame = true - presentationTimeUs = 120250 -sample: - trackIndex = 0 - dataHashCode = 1033720098 - size = 13 - isKeyFrame = true - presentationTimeUs = 121063 -sample: - trackIndex = 0 - dataHashCode = 1813896085 - size = 13 - isKeyFrame = true - presentationTimeUs = 121875 -sample: - trackIndex = 0 - dataHashCode = -1381192241 - size = 13 - isKeyFrame = true - presentationTimeUs = 122688 -sample: - trackIndex = 0 - dataHashCode = 362689054 - size = 13 - isKeyFrame = true - presentationTimeUs = 123500 -sample: - trackIndex = 0 - dataHashCode = -1320787356 - size = 13 - isKeyFrame = true - presentationTimeUs = 124313 -sample: - trackIndex = 0 - dataHashCode = 1306489379 - size = 13 - isKeyFrame = true - presentationTimeUs = 125125 -sample: - trackIndex = 0 - dataHashCode = -910313430 - size = 13 - isKeyFrame = true - presentationTimeUs = 125938 -sample: - trackIndex = 0 - dataHashCode = -1533334115 - size = 13 - isKeyFrame = true - presentationTimeUs = 126750 -sample: - trackIndex = 0 - dataHashCode = -700061723 - size = 13 - isKeyFrame = true - presentationTimeUs = 127563 -sample: - trackIndex = 0 - dataHashCode = 474100444 - size = 13 - isKeyFrame = true - presentationTimeUs = 128375 -sample: - trackIndex = 0 - dataHashCode = -2096659943 - size = 13 - isKeyFrame = true - presentationTimeUs = 129188 -sample: - trackIndex = 0 - dataHashCode = -690442126 - size = 13 - isKeyFrame = true - presentationTimeUs = 130000 -sample: - trackIndex = 0 - dataHashCode = 158718784 - size = 13 - isKeyFrame = true - presentationTimeUs = 130813 -sample: - trackIndex = 0 - dataHashCode = -1587553019 - size = 13 - isKeyFrame = true - presentationTimeUs = 131625 -sample: - trackIndex = 0 - dataHashCode = 1266916929 - size = 13 - isKeyFrame = true - presentationTimeUs = 132438 -sample: - trackIndex = 0 - dataHashCode = 1947792537 - size = 13 - isKeyFrame = true - presentationTimeUs = 133250 -sample: - trackIndex = 0 - dataHashCode = 2051622372 - size = 13 - isKeyFrame = true - presentationTimeUs = 134063 -sample: - trackIndex = 0 - dataHashCode = 1648973196 - size = 13 - isKeyFrame = true - presentationTimeUs = 134875 -sample: - trackIndex = 0 - dataHashCode = -1119069213 - size = 13 - isKeyFrame = true - presentationTimeUs = 135688 -sample: - trackIndex = 0 - dataHashCode = -1162670307 - size = 13 - isKeyFrame = true - presentationTimeUs = 136500 -sample: - trackIndex = 0 - dataHashCode = 505180178 - size = 13 - isKeyFrame = true - presentationTimeUs = 137313 -sample: - trackIndex = 0 - dataHashCode = -1707111799 - size = 13 - isKeyFrame = true - presentationTimeUs = 138125 -sample: - trackIndex = 0 - dataHashCode = 549350779 - size = 13 - isKeyFrame = true - presentationTimeUs = 138938 -sample: - trackIndex = 0 - dataHashCode = -895461091 - size = 13 - isKeyFrame = true - presentationTimeUs = 139750 -sample: - trackIndex = 0 - dataHashCode = 1834306839 - size = 13 - isKeyFrame = true - presentationTimeUs = 140563 -sample: - trackIndex = 0 - dataHashCode = -646169807 - size = 13 - isKeyFrame = true - presentationTimeUs = 141375 -sample: - trackIndex = 0 - dataHashCode = 123454915 - size = 13 - isKeyFrame = true - presentationTimeUs = 142188 -sample: - trackIndex = 0 - dataHashCode = 2074179659 - size = 13 - isKeyFrame = true - presentationTimeUs = 143000 -sample: - trackIndex = 0 - dataHashCode = 488070546 - size = 13 - isKeyFrame = true - presentationTimeUs = 143813 -sample: - trackIndex = 0 - dataHashCode = -1379245827 - size = 13 - isKeyFrame = true - presentationTimeUs = 144625 -sample: - trackIndex = 0 - dataHashCode = 922846867 - size = 13 - isKeyFrame = true - presentationTimeUs = 145438 -sample: - trackIndex = 0 - dataHashCode = 1163092079 - size = 13 - isKeyFrame = true - presentationTimeUs = 146250 -sample: - trackIndex = 0 - dataHashCode = -817674907 - size = 13 - isKeyFrame = true - presentationTimeUs = 147063 -sample: - trackIndex = 0 - dataHashCode = -765143209 - size = 13 - isKeyFrame = true - presentationTimeUs = 147875 -sample: - trackIndex = 0 - dataHashCode = 1337234415 - size = 13 - isKeyFrame = true - presentationTimeUs = 148688 -sample: - trackIndex = 0 - dataHashCode = 152696122 - size = 13 - isKeyFrame = true - presentationTimeUs = 149500 -sample: - trackIndex = 0 - dataHashCode = -1037369189 - size = 13 - isKeyFrame = true - presentationTimeUs = 150313 -sample: - trackIndex = 0 - dataHashCode = 93852784 - size = 13 - isKeyFrame = true - presentationTimeUs = 151125 -sample: - trackIndex = 0 - dataHashCode = -1512860804 - size = 13 - isKeyFrame = true - presentationTimeUs = 151938 -sample: - trackIndex = 0 - dataHashCode = -1571797975 - size = 13 - isKeyFrame = true - presentationTimeUs = 152750 -sample: - trackIndex = 0 - dataHashCode = -1390710594 - size = 13 - isKeyFrame = true - presentationTimeUs = 153563 -sample: - trackIndex = 0 - dataHashCode = 775548254 - size = 13 - isKeyFrame = true - presentationTimeUs = 154375 -sample: - trackIndex = 0 - dataHashCode = 329825934 - size = 13 - isKeyFrame = true - presentationTimeUs = 155188 -sample: - trackIndex = 0 - dataHashCode = 449672203 - size = 13 - isKeyFrame = true - presentationTimeUs = 156000 -sample: - trackIndex = 0 - dataHashCode = 135215283 - size = 13 - isKeyFrame = true - presentationTimeUs = 156813 -sample: - trackIndex = 0 - dataHashCode = -627202145 - size = 13 - isKeyFrame = true - presentationTimeUs = 157625 -sample: - trackIndex = 0 - dataHashCode = 565795710 - size = 13 - isKeyFrame = true - presentationTimeUs = 158438 -sample: - trackIndex = 0 - dataHashCode = -853390981 - size = 13 - isKeyFrame = true - presentationTimeUs = 159250 -sample: - trackIndex = 0 - dataHashCode = 1904980829 - size = 13 - isKeyFrame = true - presentationTimeUs = 160063 -sample: - trackIndex = 0 - dataHashCode = 1772857005 - size = 13 - isKeyFrame = true - presentationTimeUs = 160875 -sample: - trackIndex = 0 - dataHashCode = -1159621303 - size = 13 - isKeyFrame = true - presentationTimeUs = 161688 -sample: - trackIndex = 0 - dataHashCode = 712585139 - size = 13 - isKeyFrame = true - presentationTimeUs = 162500 -sample: - trackIndex = 0 - dataHashCode = 7470296 - size = 13 - isKeyFrame = true - presentationTimeUs = 163313 -sample: - trackIndex = 0 - dataHashCode = 1154659763 - size = 13 - isKeyFrame = true - presentationTimeUs = 164125 -sample: - trackIndex = 0 - dataHashCode = 512209179 - size = 13 - isKeyFrame = true - presentationTimeUs = 164938 -sample: - trackIndex = 0 - dataHashCode = 2026712081 - size = 13 - isKeyFrame = true - presentationTimeUs = 165750 -sample: - trackIndex = 0 - dataHashCode = -1625715216 - size = 13 - isKeyFrame = true - presentationTimeUs = 166563 -sample: - trackIndex = 0 - dataHashCode = -1299058326 - size = 13 - isKeyFrame = true - presentationTimeUs = 167375 -sample: - trackIndex = 0 - dataHashCode = -813560096 - size = 13 - isKeyFrame = true - presentationTimeUs = 168188 -sample: - trackIndex = 0 - dataHashCode = 1311045251 - size = 13 - isKeyFrame = true - presentationTimeUs = 169000 -sample: - trackIndex = 0 - dataHashCode = 1388107407 - size = 13 - isKeyFrame = true - presentationTimeUs = 169813 -sample: - trackIndex = 0 - dataHashCode = 1113099440 - size = 13 - isKeyFrame = true - presentationTimeUs = 170625 -sample: - trackIndex = 0 - dataHashCode = -339743582 - size = 13 - isKeyFrame = true - presentationTimeUs = 171438 -sample: - trackIndex = 0 - dataHashCode = -1055895345 - size = 13 - isKeyFrame = true - presentationTimeUs = 172250 -sample: - trackIndex = 0 - dataHashCode = 1869841923 - size = 13 - isKeyFrame = true - presentationTimeUs = 173063 -sample: - trackIndex = 0 - dataHashCode = 229443301 - size = 13 - isKeyFrame = true - presentationTimeUs = 173875 -sample: - trackIndex = 0 - dataHashCode = 1526951012 - size = 13 - isKeyFrame = true - presentationTimeUs = 174688 -sample: - trackIndex = 0 - dataHashCode = -1517436626 - size = 13 - isKeyFrame = true - presentationTimeUs = 175500 -sample: - trackIndex = 0 - dataHashCode = -1403405700 - size = 13 - isKeyFrame = true - presentationTimeUs = 176313 -released = true diff --git a/libraries/test_data/src/test/assets/transformerdumps/mkv/sample_with_srt.mkv.dump b/libraries/test_data/src/test/assets/transformerdumps/mkv/sample_with_srt.mkv.dump index 972571ae76..7d93cbcbc3 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mkv/sample_with_srt.mkv.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mkv/sample_with_srt.mkv.dump @@ -25,55 +25,55 @@ sample: dataHashCode = 2000837254 size = 418 isKeyFrame = true - presentationTimeUs = 4717 + presentationTimeUs = 4716 sample: trackIndex = 1 dataHashCode = -1593942879 size = 418 isKeyFrame = true - presentationTimeUs = 9456 + presentationTimeUs = 9455 sample: trackIndex = 1 dataHashCode = 587837542 size = 418 isKeyFrame = true - presentationTimeUs = 14196 + presentationTimeUs = 14195 sample: trackIndex = 1 dataHashCode = -1836423877 size = 418 isKeyFrame = true - presentationTimeUs = 18935 + presentationTimeUs = 18934 sample: trackIndex = 1 dataHashCode = 874705099 size = 418 isKeyFrame = true - presentationTimeUs = 23674 + presentationTimeUs = 23673 sample: trackIndex = 1 dataHashCode = -269206181 size = 418 isKeyFrame = true - presentationTimeUs = 28413 + presentationTimeUs = 28412 sample: trackIndex = 1 dataHashCode = -58682425 size = 418 isKeyFrame = true - presentationTimeUs = 33152 + presentationTimeUs = 33151 sample: trackIndex = 1 dataHashCode = -859796970 size = 418 isKeyFrame = true - presentationTimeUs = 37892 + presentationTimeUs = 37891 sample: trackIndex = 1 dataHashCode = 711911523 size = 418 isKeyFrame = true - presentationTimeUs = 42631 + presentationTimeUs = 42630 sample: trackIndex = 0 dataHashCode = -252482306 @@ -139,61 +139,61 @@ sample: dataHashCode = -694513071 size = 418 isKeyFrame = true - presentationTimeUs = 47370 + presentationTimeUs = 47369 sample: trackIndex = 1 dataHashCode = -1124371059 size = 418 isKeyFrame = true - presentationTimeUs = 52109 + presentationTimeUs = 52108 sample: trackIndex = 1 dataHashCode = 297166745 size = 418 isKeyFrame = true - presentationTimeUs = 56849 + presentationTimeUs = 56848 sample: trackIndex = 1 dataHashCode = -937110638 size = 418 isKeyFrame = true - presentationTimeUs = 61588 + presentationTimeUs = 61587 sample: trackIndex = 1 dataHashCode = -1050158990 size = 418 isKeyFrame = true - presentationTimeUs = 66327 + presentationTimeUs = 66326 sample: trackIndex = 1 dataHashCode = 1109510229 size = 418 isKeyFrame = true - presentationTimeUs = 71066 + presentationTimeUs = 71065 sample: trackIndex = 1 dataHashCode = 1297086772 size = 418 isKeyFrame = true - presentationTimeUs = 75805 + presentationTimeUs = 75804 sample: trackIndex = 1 dataHashCode = -1739939803 size = 418 isKeyFrame = true - presentationTimeUs = 80545 + presentationTimeUs = 80544 sample: trackIndex = 1 dataHashCode = -1149727930 size = 418 isKeyFrame = true - presentationTimeUs = 85284 + presentationTimeUs = 85283 sample: trackIndex = 1 dataHashCode = -1627652713 size = 418 isKeyFrame = true - presentationTimeUs = 90023 + presentationTimeUs = 90022 sample: trackIndex = 0 dataHashCode = 1556608231 @@ -247,55 +247,55 @@ sample: dataHashCode = -551926260 size = 418 isKeyFrame = true - presentationTimeUs = 94762 + presentationTimeUs = 94761 sample: trackIndex = 1 dataHashCode = 45987178 size = 418 isKeyFrame = true - presentationTimeUs = 99502 + presentationTimeUs = 99501 sample: trackIndex = 1 dataHashCode = -903675808 size = 418 isKeyFrame = true - presentationTimeUs = 104241 + presentationTimeUs = 104240 sample: trackIndex = 1 dataHashCode = -755916991 size = 418 isKeyFrame = true - presentationTimeUs = 108980 + presentationTimeUs = 108979 sample: trackIndex = 1 dataHashCode = -1355207303 size = 418 isKeyFrame = true - presentationTimeUs = 113719 + presentationTimeUs = 113718 sample: trackIndex = 1 dataHashCode = -975703389 size = 418 isKeyFrame = true - presentationTimeUs = 118459 + presentationTimeUs = 118458 sample: trackIndex = 1 dataHashCode = 1933194670 size = 418 isKeyFrame = true - presentationTimeUs = 123198 + presentationTimeUs = 123197 sample: trackIndex = 1 dataHashCode = -565778989 size = 418 isKeyFrame = true - presentationTimeUs = 127937 + presentationTimeUs = 127936 sample: trackIndex = 1 dataHashCode = 1454083383 size = 418 isKeyFrame = true - presentationTimeUs = 132676 + presentationTimeUs = 132675 sample: trackIndex = 0 dataHashCode = -952425536 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.48000hz.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.48000hz.dump index 99ff5f2d60..857f079acb 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.48000hz.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.48000hz.dump @@ -29,19 +29,19 @@ sample: dataHashCode = 1552866193 size = 8 isKeyFrame = true - presentationTimeUs = 230 + presentationTimeUs = 229 sample: trackIndex = 1 dataHashCode = 701848493 size = 160 isKeyFrame = true - presentationTimeUs = 313 + presentationTimeUs = 312 sample: trackIndex = 1 dataHashCode = 2000505720 size = 206 isKeyFrame = true - presentationTimeUs = 1980 + presentationTimeUs = 1979 sample: trackIndex = 1 dataHashCode = 57276327 @@ -53,31 +53,31 @@ sample: dataHashCode = 382237408 size = 228 isKeyFrame = true - presentationTimeUs = 6438 + presentationTimeUs = 6437 sample: trackIndex = 1 dataHashCode = 795308374 size = 228 isKeyFrame = true - presentationTimeUs = 8813 + presentationTimeUs = 8812 sample: trackIndex = 1 dataHashCode = 356270426 size = 224 isKeyFrame = true - presentationTimeUs = 11188 + presentationTimeUs = 11187 sample: trackIndex = 1 dataHashCode = 963641614 size = 244 isKeyFrame = true - presentationTimeUs = 13521 + presentationTimeUs = 13520 sample: trackIndex = 1 dataHashCode = 2045272193 size = 234 isKeyFrame = true - presentationTimeUs = 16063 + presentationTimeUs = 16062 sample: trackIndex = 0 dataHashCode = -770308242 @@ -155,49 +155,49 @@ sample: dataHashCode = -1536715689 size = 248 isKeyFrame = true - presentationTimeUs = 23313 + presentationTimeUs = 23312 sample: trackIndex = 1 dataHashCode = -1275249610 size = 254 isKeyFrame = true - presentationTimeUs = 25896 + presentationTimeUs = 25895 sample: trackIndex = 1 dataHashCode = -2081231470 size = 254 isKeyFrame = true - presentationTimeUs = 28542 + presentationTimeUs = 28541 sample: trackIndex = 1 dataHashCode = 1912348529 size = 250 isKeyFrame = true - presentationTimeUs = 31188 + presentationTimeUs = 31187 sample: trackIndex = 1 dataHashCode = -1393642278 size = 246 isKeyFrame = true - presentationTimeUs = 33792 + presentationTimeUs = 33791 sample: trackIndex = 1 dataHashCode = -2073671562 size = 236 isKeyFrame = true - presentationTimeUs = 36355 + presentationTimeUs = 36354 sample: trackIndex = 1 dataHashCode = -381095129 size = 248 isKeyFrame = true - presentationTimeUs = 38813 + presentationTimeUs = 38812 sample: trackIndex = 1 dataHashCode = -804721381 size = 238 isKeyFrame = true - presentationTimeUs = 41396 + presentationTimeUs = 41395 sample: trackIndex = 0 dataHashCode = 1949198785 @@ -233,13 +233,13 @@ sample: dataHashCode = -1045486664 size = 248 isKeyFrame = true - presentationTimeUs = 46584 + presentationTimeUs = 46583 sample: trackIndex = 1 dataHashCode = -1465283679 size = 260 isKeyFrame = true - presentationTimeUs = 49167 + presentationTimeUs = 49166 sample: trackIndex = 1 dataHashCode = 1840117006 @@ -251,7 +251,7 @@ sample: dataHashCode = -631848848 size = 250 isKeyFrame = true - presentationTimeUs = 54521 + presentationTimeUs = 54520 sample: trackIndex = 1 dataHashCode = -1207491554 @@ -263,19 +263,19 @@ sample: dataHashCode = 838792456 size = 258 isKeyFrame = true - presentationTimeUs = 59584 + presentationTimeUs = 59583 sample: trackIndex = 1 dataHashCode = -1131122284 size = 264 isKeyFrame = true - presentationTimeUs = 62271 + presentationTimeUs = 62270 sample: trackIndex = 1 dataHashCode = -122326555 size = 250 isKeyFrame = true - presentationTimeUs = 65021 + presentationTimeUs = 65020 sample: trackIndex = 1 dataHashCode = -1340323720 @@ -311,43 +311,43 @@ sample: dataHashCode = -1290952882 size = 260 isKeyFrame = true - presentationTimeUs = 70230 + presentationTimeUs = 70229 sample: trackIndex = 1 dataHashCode = 2118216858 size = 244 isKeyFrame = true - presentationTimeUs = 72938 + presentationTimeUs = 72937 sample: trackIndex = 1 dataHashCode = 879520231 size = 252 isKeyFrame = true - presentationTimeUs = 75480 + presentationTimeUs = 75479 sample: trackIndex = 1 dataHashCode = -174892555 size = 264 isKeyFrame = true - presentationTimeUs = 78105 + presentationTimeUs = 78104 sample: trackIndex = 1 dataHashCode = -555873771 size = 252 isKeyFrame = true - presentationTimeUs = 80855 + presentationTimeUs = 80854 sample: trackIndex = 1 dataHashCode = -1479853263 size = 256 isKeyFrame = true - presentationTimeUs = 83480 + presentationTimeUs = 83479 sample: trackIndex = 1 dataHashCode = -1068971504 size = 250 isKeyFrame = true - presentationTimeUs = 86146 + presentationTimeUs = 86145 sample: trackIndex = 1 dataHashCode = -866214350 @@ -359,49 +359,49 @@ sample: dataHashCode = -2111034853 size = 288 isKeyFrame = true - presentationTimeUs = 91396 + presentationTimeUs = 91395 sample: trackIndex = 1 dataHashCode = -1445430754 size = 278 isKeyFrame = true - presentationTimeUs = 94396 + presentationTimeUs = 94395 sample: trackIndex = 1 dataHashCode = 1200468541 size = 246 isKeyFrame = true - presentationTimeUs = 97292 + presentationTimeUs = 97291 sample: trackIndex = 1 dataHashCode = -1853596884 size = 246 isKeyFrame = true - presentationTimeUs = 99855 + presentationTimeUs = 99854 sample: trackIndex = 1 dataHashCode = -1266372568 size = 254 isKeyFrame = true - presentationTimeUs = 102417 + presentationTimeUs = 102416 sample: trackIndex = 1 dataHashCode = -212017561 size = 248 isKeyFrame = true - presentationTimeUs = 105063 + presentationTimeUs = 105062 sample: trackIndex = 1 dataHashCode = -1464702479 size = 8 isKeyFrame = true - presentationTimeUs = 107646 + presentationTimeUs = 107645 sample: trackIndex = 1 dataHashCode = -2065 size = 2 isKeyFrame = true - presentationTimeUs = 107730 + presentationTimeUs = 107729 sample: trackIndex = 0 dataHashCode = -1408463661 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.concatenated_with_high_pitch_and_no_video.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.concatenated_with_high_pitch_and_no_video.dump index b86eab4594..d3e35758f1 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.concatenated_with_high_pitch_and_no_video.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.concatenated_with_high_pitch_and_no_video.dump @@ -16,191 +16,191 @@ sample: dataHashCode = -1580893866 size = 678 isKeyFrame = true - presentationTimeUs = 8980 + presentationTimeUs = 8979 sample: trackIndex = 0 dataHashCode = -31547651 size = 304 isKeyFrame = true - presentationTimeUs = 16667 + presentationTimeUs = 16666 sample: trackIndex = 0 dataHashCode = 1415140636 size = 460 isKeyFrame = true - presentationTimeUs = 20114 + presentationTimeUs = 20113 sample: trackIndex = 0 dataHashCode = 1721060815 size = 850 isKeyFrame = true - presentationTimeUs = 25329 + presentationTimeUs = 25328 sample: trackIndex = 0 dataHashCode = 1707913464 size = 446 isKeyFrame = true - presentationTimeUs = 34966 + presentationTimeUs = 34965 sample: trackIndex = 0 dataHashCode = -776771764 size = 852 isKeyFrame = true - presentationTimeUs = 40023 + presentationTimeUs = 40022 sample: trackIndex = 0 dataHashCode = -609146892 size = 368 isKeyFrame = true - presentationTimeUs = 49683 + presentationTimeUs = 49682 sample: trackIndex = 0 dataHashCode = -2044977387 size = 1166 isKeyFrame = true - presentationTimeUs = 53855 + presentationTimeUs = 53854 sample: trackIndex = 0 dataHashCode = -753877175 size = 506 isKeyFrame = true - presentationTimeUs = 67075 + presentationTimeUs = 67074 sample: trackIndex = 0 dataHashCode = 1491046836 size = 578 isKeyFrame = true - presentationTimeUs = 72812 + presentationTimeUs = 72811 sample: trackIndex = 0 dataHashCode = 621394572 size = 668 isKeyFrame = true - presentationTimeUs = 79366 + presentationTimeUs = 79365 sample: trackIndex = 0 dataHashCode = -58393202 size = 268 isKeyFrame = true - presentationTimeUs = 86939 + presentationTimeUs = 86938 sample: trackIndex = 0 dataHashCode = 1253593269 size = 318 isKeyFrame = true - presentationTimeUs = 89978 + presentationTimeUs = 89977 sample: trackIndex = 0 dataHashCode = -1544714160 size = 424 isKeyFrame = true - presentationTimeUs = 93583 + presentationTimeUs = 93582 sample: trackIndex = 0 dataHashCode = -2038565545 size = 294 isKeyFrame = true - presentationTimeUs = 98391 + presentationTimeUs = 98390 sample: trackIndex = 0 dataHashCode = 803611858 size = 394 isKeyFrame = true - presentationTimeUs = 101724 + presentationTimeUs = 101723 sample: trackIndex = 0 dataHashCode = 890682839 size = 812 isKeyFrame = true - presentationTimeUs = 106191 + presentationTimeUs = 106190 sample: trackIndex = 0 dataHashCode = 1798765816 size = 332 isKeyFrame = true - presentationTimeUs = 115397 + presentationTimeUs = 115396 sample: trackIndex = 0 dataHashCode = -155329417 size = 250 isKeyFrame = true - presentationTimeUs = 119161 + presentationTimeUs = 119160 sample: trackIndex = 0 dataHashCode = 2061435630 size = 304 isKeyFrame = true - presentationTimeUs = 121996 + presentationTimeUs = 121995 sample: trackIndex = 0 dataHashCode = -667770092 size = 1318 isKeyFrame = true - presentationTimeUs = 125443 + presentationTimeUs = 125442 sample: trackIndex = 0 dataHashCode = 1947321516 size = 224 isKeyFrame = true - presentationTimeUs = 140386 + presentationTimeUs = 140385 sample: trackIndex = 0 dataHashCode = 1744495738 size = 446 isKeyFrame = true - presentationTimeUs = 142926 + presentationTimeUs = 142925 sample: trackIndex = 0 dataHashCode = 801488010 size = 838 isKeyFrame = true - presentationTimeUs = 147982 + presentationTimeUs = 147981 sample: trackIndex = 0 dataHashCode = -867204691 size = 520 isKeyFrame = true - presentationTimeUs = 157483 + presentationTimeUs = 157482 sample: trackIndex = 0 dataHashCode = 1994555264 size = 230 isKeyFrame = true - presentationTimeUs = 163379 + presentationTimeUs = 163378 sample: trackIndex = 0 dataHashCode = -748724753 size = 380 isKeyFrame = true - presentationTimeUs = 165987 + presentationTimeUs = 165986 sample: trackIndex = 0 dataHashCode = -1557661843 size = 692 isKeyFrame = true - presentationTimeUs = 170295 + presentationTimeUs = 170294 sample: trackIndex = 0 dataHashCode = 461522726 size = 270 isKeyFrame = true - presentationTimeUs = 178141 + presentationTimeUs = 178140 sample: trackIndex = 0 dataHashCode = 1058760091 size = 238 isKeyFrame = true - presentationTimeUs = 181202 + presentationTimeUs = 181201 sample: trackIndex = 0 dataHashCode = 1541647596 size = 722 isKeyFrame = true - presentationTimeUs = 183901 + presentationTimeUs = 183900 sample: trackIndex = 0 dataHashCode = -2107816707 size = 2062 isKeyFrame = true - presentationTimeUs = 192087 + presentationTimeUs = 192086 released = true diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.silence_then_audio.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.silence_then_audio.dump index 0687c0c7c6..bea16f1540 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.silence_then_audio.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.silence_then_audio.dump @@ -27,127 +27,127 @@ sample: dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 23220 + presentationTimeUs = 23219 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 46440 + presentationTimeUs = 46439 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 69660 + presentationTimeUs = 69659 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 92880 + presentationTimeUs = 92879 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 116100 + presentationTimeUs = 116099 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 139320 + presentationTimeUs = 139319 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 162540 + presentationTimeUs = 162539 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 185760 + presentationTimeUs = 185759 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 208980 + presentationTimeUs = 208979 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 232200 + presentationTimeUs = 232199 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 255420 + presentationTimeUs = 255419 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 278640 + presentationTimeUs = 278639 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 301860 + presentationTimeUs = 301859 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 325080 + presentationTimeUs = 325079 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 348300 + presentationTimeUs = 348299 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 371520 + presentationTimeUs = 371519 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 394740 + presentationTimeUs = 394739 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 417960 + presentationTimeUs = 417959 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 441180 + presentationTimeUs = 441179 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 464400 + presentationTimeUs = 464399 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 487620 + presentationTimeUs = 487619 sample: trackIndex = 0 dataHashCode = -770308242 @@ -213,85 +213,85 @@ sample: dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 510840 + presentationTimeUs = 510839 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 534059 + presentationTimeUs = 534058 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 557279 + presentationTimeUs = 557278 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 580499 + presentationTimeUs = 580498 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 603719 + presentationTimeUs = 603718 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 626939 + presentationTimeUs = 626938 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 650159 + presentationTimeUs = 650158 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 673379 + presentationTimeUs = 673378 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 696599 + presentationTimeUs = 696598 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 719819 + presentationTimeUs = 719818 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 743039 + presentationTimeUs = 743038 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 766259 + presentationTimeUs = 766258 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 789479 + presentationTimeUs = 789478 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 812699 + presentationTimeUs = 812698 sample: trackIndex = 0 dataHashCode = 1949198785 @@ -357,55 +357,55 @@ sample: dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 835919 + presentationTimeUs = 835918 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 859139 + presentationTimeUs = 859138 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 882359 + presentationTimeUs = 882358 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 905579 + presentationTimeUs = 905578 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 928799 + presentationTimeUs = 928798 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 952019 + presentationTimeUs = 952018 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 975239 + presentationTimeUs = 975238 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 998459 + presentationTimeUs = 998458 sample: trackIndex = 1 dataHashCode = -587391743 size = 408 isKeyFrame = true - presentationTimeUs = 1021679 + presentationTimeUs = 1021678 sample: trackIndex = 0 dataHashCode = -1723778407 @@ -489,61 +489,61 @@ sample: dataHashCode = 1205768497 size = 23 isKeyFrame = true - presentationTimeUs = 1023991 + presentationTimeUs = 1023990 sample: trackIndex = 1 dataHashCode = 837571078 size = 6 isKeyFrame = true - presentationTimeUs = 1024122 + presentationTimeUs = 1024104 sample: trackIndex = 1 dataHashCode = -1991633045 size = 148 isKeyFrame = true - presentationTimeUs = 1024156 + presentationTimeUs = 1024149 sample: trackIndex = 1 dataHashCode = -822987359 size = 189 isKeyFrame = true - presentationTimeUs = 1024995 + presentationTimeUs = 1024988 sample: trackIndex = 1 dataHashCode = -1141508176 size = 205 isKeyFrame = true - presentationTimeUs = 1026066 + presentationTimeUs = 1026054 sample: trackIndex = 1 dataHashCode = -226971245 size = 210 isKeyFrame = true - presentationTimeUs = 1027228 + presentationTimeUs = 1027210 sample: trackIndex = 1 dataHashCode = -2099636855 size = 210 isKeyFrame = true - presentationTimeUs = 1028419 + presentationTimeUs = 1028412 sample: trackIndex = 1 dataHashCode = 1541550559 size = 207 isKeyFrame = true - presentationTimeUs = 1029609 + presentationTimeUs = 1029591 sample: trackIndex = 1 dataHashCode = 411148001 size = 225 isKeyFrame = true - presentationTimeUs = 1030783 + presentationTimeUs = 1030770 sample: trackIndex = 1 dataHashCode = -897603973 size = 215 isKeyFrame = true - presentationTimeUs = 1032058 + presentationTimeUs = 1032040 sample: trackIndex = 0 dataHashCode = 1150349584 @@ -609,61 +609,61 @@ sample: dataHashCode = 1478106136 size = 211 isKeyFrame = true - presentationTimeUs = 1033277 + presentationTimeUs = 1033265 sample: trackIndex = 1 dataHashCode = -1380417145 size = 216 isKeyFrame = true - presentationTimeUs = 1034473 + presentationTimeUs = 1034467 sample: trackIndex = 1 dataHashCode = 780903644 size = 229 isKeyFrame = true - presentationTimeUs = 1035698 + presentationTimeUs = 1035691 sample: trackIndex = 1 dataHashCode = 586204432 size = 232 isKeyFrame = true - presentationTimeUs = 1036996 + presentationTimeUs = 1036984 sample: trackIndex = 1 dataHashCode = -2038771492 size = 235 isKeyFrame = true - presentationTimeUs = 1038311 + presentationTimeUs = 1038299 sample: trackIndex = 1 dataHashCode = -2065161304 size = 231 isKeyFrame = true - presentationTimeUs = 1039643 + presentationTimeUs = 1039637 sample: trackIndex = 1 dataHashCode = 468662933 size = 226 isKeyFrame = true - presentationTimeUs = 1040953 + presentationTimeUs = 1040952 sample: trackIndex = 1 dataHashCode = -358398546 size = 216 isKeyFrame = true - presentationTimeUs = 1042234 + presentationTimeUs = 1042222 sample: trackIndex = 1 dataHashCode = 1767325983 size = 229 isKeyFrame = true - presentationTimeUs = 1043459 + presentationTimeUs = 1043446 sample: trackIndex = 1 dataHashCode = 1093095458 size = 219 isKeyFrame = true - presentationTimeUs = 1044757 + presentationTimeUs = 1044739 sample: trackIndex = 0 dataHashCode = 965782073 @@ -675,151 +675,151 @@ sample: dataHashCode = 1687543702 size = 241 isKeyFrame = true - presentationTimeUs = 1045998 + presentationTimeUs = 1045986 sample: trackIndex = 1 dataHashCode = 1675188486 size = 228 isKeyFrame = true - presentationTimeUs = 1047364 + presentationTimeUs = 1047346 sample: trackIndex = 1 dataHashCode = 888567545 size = 238 isKeyFrame = true - presentationTimeUs = 1048657 + presentationTimeUs = 1048639 sample: trackIndex = 1 dataHashCode = -439631803 size = 234 isKeyFrame = true - presentationTimeUs = 1050006 + presentationTimeUs = 1050000 sample: trackIndex = 1 dataHashCode = 1606694497 size = 231 isKeyFrame = true - presentationTimeUs = 1051333 + presentationTimeUs = 1051315 sample: trackIndex = 1 dataHashCode = 1747388653 size = 217 isKeyFrame = true - presentationTimeUs = 1052642 + presentationTimeUs = 1052630 sample: trackIndex = 1 dataHashCode = -734560004 size = 239 isKeyFrame = true - presentationTimeUs = 1053872 + presentationTimeUs = 1053854 sample: trackIndex = 1 dataHashCode = -975079040 size = 243 isKeyFrame = true - presentationTimeUs = 1055227 + presentationTimeUs = 1055215 sample: trackIndex = 1 dataHashCode = -1403504710 size = 231 isKeyFrame = true - presentationTimeUs = 1056605 + presentationTimeUs = 1056598 sample: trackIndex = 1 dataHashCode = 379512981 size = 230 isKeyFrame = true - presentationTimeUs = 1057914 + presentationTimeUs = 1057913 sample: trackIndex = 1 dataHashCode = -997198863 size = 238 isKeyFrame = true - presentationTimeUs = 1059218 + presentationTimeUs = 1059206 sample: trackIndex = 1 dataHashCode = 1394492825 size = 225 isKeyFrame = true - presentationTimeUs = 1060567 + presentationTimeUs = 1060566 sample: trackIndex = 1 dataHashCode = -885232755 size = 232 isKeyFrame = true - presentationTimeUs = 1061843 + presentationTimeUs = 1061836 sample: trackIndex = 1 dataHashCode = 260871367 size = 243 isKeyFrame = true - presentationTimeUs = 1063158 + presentationTimeUs = 1063151 sample: trackIndex = 1 dataHashCode = -1505318960 size = 232 isKeyFrame = true - presentationTimeUs = 1064536 + presentationTimeUs = 1064535 sample: trackIndex = 1 dataHashCode = -390625371 size = 237 isKeyFrame = true - presentationTimeUs = 1065851 + presentationTimeUs = 1065850 sample: trackIndex = 1 dataHashCode = 1067950751 size = 228 isKeyFrame = true - presentationTimeUs = 1067194 + presentationTimeUs = 1067188 sample: trackIndex = 1 dataHashCode = -1179436278 size = 235 isKeyFrame = true - presentationTimeUs = 1068487 + presentationTimeUs = 1068480 sample: trackIndex = 1 dataHashCode = 1906607774 size = 264 isKeyFrame = true - presentationTimeUs = 1069819 + presentationTimeUs = 1069818 sample: trackIndex = 1 dataHashCode = -800475828 size = 257 isKeyFrame = true - presentationTimeUs = 1071316 + presentationTimeUs = 1071315 sample: trackIndex = 1 dataHashCode = 1718972977 size = 227 isKeyFrame = true - presentationTimeUs = 1072773 + presentationTimeUs = 1072766 sample: trackIndex = 1 dataHashCode = -1120448741 size = 227 isKeyFrame = true - presentationTimeUs = 1074059 + presentationTimeUs = 1074058 sample: trackIndex = 1 dataHashCode = -1718323210 size = 235 isKeyFrame = true - presentationTimeUs = 1075346 + presentationTimeUs = 1075328 sample: trackIndex = 1 dataHashCode = -422416 size = 229 isKeyFrame = true - presentationTimeUs = 1076679 + presentationTimeUs = 1076666 sample: trackIndex = 1 dataHashCode = 833757830 size = 6 isKeyFrame = true - presentationTimeUs = 1077977 + presentationTimeUs = 1077959 sample: trackIndex = 0 dataHashCode = -261176150 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.silence_then_audio_with_effects.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.silence_then_audio_with_effects.dump index 95c323c90e..ffba5df91a 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.silence_then_audio_with_effects.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.silence_then_audio_with_effects.dump @@ -27,127 +27,127 @@ sample: dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 17461 + presentationTimeUs = 17460 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 39910 + presentationTimeUs = 39909 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 62359 + presentationTimeUs = 62358 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 87302 + presentationTimeUs = 87301 sample: trackIndex = 1 dataHashCode = -448902783 size = 3956 isKeyFrame = true - presentationTimeUs = 109751 + presentationTimeUs = 109750 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 132177 + presentationTimeUs = 132176 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 157121 + presentationTimeUs = 157120 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 179570 + presentationTimeUs = 179569 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 202019 + presentationTimeUs = 202018 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 226962 + presentationTimeUs = 226961 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 249411 + presentationTimeUs = 249410 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 271860 + presentationTimeUs = 271859 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 296803 + presentationTimeUs = 296802 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 319252 + presentationTimeUs = 319251 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 341701 + presentationTimeUs = 341700 sample: trackIndex = 1 dataHashCode = -122903935 size = 4396 isKeyFrame = true - presentationTimeUs = 364150 + presentationTimeUs = 364149 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 389071 + presentationTimeUs = 389070 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 411520 + presentationTimeUs = 411519 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 433969 + presentationTimeUs = 433968 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 458912 + presentationTimeUs = 458911 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 481361 + presentationTimeUs = 481360 sample: trackIndex = 0 dataHashCode = -770308242 @@ -213,91 +213,91 @@ sample: dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 503810 + presentationTimeUs = 503809 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 528753 + presentationTimeUs = 528752 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 551202 + presentationTimeUs = 551201 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 573651 + presentationTimeUs = 573650 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 598595 + presentationTimeUs = 598594 sample: trackIndex = 1 dataHashCode = -448902783 size = 3956 isKeyFrame = true - presentationTimeUs = 621044 + presentationTimeUs = 621043 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 643470 + presentationTimeUs = 643469 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 665919 + presentationTimeUs = 665918 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 690862 + presentationTimeUs = 690861 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 713311 + presentationTimeUs = 713310 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 735760 + presentationTimeUs = 735759 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 760703 + presentationTimeUs = 760702 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 783152 + presentationTimeUs = 783151 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 805601 + presentationTimeUs = 805600 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 830545 + presentationTimeUs = 830544 sample: trackIndex = 0 dataHashCode = 1949198785 @@ -363,43 +363,43 @@ sample: dataHashCode = -448902783 size = 3956 isKeyFrame = true - presentationTimeUs = 852994 + presentationTimeUs = 852993 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 875420 + presentationTimeUs = 875419 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 900363 + presentationTimeUs = 900362 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 922812 + presentationTimeUs = 922811 sample: trackIndex = 1 dataHashCode = 571187457 size = 3960 isKeyFrame = true - presentationTimeUs = 945261 + presentationTimeUs = 945260 sample: trackIndex = 1 dataHashCode = -1264223743 size = 4400 isKeyFrame = true - presentationTimeUs = 967710 + presentationTimeUs = 967709 sample: trackIndex = 1 dataHashCode = -1759454975 size = 440 isKeyFrame = true - presentationTimeUs = 992654 + presentationTimeUs = 992653 sample: trackIndex = 0 dataHashCode = -1723778407 @@ -483,19 +483,19 @@ sample: dataHashCode = -1759454975 size = 440 isKeyFrame = true - presentationTimeUs = 995148 + presentationTimeUs = 995147 sample: trackIndex = 1 dataHashCode = -1759454975 size = 440 isKeyFrame = true - presentationTimeUs = 997642 + presentationTimeUs = 997641 sample: trackIndex = 1 dataHashCode = -1759454975 size = 440 isKeyFrame = true - presentationTimeUs = 1000137 + presentationTimeUs = 1000136 sample: trackIndex = 0 dataHashCode = 1150349584 @@ -561,31 +561,31 @@ sample: dataHashCode = -1759454975 size = 440 isKeyFrame = true - presentationTimeUs = 1002631 + presentationTimeUs = 1002630 sample: trackIndex = 1 dataHashCode = -1759454975 size = 440 isKeyFrame = true - presentationTimeUs = 1005125 + presentationTimeUs = 1005124 sample: trackIndex = 1 dataHashCode = -1759454975 size = 440 isKeyFrame = true - presentationTimeUs = 1007620 + presentationTimeUs = 1007619 sample: trackIndex = 1 dataHashCode = -1759454975 size = 440 isKeyFrame = true - presentationTimeUs = 1010114 + presentationTimeUs = 1010113 sample: trackIndex = 1 dataHashCode = -1759454975 size = 440 isKeyFrame = true - presentationTimeUs = 1012608 + presentationTimeUs = 1012607 sample: trackIndex = 0 dataHashCode = 965782073 @@ -597,67 +597,67 @@ sample: dataHashCode = -1759454975 size = 440 isKeyFrame = true - presentationTimeUs = 1015103 + presentationTimeUs = 1015102 sample: trackIndex = 1 dataHashCode = -1759454975 size = 440 isKeyFrame = true - presentationTimeUs = 1017597 + presentationTimeUs = 1017596 sample: trackIndex = 1 dataHashCode = 1769039399 size = 440 isKeyFrame = true - presentationTimeUs = 1020091 + presentationTimeUs = 1020090 sample: trackIndex = 1 dataHashCode = 2055596432 size = 440 isKeyFrame = true - presentationTimeUs = 1022586 + presentationTimeUs = 1022585 sample: trackIndex = 1 dataHashCode = 1256378735 size = 552 isKeyFrame = true - presentationTimeUs = 1025080 + presentationTimeUs = 1025079 sample: trackIndex = 1 dataHashCode = 252271772 size = 508 isKeyFrame = true - presentationTimeUs = 1028209 + presentationTimeUs = 1028208 sample: trackIndex = 1 dataHashCode = 858405415 size = 656 isKeyFrame = true - presentationTimeUs = 1031089 + presentationTimeUs = 1031088 sample: trackIndex = 1 dataHashCode = -809646068 size = 492 isKeyFrame = true - presentationTimeUs = 1034808 + presentationTimeUs = 1034807 sample: trackIndex = 1 dataHashCode = -724992735 size = 844 isKeyFrame = true - presentationTimeUs = 1037597 + presentationTimeUs = 1037596 sample: trackIndex = 1 dataHashCode = -1464088455 size = 800 isKeyFrame = true - presentationTimeUs = 1042381 + presentationTimeUs = 1042380 sample: trackIndex = 1 dataHashCode = -1270518800 size = 5396 isKeyFrame = true - presentationTimeUs = 1046917 + presentationTimeUs = 1046916 sample: trackIndex = 0 dataHashCode = -261176150 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.silentaudio.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.silentaudio.dump index 4cc76e5089..67ab03c944 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.silentaudio.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4.silentaudio.dump @@ -27,127 +27,127 @@ sample: dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 23220 + presentationTimeUs = 23219 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 46440 + presentationTimeUs = 46439 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 69660 + presentationTimeUs = 69659 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 92880 + presentationTimeUs = 92879 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 116100 + presentationTimeUs = 116099 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 139320 + presentationTimeUs = 139319 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 162540 + presentationTimeUs = 162539 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 185760 + presentationTimeUs = 185759 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 208980 + presentationTimeUs = 208979 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 232200 + presentationTimeUs = 232199 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 255420 + presentationTimeUs = 255419 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 278640 + presentationTimeUs = 278639 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 301860 + presentationTimeUs = 301859 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 325080 + presentationTimeUs = 325079 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 348300 + presentationTimeUs = 348299 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 371520 + presentationTimeUs = 371519 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 394740 + presentationTimeUs = 394739 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 417960 + presentationTimeUs = 417959 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 441180 + presentationTimeUs = 441179 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 464400 + presentationTimeUs = 464399 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 487620 + presentationTimeUs = 487619 sample: trackIndex = 0 dataHashCode = -770308242 @@ -213,85 +213,85 @@ sample: dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 510840 + presentationTimeUs = 510839 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 534059 + presentationTimeUs = 534058 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 557279 + presentationTimeUs = 557278 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 580499 + presentationTimeUs = 580498 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 603719 + presentationTimeUs = 603718 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 626939 + presentationTimeUs = 626938 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 650159 + presentationTimeUs = 650158 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 673379 + presentationTimeUs = 673378 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 696599 + presentationTimeUs = 696598 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 719819 + presentationTimeUs = 719818 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 743039 + presentationTimeUs = 743038 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 766259 + presentationTimeUs = 766258 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 789479 + presentationTimeUs = 789478 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 812699 + presentationTimeUs = 812698 sample: trackIndex = 0 dataHashCode = 1949198785 @@ -357,55 +357,55 @@ sample: dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 835919 + presentationTimeUs = 835918 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 859139 + presentationTimeUs = 859138 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 882359 + presentationTimeUs = 882358 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 905579 + presentationTimeUs = 905578 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 928799 + presentationTimeUs = 928798 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 952019 + presentationTimeUs = 952018 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 975239 + presentationTimeUs = 975238 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 998459 + presentationTimeUs = 998458 sample: trackIndex = 1 dataHashCode = -587391743 size = 408 isKeyFrame = true - presentationTimeUs = 1021679 + presentationTimeUs = 1021678 sample: trackIndex = 0 dataHashCode = -1723778407 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4.silentaudio.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4.silentaudio.dump index c02482575d..b3520a0e2e 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4.silentaudio.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4.silentaudio.dump @@ -30,127 +30,127 @@ sample: dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 23220 + presentationTimeUs = 23219 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 46440 + presentationTimeUs = 46439 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 69660 + presentationTimeUs = 69659 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 92880 + presentationTimeUs = 92879 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 116100 + presentationTimeUs = 116099 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 139320 + presentationTimeUs = 139319 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 162540 + presentationTimeUs = 162539 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 185760 + presentationTimeUs = 185759 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 208980 + presentationTimeUs = 208979 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 232200 + presentationTimeUs = 232199 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 255420 + presentationTimeUs = 255419 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 278640 + presentationTimeUs = 278639 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 301860 + presentationTimeUs = 301859 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 325080 + presentationTimeUs = 325079 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 348300 + presentationTimeUs = 348299 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 371520 + presentationTimeUs = 371519 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 394740 + presentationTimeUs = 394739 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 417960 + presentationTimeUs = 417959 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 441180 + presentationTimeUs = 441179 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 464400 + presentationTimeUs = 464399 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 487620 + presentationTimeUs = 487619 sample: trackIndex = 0 dataHashCode = -770308242 @@ -216,85 +216,85 @@ sample: dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 510840 + presentationTimeUs = 510839 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 534059 + presentationTimeUs = 534058 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 557279 + presentationTimeUs = 557278 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 580499 + presentationTimeUs = 580498 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 603719 + presentationTimeUs = 603718 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 626939 + presentationTimeUs = 626938 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 650159 + presentationTimeUs = 650158 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 673379 + presentationTimeUs = 673378 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 696599 + presentationTimeUs = 696598 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 719819 + presentationTimeUs = 719818 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 743039 + presentationTimeUs = 743038 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 766259 + presentationTimeUs = 766258 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 789479 + presentationTimeUs = 789478 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 812699 + presentationTimeUs = 812698 sample: trackIndex = 0 dataHashCode = 1949198785 @@ -360,49 +360,49 @@ sample: dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 835919 + presentationTimeUs = 835918 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 859139 + presentationTimeUs = 859138 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 882359 + presentationTimeUs = 882358 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 905579 + presentationTimeUs = 905578 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 928799 + presentationTimeUs = 928798 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 952019 + presentationTimeUs = 952018 sample: trackIndex = 1 dataHashCode = 1742602241 size = 4096 isKeyFrame = true - presentationTimeUs = 975239 + presentationTimeUs = 975238 sample: trackIndex = 1 dataHashCode = 226248705 size = 448 isKeyFrame = true - presentationTimeUs = 998459 + presentationTimeUs = 998458 sample: trackIndex = 0 dataHashCode = -1723778407 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_ac3.mp4.fallback.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_ac3.mp4.fallback.dump index c0f8197493..0bbdc51b48 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_ac3.mp4.fallback.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_ac3.mp4.fallback.dump @@ -14,13 +14,13 @@ sample: dataHashCode = -2134951116 size = 1536 isKeyFrame = true - presentationTimeUs = 2667 + presentationTimeUs = 2666 sample: trackIndex = 0 dataHashCode = 97556101 size = 1536 isKeyFrame = true - presentationTimeUs = 5334 + presentationTimeUs = 5333 sample: trackIndex = 0 dataHashCode = -1448980924 @@ -32,13 +32,13 @@ sample: dataHashCode = 1871012467 size = 1536 isKeyFrame = true - presentationTimeUs = 10667 + presentationTimeUs = 10666 sample: trackIndex = 0 dataHashCode = -1317831364 size = 1536 isKeyFrame = true - presentationTimeUs = 13334 + presentationTimeUs = 13333 sample: trackIndex = 0 dataHashCode = -1728189539 @@ -50,11 +50,11 @@ sample: dataHashCode = -1715881661 size = 1536 isKeyFrame = true - presentationTimeUs = 18667 + presentationTimeUs = 18666 sample: trackIndex = 0 dataHashCode = -1428554542 size = 1536 isKeyFrame = true - presentationTimeUs = 21334 + presentationTimeUs = 21333 released = true diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4.dump index ea7aedd9fa..1b78285dc9 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4.dump @@ -29,19 +29,19 @@ sample: dataHashCode = -1948569090 size = 72 isKeyFrame = true - presentationTimeUs = 417 + presentationTimeUs = 416 sample: trackIndex = 1 dataHashCode = -1316750072 size = 84 isKeyFrame = true - presentationTimeUs = 1917 + presentationTimeUs = 1916 sample: trackIndex = 1 dataHashCode = 1016428949 size = 88 isKeyFrame = true - presentationTimeUs = 3667 + presentationTimeUs = 3666 sample: trackIndex = 1 dataHashCode = -1127325245 @@ -119,7 +119,7 @@ sample: dataHashCode = -2125685540 size = 76 isKeyFrame = true - presentationTimeUs = 9417 + presentationTimeUs = 9416 sample: trackIndex = 1 dataHashCode = 473329679 @@ -137,7 +137,7 @@ sample: dataHashCode = 777637182 size = 196 isKeyFrame = true - presentationTimeUs = 15167 + presentationTimeUs = 15166 sample: trackIndex = 1 dataHashCode = 1872106264 @@ -155,7 +155,7 @@ sample: dataHashCode = 1580199067 size = 232 isKeyFrame = true - presentationTimeUs = 25917 + presentationTimeUs = 25916 sample: trackIndex = 1 dataHashCode = 475464086 @@ -167,13 +167,13 @@ sample: dataHashCode = -211754132 size = 172 isKeyFrame = true - presentationTimeUs = 34584 + presentationTimeUs = 34583 sample: trackIndex = 1 dataHashCode = 1236547164 size = 172 isKeyFrame = true - presentationTimeUs = 38167 + presentationTimeUs = 38166 sample: trackIndex = 1 dataHashCode = -2064216186 @@ -227,13 +227,13 @@ sample: dataHashCode = -682950885 size = 260 isKeyFrame = true - presentationTimeUs = 45667 + presentationTimeUs = 45666 sample: trackIndex = 1 dataHashCode = 1301206627 size = 236 isKeyFrame = true - presentationTimeUs = 51084 + presentationTimeUs = 51083 sample: trackIndex = 1 dataHashCode = 256580525 @@ -245,13 +245,13 @@ sample: dataHashCode = -1086601304 size = 236 isKeyFrame = true - presentationTimeUs = 60917 + presentationTimeUs = 60916 sample: trackIndex = 1 dataHashCode = -2046131588 size = 224 isKeyFrame = true - presentationTimeUs = 65834 + presentationTimeUs = 65833 sample: trackIndex = 1 dataHashCode = 1550955865 @@ -263,7 +263,7 @@ sample: dataHashCode = -274800552 size = 220 isKeyFrame = true - presentationTimeUs = 75167 + presentationTimeUs = 75166 sample: trackIndex = 1 dataHashCode = 382420909 @@ -275,7 +275,7 @@ sample: dataHashCode = -1431575865 size = 232 isKeyFrame = true - presentationTimeUs = 84417 + presentationTimeUs = 84416 sample: trackIndex = 0 dataHashCode = 2112365658 diff --git a/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav.aac.dump b/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav.aac.dump new file mode 100644 index 0000000000..73c846c296 --- /dev/null +++ b/libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav.aac.dump @@ -0,0 +1,66 @@ +format 0: + sampleMimeType = audio/mp4a-latm + channelCount = 1 + sampleRate = 44100 + pcmEncoding = 2 +sample: + trackIndex = 0 + dataHashCode = -85819864 + size = 8820 + isKeyFrame = true + presentationTimeUs = 0 +sample: + trackIndex = 0 + dataHashCode = 566487491 + size = 8820 + isKeyFrame = true + presentationTimeUs = 100000 +sample: + trackIndex = 0 + dataHashCode = -1256531710 + size = 8820 + isKeyFrame = true + presentationTimeUs = 200000 +sample: + trackIndex = 0 + dataHashCode = 793455796 + size = 8820 + isKeyFrame = true + presentationTimeUs = 300000 +sample: + trackIndex = 0 + dataHashCode = -268235582 + size = 8820 + isKeyFrame = true + presentationTimeUs = 400000 +sample: + trackIndex = 0 + dataHashCode = -8136122 + size = 8820 + isKeyFrame = true + presentationTimeUs = 500000 +sample: + trackIndex = 0 + dataHashCode = 1750866613 + size = 8820 + isKeyFrame = true + presentationTimeUs = 600000 +sample: + trackIndex = 0 + dataHashCode = -1100753636 + size = 8820 + isKeyFrame = true + presentationTimeUs = 700000 +sample: + trackIndex = 0 + dataHashCode = 507833230 + size = 8820 + isKeyFrame = true + presentationTimeUs = 800000 +sample: + trackIndex = 0 + dataHashCode = 1472467506 + size = 8820 + isKeyFrame = true + presentationTimeUs = 900000 +released = true diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSamplePipeline.java b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSamplePipeline.java index a5da6ba6ae..8a692b32a0 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSamplePipeline.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSamplePipeline.java @@ -53,8 +53,7 @@ import org.checkerframework.dataflow.qual.Pure; private final DecoderInputBuffer encoderInputBuffer; private final DecoderInputBuffer encoderOutputBuffer; - private long nextEncoderInputBufferTimeUs; - private long encoderBufferDurationRemainder; + private long encoderTotalInputBytes; private volatile boolean queueEndOfStreamAfterSilence; @@ -334,9 +333,8 @@ import org.checkerframework.dataflow.qual.Pure; int bufferLimit = inputBuffer.limit(); inputBuffer.limit(min(bufferLimit, inputBuffer.position() + encoderInputBufferData.capacity())); encoderInputBufferData.put(inputBuffer); - encoderInputBuffer.timeUs = nextEncoderInputBufferTimeUs; - computeNextEncoderInputBufferTimeUs( - /* bytesWritten= */ encoderInputBufferData.position(), encoderInputAudioFormat); + encoderInputBuffer.timeUs = getOutputAudioDurationUs(); + encoderTotalInputBytes += encoderInputBufferData.position(); encoderInputBuffer.setFlags(0); encoderInputBuffer.flip(); inputBuffer.limit(bufferLimit); @@ -345,7 +343,7 @@ import org.checkerframework.dataflow.qual.Pure; private void queueEndOfStreamToEncoder() throws ExportException { checkState(checkNotNull(encoderInputBuffer.data).position() == 0); - encoderInputBuffer.timeUs = nextEncoderInputBufferTimeUs; + encoderInputBuffer.timeUs = getOutputAudioDurationUs(); encoderInputBuffer.addFlag(C.BUFFER_FLAG_END_OF_STREAM); encoderInputBuffer.flip(); // Queuing EOS should only occur with an empty buffer. @@ -363,21 +361,9 @@ import org.checkerframework.dataflow.qual.Pure; return transformationRequest.buildUpon().setAudioMimeType(actualFormat.sampleMimeType).build(); } - private void computeNextEncoderInputBufferTimeUs(long bytesWritten, AudioFormat audioFormat) { - // The calculation below accounts for remainders and rounding. Without that it corresponds to - // the following: - // bufferDurationUs = numberOfFramesInBuffer * sampleDurationUs - // where numberOfFramesInBuffer = bytesWritten / bytesPerFrame - // and sampleDurationUs = C.MICROS_PER_SECOND / sampleRate - long numerator = bytesWritten * C.MICROS_PER_SECOND + encoderBufferDurationRemainder; - long denominator = (long) audioFormat.bytesPerFrame * audioFormat.sampleRate; - long bufferDurationUs = numerator / denominator; - encoderBufferDurationRemainder = numerator - bufferDurationUs * denominator; - if (encoderBufferDurationRemainder > 0) { // Ceil division result. - bufferDurationUs += 1; - encoderBufferDurationRemainder -= denominator; - } - nextEncoderInputBufferTimeUs += bufferDurationUs; + private long getOutputAudioDurationUs() { + long totalFramesWritten = encoderTotalInputBytes / encoderInputAudioFormat.bytesPerFrame; + return (totalFramesWritten * C.MICROS_PER_SECOND) / encoderInputAudioFormat.sampleRate; } private boolean shouldGenerateSilence() { diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java index 0efe272890..2d179c41df 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java @@ -21,6 +21,7 @@ import static androidx.media3.test.utils.robolectric.RobolectricUtil.runLooperUn import static androidx.media3.transformer.AssetLoader.SUPPORTED_OUTPUT_TYPE_DECODED; import static androidx.media3.transformer.AssetLoader.SUPPORTED_OUTPUT_TYPE_ENCODED; import static androidx.media3.transformer.TestUtil.ASSET_URI_PREFIX; +import static androidx.media3.transformer.TestUtil.FILE_AUDIO_RAW; import static androidx.media3.transformer.TestUtil.FILE_AUDIO_UNSUPPORTED_BY_DECODER; import static androidx.media3.transformer.TestUtil.FILE_AUDIO_UNSUPPORTED_BY_ENCODER; import static androidx.media3.transformer.TestUtil.FILE_AUDIO_UNSUPPORTED_BY_MUXER; @@ -161,15 +162,13 @@ public final class MediaItemExportTest { .setAudioMimeType(MimeTypes.AUDIO_AAC) // supported by encoder and muxer .build()) .build(); - MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_UNSUPPORTED_BY_ENCODER); + MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW); transformer.start(mediaItem, outputPath); TransformerTestRunner.runLooper(transformer); DumpFileAsserts.assertOutput( - context, - checkNotNull(testMuxerHolder.testMuxer), - getDumpFileName(FILE_AUDIO_UNSUPPORTED_BY_ENCODER + ".aac")); + context, checkNotNull(testMuxerHolder.testMuxer), getDumpFileName(FILE_AUDIO_RAW + ".aac")); } @Test diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/TestUtil.java b/libraries/transformer/src/test/java/androidx/media3/transformer/TestUtil.java index cc2bd27a31..66ccc87d93 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/TestUtil.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/TestUtil.java @@ -150,6 +150,7 @@ public final class TestUtil { public static final String FILE_AUDIO_VIDEO = "mp4/sample.mp4"; public static final String FILE_AUDIO_VIDEO_INCREASING_TIMESTAMPS_15S = "mp4/sample_with_increasing_timestamps_320w_240h.mp4"; + public static final String FILE_AUDIO_RAW = "wav/sample.wav"; public static final String FILE_WITH_SUBTITLES = "mkv/sample_with_srt.mkv"; public static final String FILE_WITH_SEF_SLOW_MOTION = "mp4/sample_sef_slow_motion.mp4"; public static final String FILE_AUDIO_UNSUPPORTED_BY_DECODER = "amr/sample_wb.amr"; @@ -179,7 +180,7 @@ public final class TestUtil { /* colorFormats= */ ImmutableList.of(), /* isDecoder= */ true); addCodec( - MimeTypes.AUDIO_AMR_NB, + MimeTypes.AUDIO_RAW, codecConfig, /* colorFormats= */ ImmutableList.of(), /* isDecoder= */ true);