loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Plumb audio through AudioGraph for Composition preview.

Browse Source 
The dump file diff as part of this change is because using AudioGraph
means the 2nd item is automatically edited to match the AudioFormat of
the 1st item {44.1KHz mono}, rather than {48KHz stereo}.

Manually verified that for the 2nd item, data output:
* Before: 66936 bytes (16734 frames) output = 348_625us of audio.
* After: 30750 bytes (15375 frames) output = 348_639us of audio.

The small final buffer is caused by SonicAudioProcessor outputting all
pending data when EOS queued, and is WAI.

PiperOrigin-RevId: 580494578
This commit is contained in:
samrobinson 2023-11-08 05:06:27 -08:00 committed by Copybara-Service
parent 8d1663a57f
commit 76474684f9
5 changed files with 66 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/common/src/main/java/androidx/media3/common/util/Util.java
View File

@ -89,6 +89,7 @@ import androidx.media3.common.ParserException;
import androidx.media3.common.PlaybackException;
import androidx.media3.common.Player;
import androidx.media3.common.Player.Commands;
import androidx.media3.common.audio.AudioProcessor;
import com.google.common.base.Ascii;
import com.google.common.base.Charsets;
import com.google.common.math.DoubleMath;
@ -2132,6 +2133,12 @@ public final class Util {
.build();
}
/** Gets a PCM {@link Format} based on the {@link AudioProcessor.AudioFormat}. */
@UnstableApi
public static Format getPcmFormat(AudioProcessor.AudioFormat audioFormat) {
return getPcmFormat(audioFormat.encoding, audioFormat.channelCount, audioFormat.sampleRate);
}
/**
* Converts a sample bit depth to a corresponding PCM encoding constant.
*

36
libraries/test_data/src/test/assets/audiosinkdumps/wav/sample.wav/highPitch.dump Normal file
View File

@ -0,0 +1,36 @@
AudioSink:
buffer count = 10
config:
pcmEncoding = 2
channelCount = 1
sampleRate = 44100
buffer #0:
time = 1000000000000
data = -85819864
buffer #1:
time = 1000000100000
data = 566487491
buffer #2:
time = 1000000200000
data = -1256531710
buffer #3:
time = 1000000300000
data = 793455796
buffer #4:
time = 1000000400000
data = -268235582
buffer #5:
time = 1000000500000
data = -8136122
buffer #6:
time = 1000000600000
data = 1750866613
buffer #7:
time = 1000000700000
data = -1100753636
buffer #8:
time = 1000000800000
data = 507833230
buffer #9:
time = 1000000900000
data = 1472467506

18
libraries/test_data/src/test/assets/audiosinkdumps/wav/sample.wav_then_sample_rf64.wav.dump
View File

@ -1,5 +1,5 @@
AudioSink:
buffer count = 14
buffer count = 15
config:
pcmEncoding = 2
channelCount = 1
@ -34,20 +34,18 @@ AudioSink:
buffer #9:
time = 1000000900000
data = 1472467506
discontinuity:
config:
pcmEncoding = 2
channelCount = 2
sampleRate = 48000
buffer #10:
time = 1000001000000
data = -278103001
data = 1785344804
buffer #11:
time = 1000001100000
data = 1522105084
data = 458152960
buffer #12:
time = 1000001200000
data = 932319027
data = -2129352270
buffer #13:
time = 1000001300000
data = 325000240
data = 1572219123
buffer #14:
time = 1000001348616
data = -2263

14
libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraph.java
View File

@ -43,6 +43,20 @@ import java.nio.ByteBuffer;
outputAudioFormat = AudioFormat.NOT_SET;
}
/** Returns whether an {@link AudioFormat} is valid as an input format. */
public static boolean isInputAudioFormatValid(AudioFormat format) {
if (format.encoding == Format.NO_VALUE) {
return false;
}
if (format.sampleRate == Format.NO_VALUE) {
return false;
}
if (format.channelCount == Format.NO_VALUE) {
return false;
}
return true;
}
/** Returns a new {@link AudioGraphInput} instance. */
public AudioGraphInput registerInput(EditedMediaItem item, Format format) throws ExportException {
checkArgument(format.pcmEncoding != Format.NO_VALUE);

17
libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraphInput.java
View File

@ -22,6 +22,7 @@ import static androidx.media3.common.util.Assertions.checkNotNull;
import static androidx.media3.common.util.Assertions.checkState;
import static androidx.media3.common.util.Assertions.checkStateNotNull;
import static androidx.media3.decoder.DecoderInputBuffer.BUFFER_REPLACEMENT_MODE_DIRECT;
import static androidx.media3.transformer.AudioGraph.isInputAudioFormatValid;
import androidx.annotation.Nullable;
import androidx.media3.common.C;
@ -367,22 +368,6 @@ import java.util.concurrent.atomic.AtomicReference;
return audioProcessingPipeline;
}
private static boolean isInputAudioFormatValid(AudioFormat format) {
if (format.encoding == Format.NO_VALUE) {
return false;
}
if (format.sampleRate == Format.NO_VALUE) {
return false;
}
if (format.channelCount == Format.NO_VALUE) {
return false;
}
if (format.bytesPerFrame == Format.NO_VALUE) {
return false;
}
return true;
}
private static final class MediaItemChange {
public final EditedMediaItem editedMediaItem;
public final long durationUs;