diff --git a/libraries/test_data/src/test/assets/audiosinkdumps/wav/sample.wav-lowVolume_then_sample_rf64.wav-highVolume.dump b/libraries/test_data/src/test/assets/audiosinkdumps/wav/sample.wav-lowVolume_then_sample_rf64.wav-highVolume.dump new file mode 100644 index 0000000000..64c7419e57 --- /dev/null +++ b/libraries/test_data/src/test/assets/audiosinkdumps/wav/sample.wav-lowVolume_then_sample_rf64.wav-highVolume.dump @@ -0,0 +1,51 @@ +AudioSink: + buffer count = 15 + config: + pcmEncoding = 2 + channelCount = 1 + sampleRate = 44100 + buffer #0: + time = 1000000000000 + data = -264191391 + buffer #1: + time = 1000000100000 + data = -1920445439 + buffer #2: + time = 1000000200000 + data = 951798465 + buffer #3: + time = 1000000300000 + data = 350069123 + buffer #4: + time = 1000000400000 + data = -789481696 + buffer #5: + time = 1000000500000 + data = -328820582 + buffer #6: + time = 1000000600000 + data = -1158684771 + buffer #7: + time = 1000000700000 + data = 1361756392 + buffer #8: + time = 1000000800000 + data = 2024513349 + buffer #9: + time = 1000000900000 + data = -651017745 + buffer #10: + time = 1000001000000 + data = -1561045045 + buffer #11: + time = 1000001100000 + data = -959474172 + buffer #12: + time = 1000001200000 + data = -1123806876 + buffer #13: + time = 1000001300000 + data = 265695352 + buffer #14: + time = 1000001348616 + data = 3317 diff --git a/libraries/test_data/src/test/assets/audiosinkdumps/wav/sample.wav/highVolume.dump b/libraries/test_data/src/test/assets/audiosinkdumps/wav/sample.wav/highVolume.dump index 748829a62a..4fe75d75f2 100644 --- a/libraries/test_data/src/test/assets/audiosinkdumps/wav/sample.wav/highVolume.dump +++ b/libraries/test_data/src/test/assets/audiosinkdumps/wav/sample.wav/highVolume.dump @@ -6,31 +6,31 @@ AudioSink: sampleRate = 44100 buffer #0: time = 1000000000000 - data = -85819864 + data = 1365664853 buffer #1: time = 1000000100000 - data = 566487491 + data = -1466730976 buffer #2: time = 1000000200000 - data = -1256531710 + data = 1178728837 buffer #3: time = 1000000300000 - data = 793455796 + data = -216459624 buffer #4: time = 1000000400000 - data = -268235582 + data = 1990341112 buffer #5: time = 1000000500000 - data = -8136122 + data = 1561236782 buffer #6: time = 1000000600000 - data = 1750866613 + data = 1146352887 buffer #7: time = 1000000700000 - data = -1100753636 + data = 1061204212 buffer #8: time = 1000000800000 - data = 507833230 + data = 840187559 buffer #9: time = 1000000900000 - data = 1472467506 + data = -29240395 diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraph.java b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraph.java index c0aa9276c7..4c5967daff 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraph.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraph.java @@ -58,10 +58,11 @@ import java.nio.ByteBuffer; } /** Returns a new {@link AudioGraphInput} instance. */ - public AudioGraphInput registerInput(EditedMediaItem item, Format format) throws ExportException { + public AudioGraphInput registerInput(EditedMediaItem editedMediaItem, Format format) + throws ExportException { checkArgument(format.pcmEncoding != Format.NO_VALUE); try { - AudioGraphInput audioGraphInput = new AudioGraphInput(item, format); + AudioGraphInput audioGraphInput = new AudioGraphInput(editedMediaItem, format); if (inputs.size() == 0) { outputAudioFormat = audioGraphInput.getOutputAudioFormat(); diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSampleExporter.java b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSampleExporter.java index 9291c57e97..0f9c130c84 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSampleExporter.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSampleExporter.java @@ -99,14 +99,15 @@ import org.checkerframework.dataflow.qual.Pure; } @Override - public AudioGraphInput getInput(EditedMediaItem item, Format format) throws ExportException { + public AudioGraphInput getInput(EditedMediaItem editedMediaItem, Format format) + throws ExportException { if (!returnedFirstInput) { // First input initialized in constructor because output AudioFormat is needed. returnedFirstInput = true; checkState(format.equals(this.firstInputFormat)); return firstInput; } - return audioGraph.registerInput(item, format); + return audioGraph.registerInput(editedMediaItem, format); } @Override