diff --git a/libraries/decoder_iamf/src/main/java/androidx/media3/decoder/iamf/IamfDecoder.java b/libraries/decoder_iamf/src/main/java/androidx/media3/decoder/iamf/IamfDecoder.java index 710da538db..8036798ee5 100644 --- a/libraries/decoder_iamf/src/main/java/androidx/media3/decoder/iamf/IamfDecoder.java +++ b/libraries/decoder_iamf/src/main/java/androidx/media3/decoder/iamf/IamfDecoder.java @@ -33,7 +33,7 @@ import java.util.List; public final class IamfDecoder extends SimpleDecoder { /* package */ static final int OUTPUT_SAMPLE_RATE = 48000; - /* package */ static final int OUTPUT_PCM_ENCODING = AudioFormat.ENCODING_PCM_16BIT; + /* package */ static final int OUTPUT_PCM_ENCODING = C.ENCODING_PCM_16BIT; /* package */ static final int SPATIALIZED_OUTPUT_LAYOUT = AudioFormat.CHANNEL_OUT_5POINT1; // Matches IAMF_SoundSystem in IAMF_defines.h diff --git a/libraries/decoder_iamf/src/main/java/androidx/media3/decoder/iamf/LibiamfAudioRenderer.java b/libraries/decoder_iamf/src/main/java/androidx/media3/decoder/iamf/LibiamfAudioRenderer.java index da0f2eb801..47e31710ea 100644 --- a/libraries/decoder_iamf/src/main/java/androidx/media3/decoder/iamf/LibiamfAudioRenderer.java +++ b/libraries/decoder_iamf/src/main/java/androidx/media3/decoder/iamf/LibiamfAudioRenderer.java @@ -15,6 +15,7 @@ */ package androidx.media3.decoder.iamf; +import android.annotation.SuppressLint; import android.content.Context; import android.media.AudioFormat; import android.media.AudioManager; @@ -84,6 +85,8 @@ public class LibiamfAudioRenderer extends DecoderAudioRenderer { return "LibiamfAudioRenderer"; } + // IamfDecoder#OUTPUT_PCM_ENCODING indirectly points to AudioFormat#ENCODING_PCM_16BIT. + @SuppressLint("WrongConstant") private boolean isSpatializationSupported() { // Spatializer is only available on API 32 and above. if (Util.SDK_INT < 32) {