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

Commit 0e4474c7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "configs: Update for voice UI package 3.0" into audio-hal.lnx.5.0

parents b6d52cc7 299ea1f2

configs/msmnile/sound_trigger_platform_info.xml

+139 −16
Original line number Diff line number Diff line
@@ -55,11 +55,14 @@ 
        <param DEVICE_HANDSET_QMIC_APE="137" />

        <param DEVICE_HEADSET_MIC_CPE="139" />

        <param DEVICE_HANDSET_DMIC_APE="149" />

        <param DEVICE_HANDSET_DMIC_CPE="153" />

        <param DEVICE_HANDSET_DMIC_CPE="148" />

    </acdb_ids>



    <!-- Multiple sound_model_config tags can be listed, each with unique   -->

    <!-- vendor_uuid. The below tag represents QTI SVA engine sound model   -->

    <!-- configuration. ISV must use their own unique vendor_uuid.          -->



    <!-- QTI SVA -->

    <sound_model_config>

        <param vendor_uuid="68ab2d40-e860-11e3-95ef-0002a5d5c51b" />

        <param execution_type="WDSP" /> <!-- value: "WDSP" "ADSP" "DYNAMIC" -->
@@ -82,26 +85,67 @@ 
        <!-- wdsp_fluence_type: fluence disabled: "NONE" -->

        <!-- fluence enabled: "FLUENCE_DMIC", "FLUENCE_TMIC", "FLUENCE_QMIC" -->

        <param wdsp_fluence_type="NONE" />

        <arm_ss_usecase>

            <!-- Options are "KEYWORD_DETECTION", "USER_VERIFICATION", "CUSTOM_DETECTION"  -->

            <param sm_detection_type= "KEYWORD_DETECTION" />

            <param sm_id="0x2" />

            <param module_lib="libcapiv2svacnn.so"/>

            <param sample_rate="16000"/>

            <param bit_wdith="16"/>

            <param channel_count="1"/>

        </arm_ss_usecase>

        <arm_ss_usecase>

            <param sm_detection_type= "USER_VERIFICATION" />

            <param sm_id="0x4" />

            <param module_lib="libcapiv2vop.so"/>

            <param sample_rate="16000"/>

            <param bit_wdith="16"/>

            <param channel_count="1"/>

        </arm_ss_usecase>

        <gcs_usecase>

            <param uid="0x1" />

            <param acdb_devices="DEVICE_HANDSET_MIC_CPE, DEVICE_HANDSET_TMIC_CPE, DEVICE_HEADSET_MIC_CPE" />

            <!-- module_id, instance_id, param_id -->

            <param load_sound_model_ids="0x00012C0D, 0x2, 0x00012C14" />

            <param confidence_levels_ids="0x00012C0D, 0x2, 0x00012C28" />

            <param detection_event_ids="0x00012C0D, 0x2, 0x00012C29" />

            <param detection_event_ids="0x00012C0D, 0x2, 0x00012B05" />

            <param read_cmd_ids="0x00020013, 0x2, 0x00020015" />

            <param read_rsp_ids="0x00020013, 0x2, 0x00020016" />

            <param custom_config_ids="0x00012C0D, 0x2, 0x00012C20" />

            <param det_event_type_ids="0x00012C0D, 0x2, 0x00012C2A" />

        </gcs_usecase>

        <gcs_usecase>

            <param uid="0x2" />

            <param acdb_devices="DEVICE_HANDSET_MIC_CPE, DEVICE_HANDSET_TMIC_CPE, DEVICE_HEADSET_MIC_CPE" />

            <param load_sound_model_ids="0x00012C0D, 0x3, 0x00012C14" />

            <param confidence_levels_ids="0x00012C0D, 0x3, 0x00012C28" />

            <param detection_event_ids="0x00012C0D, 0x3, 0x00012C29" />

            <param detection_event_ids="0x00012C0D, 0x3, 0x00012B05" />

            <param read_cmd_ids="0x00020013, 0x3, 0x00020015" />

            <param read_rsp_ids="0x00020013, 0x3, 0x00020016" />

            <param custom_config_ids="0x00012C0D, 0x3, 0x00012C20" />

            <param det_event_type_ids="0x00012C0D, 0x3, 0x00012C2A" />

        </gcs_usecase>

        <gcs_usecase>

            <param uid="0x7" />

            <param acdb_devices="DEVICE_HANDSET_DMIC_CPE" />

            <param load_sound_model_ids="0x00012C0D, 0x7, 0x00012C14" />

            <param confidence_levels_ids="0x00012C0D, 0x7, 0x00012C28" />

            <param detection_event_ids="0x00012C0D, 0x7, 0x00012B05" />

            <param read_cmd_ids="0x00020013, 0x7, 0x00020015" />

            <param read_rsp_ids="0x00020013, 0x7, 0x00020016" />

            <param custom_config_ids="0x00012C0D, 0x7, 0x00012C20" />

            <param det_event_type_ids="0x00012C0D, 0x7, 0x00012C2A" />

        </gcs_usecase>

        <gcs_usecase>

            <param uid="0x8" />

            <param acdb_devices="DEVICE_HANDSET_DMIC_CPE" />

            <param load_sound_model_ids="0x00012C0D, 0x8, 0x00012C14" />

            <param confidence_levels_ids="0x00012C0D, 0x8, 0x00012C28" />

            <param detection_event_ids="0x00012C0D, 0x8, 0x00012B05" />

            <param read_cmd_ids="0x00020013, 0x8, 0x00020015" />

            <param read_rsp_ids="0x00020013, 0x8, 0x00020016" />

            <param custom_config_ids="0x00012C0D, 0x8, 0x00012C20" />

            <param det_event_type_ids="0x00012C0D, 0x8, 0x00012C2A" />

        </gcs_usecase>

        <!-- Module and param ids with which the algorithm is integrated

            in non-graphite firmware (note these must come after gcs params)
@@ -134,7 +178,63 @@ 
        <param client_capture_read_delay="2000" />

    </sound_model_config>



<!-- Sound model config for Hotword !-->

    <!-- QTI Music Detection !-->

    <sound_model_config>

        <param vendor_uuid="876c1b46-9d4d-40cc-a4fd-4d5ec7a80e47" />

        <param execution_type="WDSP" /> <!-- value: "WDSP" "ADSP" "DYNAMIC" -->

        <param app_type="4" /> <!-- app type for MD used in ACDB -->

        <param library="libsmwrapper.so" />

        <param max_cpe_phrases="1" />

        <param max_cpe_users="1" />

        <param max_ape_phrases="1" />

        <param max_ape_users="1" />

        <!-- Profile specific data which the algorithm can support -->

        <param sample_rate="16000" />

        <param bit_width="16" />

        <param channel_count="1"/>

        <!-- adm_cfg_profile should match with the one defined under adm_config -->

        <!-- Set it to NONE if LSM directly connects to AFE -->

        <param adm_cfg_profile="NONE" />

        <!-- fluence_type: "FLUENCE", "FLUENCE_DMIC", "FLUENCE_TMIC", -->

        <!-- "FLUENCE_QMIC". param value is valid when adm_cfg_profile="FLUENCE"-->

        <param fluence_type="FLUENCE_DMIC" />

        <!-- wdsp_fluence_type: fluence disabled: "NONE" -->

        <!-- fluence enabled: "FLUENCE_DMIC", "FLUENCE_TMIC", "FLUENCE_QMIC" -->

        <param wdsp_fluence_type="NONE" />

        <gcs_usecase>

            <param uid="0x5" />

            <param acdb_devices="DEVICE_HANDSET_MIC_CPE, DEVICE_HANDSET_TMIC_CPE, DEVICE_HEADSET_MIC_CPE" />

            <!-- module_id, instance_id, param_id -->

            <param load_sound_model_ids="0x00012C2E, 0x6, 0x00012C14" />

            <param confidence_levels_ids="0x00012C2E, 0x6, 0x00012C28" />

            <param detection_event_ids="0x00012C2E, 0x6, 0x00012B05" />

            <param read_cmd_ids="0x00020013, 0x6, 0x00020015" />

            <param read_rsp_ids="0x00020013, 0x6, 0x00020016" />

            <param custom_config_ids="0x00012C2E, 0x6, 0x00012C2D" />

            <param det_event_type_ids="0x00012C2E, 0x6, 0x00012C2C" />

        </gcs_usecase>

        <!-- Module and param ids with which the algorithm is integrated

            in non-graphite firmware (note these must come after gcs params)

            Extends flexibility to have different ids based on execution type.

            valid execution_type values: only "ADSP" -->

        <lsm_usecase>

            <param execution_mode="ADSP" />

            <param load_sound_model_ids="0x00012C22, 0x00012C14" />

            <param unload_sound_model_ids="0x00012C22, 0x00012C15" />

            <param confidence_levels_ids="0x00012C22, 0x00012C07" />

            <param det_event_type_ids="0x00012C22, 0x00012C2C" />

            <param custom_config_ids="0x00012C22, 0x00012C30" />

        </lsm_usecase>



        <!-- format: "ADPCM_packet" or "PCM_packet" !-->

        <!-- transfer_mode: "FTRT" or "RT" -->

        <!--  kw_duration is in milli seconds. It is valid only for FTRT

            transfer mode -->

        <param capture_keyword="PCM_packet, FTRT, 1500" />

        <param client_capture_read_delay="2000" />

    </sound_model_config>



    <!-- Google Hotword -->

    <sound_model_config>

        <param vendor_uuid="7038ddc8-30f2-11e6-b0ac-40a8f03d3f15" />

        <param execution_type="WDSP" /> <!-- value: "WDSP" "ADSP" "DYNAMIC" -->
@@ -151,36 +251,35 @@ 
        <!-- adm_cfg_profile should match with the one defined under adm_config -->

        <!-- Set it to NONE if LSM directly connects to AFE -->

        <param adm_cfg_profile="NONE" />

        <!-- fluence_type: "FLUENCE", "FLUENCE_DMIC", "FLUENCE_TMIC", -->

        <!-- fluence_type: "FLUENCE", "FLUENCE_DMIC" -->

        <!-- "FLUENCE_QMIC". param value is valid when adm_cfg_profile="FLUENCE"-->

        <param fluence_type="FLUENCE_DMIC" />

        <!-- wdsp_fluence_type: fluence disabled: "NONE" -->

        <!-- fluence enabled: "FLUENCE_DMIC", "FLUENCE_TMIC", "FLUENCE_QMIC" -->

        <!-- fluence enabled: "FLUENCE_DMIC", "FLUENCE_QMIC" -->

        <param wdsp_fluence_type="NONE" />

        <gcs_usecase>

            <param uid="0x3" />

            <param acdb_devices="DEVICE_HANDSET_MIC_CPE, DEVICE_HANDSET_TMIC_CPE" />

            <param load_sound_model_ids="0x18000001, 0x4, 0x00012C14" />

            <param acdb_devices="DEVICE_HANDSET_MIC_CPE" />

            <param load_sound_model_ids="0x18000001, 0x4, 0x18000100" />

            <param start_engine_ids="0x18000001, 0x4, 0x18000101" />

            <param confidence_levels_ids="0x18000001, 0x4, 0x00012C28" />

            <param detection_event_ids="0x18000001, 0x4, 0x00012C29" />

            <param custom_config_ids="0x18000001, 0x4, 0x00012C20" />

            <param read_cmd_ids="0x00020013, 0x4, 0x00020015" />

            <param read_rsp_ids="0x00020013, 0x4, 0x00020016" />

            <param custom_config_ids="0x18000001, 0x4, 0x00012C20" />

        </gcs_usecase>

        <gcs_usecase>

            <param uid="0x4" />

            <param acdb_devices="DEVICE_HANDSET_DMIC_CPE" />

            <param load_sound_model_ids="0x18000001, 0x5, 0x00012C14" />

            <param load_sound_model_ids="0x18000001, 0x5, 0x18000100" />

            <param start_engine_ids="0x18000001, 0x5, 0x18000101" />

            <param confidence_levels_ids="0x18000001, 0x5, 0x00012C28" />

            <param detection_event_ids="0x18000001, 0x5, 0x00012C29" />

            <param custom_config_ids="0x18000001, 0x5, 0x00012C20" />

            <param read_cmd_ids="0x00020013, 0x5, 0x00020015" />

            <param read_rsp_ids="0x00020013, 0x5, 0x00020016" />

            <param custom_config_ids="0x18000001, 0x5, 0x00012C20" />

        </gcs_usecase>

        <!-- Module and param ids with which the algorithm is integrated

            in non-graphite firmware (note these must come after gcs params)

            Extends flexibility to have different ids based on execution type.

            valid execution_type values: "WDSP" "ADSP" -->



        <lsm_usecase>

            <param execution_mode="ADSP" />

            <param load_sound_model_ids="0x18000001, 0x00012C14" />
@@ -204,7 +303,31 @@ 
        <!-- transfer_mode: "FTRT" or "RT" -->

        <!--  kw_duration is in milli seconds. It is valid only for FTRT

            transfer mode -->

        <param capture_keyword="PCM_packet, RT, 2000" />

        <param capture_keyword="PCM_raw, FTRT, 2000" />

        <param client_capture_read_delay="2000" />

    </sound_model_config>



    <!-- Google Music Detection -->

    <sound_model_config>

        <param vendor_uuid="9f6ad62a-1f0b-11e7-87c5-40a8f03d3f15" />

        <param execution_type="WDSP" /> <!-- value: "WDSP" "ADSP" "DYNAMIC" -->

        <param library="none" />

        <!-- fluence enabled: "FLUENCE_DMIC", "FLUENCE_QMIC" -->

        <param wdsp_fluence_type="NONE" />

        <gcs_usecase>

            <param uid="0x6" />

            <param acdb_devices="DEVICE_HANDSET_MIC_CPE" />

            <param load_sound_model_ids="0x18000001, 0x4, 0x18000102" />

            <param start_engine_ids="0x18000001, 0x4, 0x18000103" />

            <param confidence_levels_ids="0x18000001, 0x4, 0x00012C28" />

            <param detection_event_ids="0x18000001, 0x4, 0x00012C29" />

            <param custom_config_ids="0x18000001, 0x4, 0x00012C20" />

            <param read_cmd_ids="0x00020013, 0x7, 0x00020015" />

            <param read_rsp_ids="0x00020013, 0x7, 0x00020016" />

        </gcs_usecase>

        <!--  kw_duration is in milli seconds. It is valid only for FTRT

            transfer mode -->

        <param capture_keyword="MULAW_raw, FTRT, 5000" />

        <param client_capture_read_delay="2000" />

    </sound_model_config>

configs/sdm845/sound_trigger_platform_info.xml

+17 −0
Original line number Diff line number Diff line
@@ -81,6 +81,23 @@ 
        <!-- wdsp_fluence_type: fluence disabled: "NONE" -->

        <!-- fluence enabled: "FLUENCE_DMIC", "FLUENCE_TMIC", "FLUENCE_QMIC" -->

        <param wdsp_fluence_type="NONE" />

        <arm_ss_usecase>

            <!-- Options are "KEYWORD_DETECTION", "USER_VERIFICATION", "CUSTOM_DETECTION"  -->

            <param sm_detection_type= "KEYWORD_DETECTION" />

            <param sm_id="0x2" />

            <param module_lib="libcapiv2svacnn.so"/>

            <param sample_rate="16000"/>

            <param bit_wdith="16"/>

            <param channel_count="1"/>

        </arm_ss_usecase>

        <arm_ss_usecase>

            <param sm_detection_type= "USER_VERIFICATION" />

            <param sm_id="0x4" />

            <param module_lib="libcapiv2vop.so"/>

            <param sample_rate="16000"/>

            <param bit_wdith="16"/>

            <param channel_count="1"/>

        </arm_ss_usecase>

        <gcs_usecase>

            <param uid="0x1" />

            <param acdb_devices="DEVICE_HANDSET_MIC_CPE, DEVICE_HANDSET_TMIC_CPE, DEVICE_HEADSET_MIC_CPE" />