Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e6110f6 authored by Naresh Tanniru's avatar Naresh Tanniru Committed by Bruno Martins
Browse files

audio: Add support for audio extended codecs 



- Add support for APTX adaptive and CELT
  formats

[wight554: updated code from LA.QSSI.11.0.r1-05600-qssi.0]

 Conflicts:
	media/java/android/media/AudioSystem.java
	services/core/java/com/android/server/audio/BtHelper.java

Change-Id: I735a297acc4d3d4c7f8d2cc9302a13ebcf4e4c3d
CRs-Fixed: 2433041
Signed-off-by: default avatarVolodymyr Zhdanov <wight554@gmail.com>
parent 143de070

media/java/android/media/AudioSystem.java

+11 −0
Original line number Diff line number Diff line
@@ -198,6 +198,10 @@ public class AudioSystem 
    public static final int AUDIO_FORMAT_APTX_HD        = 0x21000000;

    /** @hide */

    public static final int AUDIO_FORMAT_LDAC           = 0x23000000;

    /** @hide */

    public static final int AUDIO_FORMAT_CELT           = 0x26000000;

    /** @hide */

    public static final int AUDIO_FORMAT_APTX_ADAPTIVE  = 0x27000000;



    /** @hide */

    @IntDef(flag = false, prefix = "AUDIO_FORMAT_", value = {
@@ -224,6 +228,9 @@ public class AudioSystem 
            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_LDAC: return BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC;

            case AUDIO_FORMAT_CELT: return BluetoothCodecConfig.SOURCE_CODEC_TYPE_CELT;

            case AUDIO_FORMAT_APTX_ADAPTIVE:

                     return BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_ADAPTIVE;

            default:

                Log.e(TAG, "Unknown audio format 0x" + Integer.toHexString(audioFormat)

                        + " for conversion to BT codec");
@@ -249,6 +256,10 @@ public class AudioSystem 
                return AudioSystem.AUDIO_FORMAT_APTX_HD;

            case BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC:

                return AudioSystem.AUDIO_FORMAT_LDAC;

            case BluetoothCodecConfig.SOURCE_CODEC_TYPE_CELT:

                return AudioSystem.AUDIO_FORMAT_CELT;

            case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_ADAPTIVE:

                return AudioSystem.AUDIO_FORMAT_APTX_ADAPTIVE;

            default:

                Log.e(TAG, "Unknown BT codec 0x" + Integer.toHexString(btCodec)

                        + " for conversion to audio format");