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

Commit b4209b45 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge a540c990 on remote branch 

Change-Id: I48f5ffab0d635355eff238c2829625bd90b3b202
parents 7153b84b a540c990

configs/sdm660/sound_trigger_platform_info.xml

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!--- Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.       -->

<!--- Copyright (c) 2013-2017, 2021 The Linux Foundation. All rights reserved.       -->

<!---                                                                           -->

<!--- Redistribution and use in source and binary forms, with or without        -->

<!--- modification, are permitted provided that the following conditions are    -->
@@ -51,6 +51,7 @@ 
    <sound_model_config>

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

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

        <param second_stage_supported="false" />

        <param app_type="2" /> <!-- app type used in ACDB -->

        <param library="libsmwrapper.so" />

        <param max_cpe_phrases="6" />

hal/audio_extn/a2dp.c

+11 −1
Original line number Diff line number Diff line
@@ -992,6 +992,8 @@ static void open_a2dp_source() { 
                ALOGE("Failed to open source stream for a2dp: status %d", ret);

            }

            a2dp.bt_state_source = A2DP_STATE_CONNECTED;

            if (!a2dp.adev->bt_sco_on)

                a2dp.a2dp_source_suspended = false;

        } else {

            ALOGD("Called a2dp open with improper state %d", a2dp.bt_state_source);

        }
@@ -1088,6 +1090,7 @@ static int close_a2dp_output() 
    }

    a2dp.a2dp_source_started = false;

    a2dp.a2dp_source_total_active_session_requests = 0;

    if (!a2dp.adev->bt_sco_on)

        a2dp.a2dp_source_suspended = false;

    a2dp.bt_encoder_format = CODEC_TYPE_INVALID;

    a2dp.enc_sampling_rate = 48000;
@@ -2946,6 +2949,13 @@ int a2dp_set_parameters(struct str_parms *parms, bool *reconfig) 
        goto param_handled;

    }



    ret = str_parms_get_str(parms, "BT_SCO", value, sizeof(value));

    if (ret >= 0) {

        if (strcmp(value, AUDIO_PARAMETER_VALUE_ON) == 0) {

            a2dp.a2dp_source_suspended = true;

        }

    }



param_handled:

    ALOGV("end of a2dp setparam");

    return status;

hal/audio_extn/soundtrigger.c

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ exit: 
            in->is_st_session_active = false;

        memset(buffer, 0, bytes);

        ALOGV("%s: read failed status %d - sleep", __func__, ret);

        usleep((bytes * 1000000) / (audio_stream_in_frame_size((struct audio_stream_in *)in) *

        usleep(((useconds_t)bytes * 1000000) / (audio_stream_in_frame_size((struct audio_stream_in *)in) *

                                   in->config.rate));

    }

    return ret;