Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AudioSystem: add missing native audio formats am: 9b914446d3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2277188

Change-Id: I0467ac32b1bfb02707484945b74de01a8abe8b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mikhail Naganov
2022-11-09 09:11:21 +00:00
committed by Automerger Merge Worker
parent a1c8f2158c 9b914446d3
commit cae458e44a
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
media/java/android/media/AudioSystem.java
View File

@@ -440,6 +440,14 @@ public class AudioSystem
return "AUDIO_FORMAT_APTX_TWSP"; return "AUDIO_FORMAT_APTX_TWSP";
case /* AUDIO_FORMAT_LC3 */ 0x2B000000: case /* AUDIO_FORMAT_LC3 */ 0x2B000000:
return "AUDIO_FORMAT_LC3"; 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 */ /* Aliases */
case /* AUDIO_FORMAT_PCM_16_BIT */ 0x1: case /* AUDIO_FORMAT_PCM_16_BIT */ 0x1:
@@ -512,10 +520,14 @@ public class AudioSystem
return "AUDIO_FORMAT_MAT_2_0"; // (MAT | MAT_SUB_2_0) return "AUDIO_FORMAT_MAT_2_0"; // (MAT | MAT_SUB_2_0)
case /* AUDIO_FORMAT_MAT_2_1 */ 0x24000003: case /* AUDIO_FORMAT_MAT_2_1 */ 0x24000003:
return "AUDIO_FORMAT_MAT_2_1"; // (MAT | MAT_SUB_2_1) return "AUDIO_FORMAT_MAT_2_1"; // (MAT | MAT_SUB_2_1)
case /* AUDIO_FORMAT_DTS_UHD */ 0x2E000000: case /* AUDIO_FORMAT_MPEGH_SUB_BL_L3 */ 0x2C000013:
return "AUDIO_FORMAT_DTS_UHD"; return "AUDIO_FORMAT_MPEGH_SUB_BL_L3";
case /* AUDIO_FORMAT_DRA */ 0x2F000000: case /* AUDIO_FORMAT_MPEGH_SUB_BL_L4 */ 0x2C000014:
return "AUDIO_FORMAT_DRA"; 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: default:
return "AUDIO_FORMAT_(" + audioFormat + ")"; return "AUDIO_FORMAT_(" + audioFormat + ")";
} }
@@ -2409,4 +2421,3 @@ public class AudioSystem
*/ */
final static int NATIVE_EVENT_ROUTING_CHANGE = 1000; final static int NATIVE_EVENT_ROUTING_CHANGE = 1000;
} }