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

Commit 41947e20 authored by Nicholas Ambur's avatar Nicholas Ambur
Browse files

add SoundTrigger HAL V2.3 support 

add support for model parameter control APIs with THRESHOLD_FACTOR
as the first supported parameter

Bug: 141929369
Test: Tested manually with test app and confirmed with GTS test
gts-tradefed run gts-dev -m GtsAssistIntentTestCases
Change-Id: I613dfe7486b4b4b695c79bda515b9f07fe750a70
parent 994f9e9d

include/soundtrigger/ISoundTrigger.h

+7 −1
Original line number Diff line number Diff line
@@ -41,7 +41,13 @@ public: 
                                      const sp<IMemory>& dataMemory) = 0;

    virtual status_t stopRecognition(sound_model_handle_t handle) = 0;

    virtual status_t getModelState(sound_model_handle_t handle) = 0;



    virtual status_t setParameter(sound_model_handle_t handle,

            sound_trigger_model_parameter_t param, int32_t value) = 0;

    virtual status_t getParameter(sound_model_handle_t handle,

            sound_trigger_model_parameter_t param, int32_t* value) = 0;

    virtual status_t queryParameter(sound_model_handle_t handle,

            sound_trigger_model_parameter_t param,

            sound_trigger_model_parameter_range_t* param_range) = 0;

};



// ----------------------------------------------------------------------------

include/soundtrigger/SoundTrigger.h

+7 −0
Original line number Diff line number Diff line
@@ -55,6 +55,13 @@ public: 
            status_t startRecognition(sound_model_handle_t handle, const sp<IMemory>& dataMemory);

            status_t stopRecognition(sound_model_handle_t handle);

            status_t getModelState(sound_model_handle_t handle);

            status_t setParameter(sound_model_handle_t handle,

                    sound_trigger_model_parameter_t param, int32_t value);

            status_t getParameter(sound_model_handle_t handle,

                    sound_trigger_model_parameter_t param, int32_t* value);

            status_t queryParameter(sound_model_handle_t handle,

                    sound_trigger_model_parameter_t param,

                    sound_trigger_model_parameter_range_t* param_range);



            // BpSoundTriggerClient

            virtual void onRecognitionEvent(const sp<IMemory>& eventMemory);

services/soundtrigger/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ cc_library_shared { 
        "android.hardware.soundtrigger@2.0",

        "android.hardware.soundtrigger@2.1",

        "android.hardware.soundtrigger@2.2",

        "android.hardware.soundtrigger@2.3",

        "android.hardware.audio.common@2.0",

        "android.hidl.allocator@1.0",

        "android.hidl.memory@1.0",

services/soundtrigger/SoundTriggerHalHidl.cpp

+160 −0
Original line number Diff line number Diff line
@@ -427,6 +427,146 @@ int SoundTriggerHalHidl::getModelState(sound_model_handle_t handle) 
    return ret;

}



int SoundTriggerHalHidl::setParameter(sound_model_handle_t handle,

                                sound_trigger_model_parameter_t model_param, int32_t value)

{

    sp<ISoundTriggerHw> soundtrigger = getService();

    if (!soundtrigger) {

        return -ENODEV;

    }



    sp<V2_3_ISoundTriggerHw> soundtrigger_2_3 = toService2_3(soundtrigger);

    if (!soundtrigger_2_3) {

        ALOGE("setParameter not supported");

        return -ENOSYS;

    }



    sp<SoundModel> model = getModel(handle);

    if (!model) {

        ALOGE("setParameter model not found for handle %u", handle);

        return -EINVAL;

    }



    V2_3_ModelParameter halParam;

    convertModelParameterToHal(&halParam, model_param);



    Return<int32_t> hidlReturn(0);

    {

        AutoMutex lock(mHalLock);

        hidlReturn = soundtrigger_2_3->setParameter(model->mHalHandle, halParam, value);

    }

    if (!hidlReturn.isOk()) {

        ALOGE("getModelState error %s", hidlReturn.description().c_str());

        return FAILED_TRANSACTION;

    }



    return hidlReturn;

}



int SoundTriggerHalHidl::getParameter(sound_model_handle_t handle,

                                sound_trigger_model_parameter_t model_param, int32_t* value)

{

    sp<ISoundTriggerHw> soundtrigger = getService();

    if (!soundtrigger) {

        return -ENODEV;

    }



    sp<V2_3_ISoundTriggerHw> soundtrigger_2_3 = toService2_3(soundtrigger);

    if (!soundtrigger_2_3) {

        ALOGE("getParameter not supported");

        return -ENOSYS;

    }



    if (value == NULL) {

        ALOGE("getParameter invalid value pointer");

        return -EINVAL;

    }



    sp<SoundModel> model = getModel(handle);

    if (!model) {

        ALOGE("getParameter model not found for handle %u", handle);

        return -EINVAL;

    }



    V2_3_ModelParameter halParam;

    convertModelParameterToHal(&halParam, model_param);



    Return<void> hidlReturn;

    int32_t hidlStatus;

    int32_t hidlValue;

    {

        AutoMutex lock(mHalLock);

        hidlReturn = soundtrigger_2_3->getParameter(model->mHalHandle, halParam,

            [&](int32_t retStatus, int32_t retValue) {

                hidlStatus = retStatus;

                hidlValue = retValue;

            });

    }

    if (!hidlReturn.isOk()) {

        ALOGE("getModelState error %s", hidlReturn.description().c_str());

        return FAILED_TRANSACTION;

    }



    *value = hidlValue;

    return hidlStatus;

}



int SoundTriggerHalHidl::queryParameter(sound_model_handle_t handle,

                    sound_trigger_model_parameter_t model_param,

                    sound_trigger_model_parameter_range_t* param_range)

{

    sp<ISoundTriggerHw> soundtrigger = getService();

    if (!soundtrigger) {

        return -ENODEV;

    }



    sp<V2_3_ISoundTriggerHw> soundtrigger_2_3 = toService2_3(soundtrigger);

    if (!soundtrigger_2_3) {

        ALOGE("queryParameter not supported");

        return -ENOSYS;

    }



    sp<SoundModel> model = getModel(handle);

    if (!model) {

        ALOGE("queryParameter model not found for handle %u", handle);

        return -EINVAL;

    }



    V2_3_ModelParameter halParam;

    convertModelParameterToHal(&halParam, model_param);



    Return<void> hidlReturn;

    int32_t hidlStatus;

    V2_3_OptionalModelParameterRange hidlValue;

    {

        AutoMutex lock(mHalLock);

        hidlReturn = soundtrigger_2_3->queryParameter(model->mHalHandle, halParam,

            [&](int32_t retStatus, V2_3_OptionalModelParameterRange retValue) {

                hidlStatus = retStatus;

                hidlValue = retValue;

            });

    }

    if (!hidlReturn.isOk()) {

        ALOGE("queryParameter error %s", hidlReturn.description().c_str());

        return FAILED_TRANSACTION;

    }



    if (hidlStatus != 0) {

        ALOGE("queryParameter error code: %d", hidlStatus);

        return hidlStatus;

    }



    if (hidlValue.getDiscriminator() ==

            V2_3_OptionalModelParameterRange::hidl_discriminator::noinit) {

        return -1;

    }



    param_range->start = hidlValue.range().start;

    param_range->end = hidlValue.range().end;



    return 0;

}



SoundTriggerHalHidl::SoundTriggerHalHidl(const char *moduleName)

    : mModuleName(moduleName), mNextUniqueId(1)

{
@@ -465,6 +605,12 @@ sp<V2_2_ISoundTriggerHw> SoundTriggerHalHidl::toService2_2(const sp<ISoundTrigge 
    return castResult_2_2.isOk() ? static_cast<sp<V2_2_ISoundTriggerHw>>(castResult_2_2) : nullptr;

}



sp<V2_3_ISoundTriggerHw> SoundTriggerHalHidl::toService2_3(const sp<ISoundTriggerHw>& s)

{

    auto castResult_3_0 = V2_3_ISoundTriggerHw::castFrom(s);

    return castResult_3_0.isOk() ? static_cast<sp<V2_3_ISoundTriggerHw>>(castResult_3_0) : nullptr;

}



sp<SoundTriggerHalHidl::SoundModel> SoundTriggerHalHidl::getModel(sound_model_handle_t handle)

{

    AutoMutex lock(mLock);
@@ -526,6 +672,20 @@ void SoundTriggerHalHidl::convertPropertiesFromHal( 
    properties->power_consumption_mw = halProperties->powerConsumptionMw;

}



// static

void SoundTriggerHalHidl::convertModelParameterToHal(V2_3_ModelParameter* halParam,

    sound_trigger_model_parameter_t param)

{

    switch (param) {

        case MODEL_PARAMETER_THRESHOLD_FACTOR:

            *halParam = V2_3_ModelParameter::THRESHOLD_FACTOR;

            return;

        case MODEL_PARAMETER_INVALID:

        default:

            *halParam = V2_3_ModelParameter::INVALID;

    }

}



void SoundTriggerHalHidl::convertTriggerPhraseToHal(

        ISoundTriggerHw::Phrase *halTriggerPhrase,

        const struct sound_trigger_phrase *triggerPhrase)

services/soundtrigger/SoundTriggerHalHidl.h

+39 −0
Original line number Diff line number Diff line
@@ -26,8 +26,10 @@ 
#include <utils/threads.h>

#include "SoundTriggerHalInterface.h"

#include <android/hardware/soundtrigger/2.0/types.h>

#include <android/hardware/soundtrigger/2.3/types.h>

#include <android/hardware/soundtrigger/2.1/ISoundTriggerHw.h>

#include <android/hardware/soundtrigger/2.2/ISoundTriggerHw.h>

#include <android/hardware/soundtrigger/2.3/ISoundTriggerHw.h>

#include <android/hardware/soundtrigger/2.0/ISoundTriggerHwCallback.h>

#include <android/hardware/soundtrigger/2.1/ISoundTriggerHwCallback.h>
@@ -49,6 +51,12 @@ using V2_1_ISoundTriggerHwCallback = 
using ::android::hidl::memory::V1_0::IMemory;

using V2_2_ISoundTriggerHw =

        ::android::hardware::soundtrigger::V2_2::ISoundTriggerHw;

using V2_3_ISoundTriggerHw =

        ::android::hardware::soundtrigger::V2_3::ISoundTriggerHw;

using V2_3_ModelParameter =

        ::android::hardware::soundtrigger::V2_3::ModelParameter;

using V2_3_OptionalModelParameterRange =

        ::android::hardware::soundtrigger::V2_3::OptionalModelParameterRange;



class SoundTriggerHalHidl : public SoundTriggerHalInterface,

                            public virtual V2_1_ISoundTriggerHwCallback
@@ -103,6 +111,34 @@ public: 
         */

        virtual int getModelState(sound_model_handle_t handle);



        /* Set a model specific ModelParameter with the given value. This parameter

         * will keep its value for the duration the model is loaded regardless of starting and

         * stopping recognition. Once the model is unloaded, the value will be lost.

         * Returns 0 or an error code.

         * Only supported for device api versions SOUND_TRIGGER_DEVICE_API_VERSION_1_3 or above.

         */

        int setParameter(sound_model_handle_t handle,

                         sound_trigger_model_parameter_t model_param, int32_t value);



        /* Get a model specific ModelParameter. This parameter will keep its value

         * for the duration the model is loaded regardless of starting and stopping recognition.

         * Once the model is unloaded, the value will be lost. If the value is not set, a default

         * value is returned. See sound_trigger_model_parameter_t for parameter default values.

         * Returns 0 or an error code.  On return 0, value pointer will be set.

         * Only supported for device api versions SOUND_TRIGGER_DEVICE_API_VERSION_1_3 or above.

         */

        int getParameter(sound_model_handle_t handle,

                         sound_trigger_model_parameter_t model_param, int32_t* value);



        /* Get supported parameter attributes with respect to the provided model

         * handle. Along with determining the valid range, this API is also used

         * to determine if a given parameter ID is supported at all by the

         * modelHandle for use with getParameter and setParameter APIs.

         */

        int queryParameter(sound_model_handle_t handle,

                            sound_trigger_model_parameter_t model_param,

                            sound_trigger_model_parameter_range_t* param_range);



        // ISoundTriggerHwCallback

        virtual ::android::hardware::Return<void> recognitionCallback(

                const V2_0_ISoundTriggerHwCallback::RecognitionEvent& event, CallbackCookie cookie);
@@ -147,6 +183,8 @@ private: 
        void convertPropertiesFromHal(

                struct sound_trigger_properties *properties,

                const ISoundTriggerHw::Properties *halProperties);

        static void convertModelParameterToHal(V2_3_ModelParameter* halParam,

                sound_trigger_model_parameter_t param);



        void convertTriggerPhraseToHal(

                ISoundTriggerHw::Phrase *halTriggerPhrase,
@@ -194,6 +232,7 @@ private: 
        sp<ISoundTriggerHw> getService();

        sp<V2_1_ISoundTriggerHw> toService2_1(const sp<ISoundTriggerHw>& s);

        sp<V2_2_ISoundTriggerHw> toService2_2(const sp<ISoundTriggerHw>& s);

        sp<V2_3_ISoundTriggerHw> toService2_3(const sp<ISoundTriggerHw>& s);

        sp<SoundModel> getModel(sound_model_handle_t handle);

        sp<SoundModel> removeModel(sound_model_handle_t handle);