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

Commit 99db3abd 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

Change-Id: I735a297acc4d3d4c7f8d2cc9302a13ebcf4e4c3d
CRs-Fixed: 2433041
parent e79b237d

media/java/android/media/AudioSystem.java

+5 −0
Original line number Diff line number Diff line
@@ -151,6 +151,8 @@ public class AudioSystem 
    public static final int AUDIO_FORMAT_APTX           = 0x20000000;

    public static final int AUDIO_FORMAT_APTX_HD        = 0x21000000;

    public static final int AUDIO_FORMAT_LDAC           = 0x23000000;

    public static final int AUDIO_FORMAT_CELT           = 0x26000000;

    public static final int AUDIO_FORMAT_APTX_ADAPTIVE  = 0x27000000;



    /**

     * Convert audio format enum values to Bluetooth codec values
@@ -162,6 +164,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: return BluetoothCodecConfig.SOURCE_CODEC_TYPE_INVALID;

        }

    }

services/core/java/com/android/server/audio/BtHelper.java

+4 −0
Original line number Diff line number Diff line
@@ -1005,6 +1005,10 @@ public class BtHelper { 
                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:

                return AudioSystem.AUDIO_FORMAT_DEFAULT;

        }