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

Commit 2030ab6c authored by Rohit Sekhar's avatar Rohit Sekhar
Browse files

FP4: Drop aptX support 

* Since:
  1. Stock A12 has it broken
  2. We don't want to move back to A11 NON-HLOS firmware to fix this.

* This also reverts commit efe08e06.
parent aaf2ee7c

audio/audio_policy_configuration.xml

+3 −3
Original line number Diff line number Diff line
@@ -258,17 +258,17 @@ 
                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>

                </devicePort>

                <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"

                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC">

                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_LDAC">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </devicePort>

                <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"

                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC">

                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_LDAC">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </devicePort>

                <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"

                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC">

                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_LDAC">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </devicePort>

proprietary-files.txt

+0 −8
Original line number Diff line number Diff line
@@ -34,10 +34,6 @@ vendor/lib/rfsa/adsp/libsns_low_lat_stream_skel.so 
vendor/lib64/rfsa/adsp/libsns_device_mode_skel.so

vendor/lib64/rfsa/adsp/libsns_low_lat_stream_skel.so



# ADSP modules (aptX)

vendor/lib/rfsa/adsp/capi_v2_aptX_CLHDADV_Encoder.so

vendor/lib/rfsa/adsp/capi_v2_aptX_CLHDAD_Speech_Decoder.so



# Audio

vendor/lib/libacdb-fts.so

vendor/lib/libacdbloader.so
@@ -84,10 +80,6 @@ vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so 
vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so

vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so



# Bluetooth (aptX) - from crosshatch - RQ1A.201205.003

system_ext/lib64/libaptX_encoder.so|df1c89d7af1bb35808d5fe3496b04ba066c10cbc

system_ext/lib64/libaptXHD_encoder.so|e13fa70c97caaa24d061678bdee608eb8850a69e



# Camera

vendor/lib/libswvdec.so

vendor/lib64/camera/com.qti.eeprom.gt24p128ef_imx576.so

vendor.prop

+2 −2
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ vendor.audio_hal.period_size=192 
vendor.voice.path.for.pcm.voip=true



# Bluetooth

persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac

persist.bluetooth.a2dp_offload.cap=sbc-aac-ldac

persist.bluetooth.a2dp_offload.disabled=false

persist.sys.fflag.override.settings_bluetooth_hearing_aid=true

persist.vendor.bt.a2dp_offload_cap=sbc-aac-aptx-aptxhd-ldac

persist.vendor.bt.a2dp_offload_cap=sbc-aac-ldac

persist.vendor.bt.aac_frm_ctl.enabled=true

persist.vendor.bt.aac_vbr_frm_ctl.enabled=true

persist.vendor.qcom.bluetooth.scram.enabled=true