sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move raw audio decoder channel count workaround to DefaultCodec.

Browse source 
PiperOrigin-RevId: 630071329
This commit is contained in:
samrobinson 2024-05-02 08:29:03 -07:00 committed by Copybara-Service
parent 7cf2fd9486
commit cb846f0b0d
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
View file

@ -361,6 +361,11 @@ public final class DefaultCodec implements Codec {
if (outputBufferIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) { if (outputBufferIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
outputFormat = outputFormat =
convertToFormat(mediaCodec.getOutputFormat(), isDecoder, configurationFormat.metadata); convertToFormat(mediaCodec.getOutputFormat(), isDecoder, configurationFormat.metadata);
// The raw audio decoder incorrectly sets the channel count for output format to stereo.
if (isDecoder && Objects.equals(configurationFormat.sampleMimeType, MimeTypes.AUDIO_RAW)) {
outputFormat =
outputFormat.buildUpon().setChannelCount(configurationFormat.channelCount).build();
}
} }
return false; return false;
} }

9
libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderBaseRenderer.java
View file

@ -219,6 +219,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
} }
inputFormat = overrideInputFormat(checkNotNull(formatHolder.format)); inputFormat = overrideInputFormat(checkNotNull(formatHolder.format));
onInputFormatRead(inputFormat); onInputFormatRead(inputFormat);
// TODO: b/332708880 - Bypass MediaCodec for raw audio input.
shouldInitDecoder = shouldInitDecoder =
assetLoaderListener.onTrackAdded( assetLoaderListener.onTrackAdded(
inputFormat, SUPPORTED_OUTPUT_TYPE_DECODED | SUPPORTED_OUTPUT_TYPE_ENCODED); inputFormat, SUPPORTED_OUTPUT_TYPE_DECODED | SUPPORTED_OUTPUT_TYPE_ENCODED);
@ -262,14 +263,6 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
if (decoderOutputFormat == null) { if (decoderOutputFormat == null) {
return false; return false;
} }
// TODO: b/332708880 - The raw decoder caps number of audio channels to stereo. Remove this
// workaround and bypass MediaCodec for raw audio instead.
if (checkNotNull(inputFormat.sampleMimeType).equals(MimeTypes.AUDIO_RAW)) {
decoderOutputFormat =
decoderOutputFormat.buildUpon().setChannelCount(inputFormat.channelCount).build();
}
outputFormat = overrideOutputFormat(decoderOutputFormat); outputFormat = overrideOutputFormat(decoderOutputFormat);
} else { } else {
// TODO(b/278259383): Move surface creation out of video sampleConsumer. Init decoder and // TODO(b/278259383): Move surface creation out of video sampleConsumer. Init decoder and