From 9b914446d3f6e686cf2a1a9c459ad8aec748ffcf Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Fri, 28 Oct 2022 23:42:50 +0000 Subject: AudioSystem: add missing native audio formats Add missing native audio formats to audioFormatToString. Bug: 255477173 Test: m Change-Id: I4f13e7527ad407b0141cb4895083abc0e5b33df2 --- media/java/android/media/AudioSystem.java | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java index 18135f2061a6..4679d5945408 100644 --- a/media/java/android/media/AudioSystem.java +++ b/media/java/android/media/AudioSystem.java @@ -431,6 +431,14 @@ public class AudioSystem return "AUDIO_FORMAT_APTX_TWSP"; case /* AUDIO_FORMAT_LC3 */ 0x2B000000: return "AUDIO_FORMAT_LC3"; + case /* AUDIO_FORMAT_MPEGH */ 0x2C000000: + return "AUDIO_FORMAT_MPEGH"; + case /* AUDIO_FORMAT_IEC60958 */ 0x2D000000: + return "AUDIO_FORMAT_IEC60958"; + case /* AUDIO_FORMAT_DTS_UHD */ 0x2E000000: + return "AUDIO_FORMAT_DTS_UHD"; + case /* AUDIO_FORMAT_DRA */ 0x2F000000: + return "AUDIO_FORMAT_DRA"; /* Aliases */ case /* AUDIO_FORMAT_PCM_16_BIT */ 0x1: @@ -503,10 +511,14 @@ public class AudioSystem return "AUDIO_FORMAT_MAT_2_0"; // (MAT | MAT_SUB_2_0) case /* AUDIO_FORMAT_MAT_2_1 */ 0x24000003: return "AUDIO_FORMAT_MAT_2_1"; // (MAT | MAT_SUB_2_1) - case /* AUDIO_FORMAT_DTS_UHD */ 0x2E000000: - return "AUDIO_FORMAT_DTS_UHD"; - case /* AUDIO_FORMAT_DRA */ 0x2F000000: - return "AUDIO_FORMAT_DRA"; + case /* AUDIO_FORMAT_MPEGH_SUB_BL_L3 */ 0x2C000013: + return "AUDIO_FORMAT_MPEGH_SUB_BL_L3"; + case /* AUDIO_FORMAT_MPEGH_SUB_BL_L4 */ 0x2C000014: + return "AUDIO_FORMAT_MPEGH_SUB_BL_L4"; + case /* AUDIO_FORMAT_MPEGH_SUB_LC_L3 */ 0x2C000023: + return "AUDIO_FORMAT_MPEGH_SUB_LC_L3"; + case /* AUDIO_FORMAT_MPEGH_SUB_LC_L4 */ 0x2C000024: + return "AUDIO_FORMAT_MPEGH_SUB_LC_L4"; default: return "AUDIO_FORMAT_(" + audioFormat + ")"; } @@ -2400,4 +2412,3 @@ public class AudioSystem */ final static int NATIVE_EVENT_ROUTING_CHANGE = 1000; } - -- cgit v1.2.3-59-g8ed1b