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

Merge changes from topic "fix-b-255477173-aptx-formats"

Browse Source 
* changes:
  AudioSystem: Add AUDIO_FORMAT_APTX_ADAPTIVE_{QLEA|R4}
  AudioSystem: add missing native audio formats
This commit is contained in:
Eric Laurent
2022-11-09 08:41:53 +00:00
committed by Gerrit Code Review
parent 45681820d7 72eb0b689c
commit 4872186e0b
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -431,6 +431,18 @@ 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";
case /* AUDIO_FORMAT_APTX_ADAPTIVE_QLEA */ 0x30000000:
return "AUDIO_FORMAT_APTX_ADAPTIVE_QLEA";
case /* AUDIO_FORMAT_APTX_ADAPTIVE_R4 */ 0x31000000:
return "AUDIO_FORMAT_APTX_ADAPTIVE_R4";
/* Aliases */
case /* AUDIO_FORMAT_PCM_16_BIT */ 0x1:
@@ -503,10 +515,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 +2416,3 @@ public class AudioSystem
*/
final static int NATIVE_EVENT_ROUTING_CHANGE = 1000;
}