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

Merge "Add AUDIO_FORMAT_LC3 in BtCodec" am: a57618d34d am: cb6ef1e9cc

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

Change-Id: I086c599c0525c4e39e66675a5b33f870b22d5f53
This commit is contained in:
Treehugger Robot
2022-01-20 06:52:38 +00:00
committed by Automerger Merge Worker
parent 6827583cb9 cb6ef1e9cc
commit 34e5b686b2
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -9061,6 +9061,7 @@ package android.bluetooth {
field public static final int SOURCE_CODEC_TYPE_APTX = 2; // 0x2 field public static final int SOURCE_CODEC_TYPE_APTX = 2; // 0x2
field public static final int SOURCE_CODEC_TYPE_APTX_HD = 3; // 0x3 field public static final int SOURCE_CODEC_TYPE_APTX_HD = 3; // 0x3
field public static final int SOURCE_CODEC_TYPE_INVALID = 1000000; // 0xf4240 field public static final int SOURCE_CODEC_TYPE_INVALID = 1000000; // 0xf4240
field public static final int SOURCE_CODEC_TYPE_LC3 = 5; // 0x5
field public static final int SOURCE_CODEC_TYPE_LDAC = 4; // 0x4 field public static final int SOURCE_CODEC_TYPE_LDAC = 4; // 0x4
field public static final int SOURCE_CODEC_TYPE_SBC = 0; // 0x0 field public static final int SOURCE_CODEC_TYPE_SBC = 0; // 0x0
} }

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

@@ -242,7 +242,8 @@ public class AudioSystem
AUDIO_FORMAT_SBC, AUDIO_FORMAT_SBC,
AUDIO_FORMAT_APTX, AUDIO_FORMAT_APTX,
AUDIO_FORMAT_APTX_HD, AUDIO_FORMAT_APTX_HD,
AUDIO_FORMAT_LDAC} AUDIO_FORMAT_LDAC,
AUDIO_FORMAT_LC3}
) )
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
public @interface AudioFormatNativeEnumForBtCodec {} public @interface AudioFormatNativeEnumForBtCodec {}
@@ -274,6 +275,7 @@ public class AudioSystem
case AUDIO_FORMAT_APTX: return BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX; case AUDIO_FORMAT_APTX: return BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX;
case AUDIO_FORMAT_APTX_HD: return BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD; case AUDIO_FORMAT_APTX_HD: return BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD;
case AUDIO_FORMAT_LDAC: return BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC; case AUDIO_FORMAT_LDAC: return BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC;
case AUDIO_FORMAT_LC3: return BluetoothCodecConfig.SOURCE_CODEC_TYPE_LC3;
default: default:
Log.e(TAG, "Unknown audio format 0x" + Integer.toHexString(audioFormat) Log.e(TAG, "Unknown audio format 0x" + Integer.toHexString(audioFormat)
+ " for conversion to BT codec"); + " for conversion to BT codec");
@@ -314,6 +316,8 @@ public class AudioSystem
return AudioSystem.AUDIO_FORMAT_APTX_HD; return AudioSystem.AUDIO_FORMAT_APTX_HD;
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC: case BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC:
return AudioSystem.AUDIO_FORMAT_LDAC; return AudioSystem.AUDIO_FORMAT_LDAC;
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_LC3:
return AudioSystem.AUDIO_FORMAT_LC3;
default: default:
Log.e(TAG, "Unknown BT codec 0x" + Integer.toHexString(btCodec) Log.e(TAG, "Unknown BT codec 0x" + Integer.toHexString(btCodec)
+ " for conversion to audio format"); + " for conversion to audio format");
@@ -414,6 +418,8 @@ public class AudioSystem
return "AUDIO_FORMAT_LHDC_LL"; return "AUDIO_FORMAT_LHDC_LL";
case /* AUDIO_FORMAT_APTX_TWSP */ 0x2A000000: case /* AUDIO_FORMAT_APTX_TWSP */ 0x2A000000:
return "AUDIO_FORMAT_APTX_TWSP"; return "AUDIO_FORMAT_APTX_TWSP";
case /* AUDIO_FORMAT_LC3 */ 0x2B000000:
return "AUDIO_FORMAT_LC3";
/* Aliases */ /* Aliases */
case /* AUDIO_FORMAT_PCM_16_BIT */ 0x1: case /* AUDIO_FORMAT_PCM_16_BIT */ 0x1: