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

Add a constructor for AudioFormat that takes Format.

Browse Source 
PiperOrigin-RevId: 541662208
This commit is contained in:
samrobinson 2023-06-19 17:22:55 +01:00 committed by Ian Baker
parent 69769c77b3
commit 74948d5424
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/common/src/main/java/androidx/media3/common/audio/AudioProcessor.java
View File

@ -59,6 +59,14 @@ public interface AudioProcessor {
/** The number of bytes used to represent one audio frame. */ /** The number of bytes used to represent one audio frame. */
public final int bytesPerFrame; public final int bytesPerFrame;
/**
* Creates an instance using the {@link Format#sampleRate}, {@link Format#channelCount} and
* {@link Format#pcmEncoding}.
*/
public AudioFormat(Format format) {
this(format.sampleRate, format.channelCount, format.pcmEncoding);
}
public AudioFormat(int sampleRate, int channelCount, @C.PcmEncoding int encoding) { public AudioFormat(int sampleRate, int channelCount, @C.PcmEncoding int encoding) {
this.sampleRate = sampleRate; this.sampleRate = sampleRate;
this.channelCount = channelCount; this.channelCount = channelCount;

4
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java
View File

@ -674,9 +674,7 @@ public final class DefaultAudioSink implements AudioSink {
} }
channelMappingAudioProcessor.setChannelMap(outputChannels); channelMappingAudioProcessor.setChannelMap(outputChannels);
AudioProcessor.AudioFormat outputFormat = AudioProcessor.AudioFormat outputFormat = new AudioProcessor.AudioFormat(inputFormat);
new AudioProcessor.AudioFormat(
inputFormat.sampleRate, inputFormat.channelCount, inputFormat.pcmEncoding);
try { try {
outputFormat = audioProcessingPipeline.configure(outputFormat); outputFormat = audioProcessingPipeline.configure(outputFormat);
} catch (UnhandledAudioFormatException e) { } catch (UnhandledAudioFormatException e) {

6
libraries/transformer/src/main/java/androidx/media3/transformer/AudioSamplePipeline.java
View File

@ -83,11 +83,7 @@ import org.checkerframework.dataflow.qual.Pure;
encoderOutputBuffer = new DecoderInputBuffer(BUFFER_REPLACEMENT_MODE_DISABLED); encoderOutputBuffer = new DecoderInputBuffer(BUFFER_REPLACEMENT_MODE_DISABLED);
checkArgument(firstPipelineInputFormat.pcmEncoding != Format.NO_VALUE); checkArgument(firstPipelineInputFormat.pcmEncoding != Format.NO_VALUE);
AudioFormat inputAudioFormat = AudioFormat inputAudioFormat = new AudioFormat(firstPipelineInputFormat);
new AudioFormat(
firstPipelineInputFormat.sampleRate,
firstPipelineInputFormat.channelCount,
firstPipelineInputFormat.pcmEncoding);
silentAudioGenerator = new SilentAudioGenerator(inputAudioFormat); silentAudioGenerator = new SilentAudioGenerator(inputAudioFormat);