From 59f01388a6e2c858bdae369e9ec715bf0b2ab517 Mon Sep 17 00:00:00 2001 From: tonihei Date: Wed, 20 Dec 2023 08:13:51 -0800 Subject: [PATCH] Use platform constants for PCM 24/32 bit encoding These constants are used when setting up the AudioTrack and should match the definition in the platform. PiperOrigin-RevId: 592564644 --- libraries/common/src/main/java/androidx/media3/common/C.java | 4 ++-- .../audiosinkdumps/mka/bear-flac-24bit.mka.audiosink.dump | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/common/src/main/java/androidx/media3/common/C.java b/libraries/common/src/main/java/androidx/media3/common/C.java index df6736b80a..cc42ac8888 100644 --- a/libraries/common/src/main/java/androidx/media3/common/C.java +++ b/libraries/common/src/main/java/androidx/media3/common/C.java @@ -245,13 +245,13 @@ public final class C { @UnstableApi public static final int ENCODING_PCM_16BIT_BIG_ENDIAN = 0x10000000; /** PCM encoding with 24 bits per sample. */ - @UnstableApi public static final int ENCODING_PCM_24BIT = 0x20000000; + @UnstableApi public static final int ENCODING_PCM_24BIT = AudioFormat.ENCODING_PCM_24BIT_PACKED; /** Like {@link #ENCODING_PCM_24BIT} but with the bytes in big endian order. */ @UnstableApi public static final int ENCODING_PCM_24BIT_BIG_ENDIAN = 0x50000000; /** PCM encoding with 32 bits per sample. */ - @UnstableApi public static final int ENCODING_PCM_32BIT = 0x30000000; + @UnstableApi public static final int ENCODING_PCM_32BIT = AudioFormat.ENCODING_PCM_32BIT; /** Like {@link #ENCODING_PCM_32BIT} but with the bytes in big endian order. */ @UnstableApi public static final int ENCODING_PCM_32BIT_BIG_ENDIAN = 0x60000000; diff --git a/libraries/test_data/src/test/assets/audiosinkdumps/mka/bear-flac-24bit.mka.audiosink.dump b/libraries/test_data/src/test/assets/audiosinkdumps/mka/bear-flac-24bit.mka.audiosink.dump index f1c2238dea..e87640f64a 100644 --- a/libraries/test_data/src/test/assets/audiosinkdumps/mka/bear-flac-24bit.mka.audiosink.dump +++ b/libraries/test_data/src/test/assets/audiosinkdumps/mka/bear-flac-24bit.mka.audiosink.dump @@ -2,7 +2,7 @@ AudioSink: buffer count = 29 discontinuity: config: - pcmEncoding = 536870912 + pcmEncoding = 21 channelCount = 2 sampleRate = 48000 buffer #0: