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

Commit ec6c560a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: initial setup for bengal"

parents c1c974e0 de870aae

configs/bengal/audio_configs.xml

+4 −46
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
        <flag name="audio_extn_hdmi_spk_enabled" value="true" />

        <flag name="use_xml_audio_policy_conf" value="true" />

        <flag name="voice_concurrency" value="false" />

        <flag name="afe_proxy_enabled" value="true" />

        <flag name="compress_voip_enabled" value="false" />

        <flag name="fm_power_opt" value="true" />

        <flag name="record_play_concurrency" value="false" />



        <!-- AV Configs -->

        <property name="vendor.audio.use.sw.alac.decoder" value="true"/>
@@ -65,50 +69,4 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
        <flag name="qti_flac_decoder" value="true" />

        <flag name="vorbis_offload_enabled" value="true" />

        <flag name="wma_offload_enabled" value="true" />



        <!-- AHAL Configs -->

        <flag name="a2dp_offload_enabled" value="true" />

        <flag name="anc_headset_enabled" value="true" />

        <flag name="audiosphere_enabled" value="true" />

        <flag name="audio_zoom_enabled" value="false" />

        <flag name="battery_listener_enabled" value="true" />

        <flag name="compress_capture_enabled" value="false" />

        <flag name="compress_in_enabled" value="true" />

        <flag name="compress_metadata_needed" value="true" />

        <flag name="concurrent_capture_enabled" value="true" />

        <flag name="custom_stereo_enabled" value="true" />

        <flag name="display_port_enabled" value="true" />

        <flag name="dsm_feedback_enabled" value="false" />

        <flag name="dynamic_ecns_enabled" value="true" />

        <flag name="ext_hw_plugin_enabled" value="true" />

        <flag name="ext_qdsp_enabled" value="false" />

        <flag name="ext_spkr_enabled" value="false" />

        <flag name="ext_spkr_tfa_enabled" value="false" />

        <flag name="fluence_enabled" value="true" />

        <flag name="hdmi_edid_enabled" value="true" />

        <flag name="hdmi_passthrough_enabled" value="true" />

        <flag name="hfp_enabled" value="true" />

        <flag name="hifi_audio_enabled" value="false" />

        <flag name="hwdep_cal_enabled" value="false" />

        <flag name="incall_music_enabled" value="true" />

        <flag name="keep_alive_enabled" value="true" />

        <flag name="kpi_optimize_enabled" value="true" />

        <flag name="maxx_audio_enabled" value="false" />

        <flag name="receiver_aided_stereo" value="true" />

        <flag name="snd_monitor_enabled" value="true" />

        <flag name="source_track_enabled" value="true" />

        <flag name="spkr_prot_enabled" value="true" />

        <flag name="ssrec_enabled" value="true" />

        <flag name="usb_offload_burst_mode" value="true" />

        <flag name="usb_offload_enabled" value="true" />

        <flag name="usb_offload_sidetone_vol_enabled" value="false" />

        <flag name="use_deep_buffer_as_primary_output" value="false" />

        <flag name="vbat_enabled" value="true" />

        <flag name="wsa_enabled" value="false" />



        <!-- Common configs between APM and AHAL -->

        <flag name="afe_proxy_enabled" value="true" />

        <flag name="compress_voip_enabled" value="false" />

        <flag name="fm_power_opt" value="true" />

        <flag name="record_play_concurrency" value="false" />

</configs>

configs/bengal/audio_configs_stock.xml

+0 −41
Original line number Diff line number Diff line
@@ -29,45 +29,4 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-->

<configs>

        <!-- AHAL Configs -->

        <flag name="a2dp_offload_enabled" value="true" />

        <flag name="afe_proxy_enabled" value="false" />

        <flag name="anc_headset_enabled" value="false" />

        <flag name="audio_zoom_enabled" value="false" />

        <flag name="audiosphere_enabled" value="false" />

        <flag name="battery_listener_enabled" value="false" />

        <flag name="compress_capture_enabled" value="false" />

        <flag name="compress_in_enabled" value="false" />

        <flag name="compress_metadata_needed" value="false" />

        <flag name="compress_voip_enabled" value="false" />

        <flag name="concurrent_capture_enabled" value="true" />

        <flag name="custom_stereo_enabled" value="false" />

        <flag name="display_port_enabled" value="false" />

        <flag name="dsm_feedback_enabled" value="false" />

        <flag name="dynamic_ecns_enabled" value="false" />

        <flag name="ext_hw_plugin_enabled" value="false" />

        <flag name="ext_qdsp_enabled" value="true" />

        <flag name="ext_spkr_enabled" value="true" />

        <flag name="ext_spkr_tfa_enabled" value="false" />

        <flag name="fluence_enabled" value="false" />

        <flag name="fm_power_opt" value="false" />

        <flag name="hdmi_edid_enabled" value="false" />

        <flag name="hdmi_passthrough_enabled" value="false" />

        <flag name="hfp_enabled" value="true" />

        <flag name="hifi_audio_enabled" value="false" />

        <flag name="hwdep_cal_enabled" value="true" />

        <flag name="incall_music_enabled" value="true" />

        <flag name="keep_alive_enabled" value="false" />

        <flag name="kpi_optimize_enabled" value="false" />

        <flag name="receiver_aided_stereo" value="false" />

        <flag name="record_play_concurrency" value="false" />

        <flag name="snd_monitor_enabled" value="true" />

        <flag name="source_track_enabled" value="false" />

        <flag name="spkr_prot_enabled" value="true" />

        <flag name="ssrec_enabled" value="false" />

        <flag name="usb_offload_burst_mode" value="false" />

        <flag name="usb_offload_enabled" value="true" />

        <flag name="usb_offload_sidetone_vol_enabled" value="false" />

        <flag name="use_deep_buffer_as_primary_output" value="false" />

        <flag name="vbat_enabled" value="false" />

        <flag name="wsa_enabled" value="false" />

</configs>

configs/bengal/audio_policy_configuration.xml

+11 −7
Original line number Diff line number Diff line
@@ -173,6 +173,11 @@ 
                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                </mixPort>

                <mixPort name="voip_tx" role="sink"

                         flags="AUDIO_INPUT_FLAG_VOIP_TX">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>

                </mixPort>

                <mixPort name="usb_surround_sound" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000"
@@ -184,7 +189,7 @@ 
                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000"

                             channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                </mixPort>

                <mixPort name="record_24" role="sink">

                <mixPort name="record_24" role="sink" maxOpenCount="2" maxActiveCount="2">

                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,96000,192000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4"/>
@@ -258,20 +263,17 @@ 
                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

                </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 AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TW

SP">

                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP">

                    <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 AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TW

SP">

                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP">

                    <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 AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TW

SP">

                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                </devicePort>
@@ -353,6 +355,8 @@ SP"> 
                       sources="Telephony Rx"/>

                <route type="mix" sink="primary input"

                       sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,USB Device In,USB Headset In,Telephony Rx"/>

                <route type="mix" sink="voip_tx"

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>

                <route type="mix" sink="usb_surround_sound"

                       sources="USB Device In,USB Headset In"/>

                <route type="mix" sink="record_24"

configs/bengal/bengal.mk

+18 −3
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ AUDIO_FEATURE_ENABLED_USB_TUNNEL := true 
AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD := true

AUDIO_FEATURE_ENABLED_3D_AUDIO := true

AUDIO_FEATURE_ENABLED_AHAL_EXT := true

AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true

DOLBY_ENABLE := false

endif
@@ -87,7 +88,7 @@ BOARD_SUPPORTS_OPENSOURCE_STHAL := true 
AUDIO_HARDWARE := audio.a2dp.default

AUDIO_HARDWARE += audio.usb.default

AUDIO_HARDWARE += audio.r_submix.default

AUDIO_HARDWARE += audio.primary.lito

AUDIO_HARDWARE += audio.primary.bengal



#HAL Wrapper

AUDIO_WRAPPER := libqahw
@@ -348,7 +349,7 @@ vendor.audio.adm.buffering.ms=2 


#enable headset calibration

PRODUCT_PROPERTY_OVERRIDES += \

audio.volume.headset.gain.depcal=true

vendor.audio.volume.headset.gain.depcal=true



#enable dualmic fluence for voice communication

PRODUCT_PROPERTY_OVERRIDES += \
@@ -391,7 +392,7 @@ vendor.audio.feature.compr_cap.enable=false \ 
vendor.audio.feature.compress_in.enable=true \

vendor.audio.feature.compress_meta_data.enable=true \

vendor.audio.feature.compr_voip.enable=false \

vendor.audio.feature.concurrent_capture.enable=false \

vendor.audio.feature.concurrent_capture.enable=true \

vendor.audio.feature.custom_stereo.enable=true \

vendor.audio.feature.display_port.enable=true \

vendor.audio.feature.dsm_feedback.enable=false \
@@ -408,6 +409,7 @@ vendor.audio.feature.hfp.enable=true \ 
vendor.audio.feature.hifi_audio.enable=false \

vendor.audio.feature.hwdep_cal.enable=false \

vendor.audio.feature.incall_music.enable=true \

vendor.audio.feature.multi_voice_session.enable=true \

vendor.audio.feature.keep_alive.enable=true \

vendor.audio.feature.kpi_optimize.enable=true \

vendor.audio.feature.maxx_audio.enable=false \
@@ -441,6 +443,19 @@ PRODUCT_PACKAGES += \ 
    vendor.qti.hardware.audiohalext@1.0-impl \

    vendor.qti.hardware.audiohalext-utils



# enable audio hidl hal 5.0

PRODUCT_PACKAGES += \

    android.hardware.audio@5.0 \

    android.hardware.audio.common@5.0 \

    android.hardware.audio.common@5.0-util \

    android.hardware.audio@5.0-impl \

    android.hardware.audio.effect@5.0 \

    android.hardware.audio.effect@5.0-impl



# enable sound trigger hidl hal 2.2

PRODUCT_PACKAGES += \

    android.hardware.soundtrigger@2.2-impl \



PRODUCT_PACKAGES_ENG += \

    VoicePrintTest \

    VoicePrintDemo

hal/Android.mk

+1 −1
Original line number Diff line number Diff line 
ifneq ($(AUDIO_USE_STUB_HAL), true)

ifeq ($(strip $(BOARD_USES_ALSA_AUDIO)),true)



LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)
@@ -92,6 +91,7 @@ endif 
ifneq ($(filter bengal,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_BENGAL

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"

  LOCAL_CFLAGS += -DINCALL_STEREO_CAPTURE_ENABLED

endif

ifneq ($(filter atoll,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_ATOLL