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

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

Merge "hal: add apptype as a part of event_value"

parents 02ac762a 40dcdb9b

hal/audio_extn/audio_extn.h

+3 −2
Original line number Diff line number Diff line
@@ -1001,7 +1001,8 @@ int audio_extn_keep_alive_set_parameters(struct audio_device *adev, 


#define audio_extn_gef_init(adev) (0)

#define audio_extn_gef_deinit(adev) (0)

#define audio_extn_gef_notify_device_config(devices, cmask, sample_rate, acdb_id) (0)

#define audio_extn_gef_notify_device_config(devices, cmask, sample_rate, \

        acdb_id, app_type) (0)



#ifndef INSTANCE_ID_ENABLED

#define audio_extn_gef_send_audio_cal(dev, acdb_dev_id, acdb_device_type,\
@@ -1033,7 +1034,7 @@ void audio_extn_gef_init(struct audio_device *adev); 
void audio_extn_gef_deinit(struct audio_device *adev);



void audio_extn_gef_notify_device_config(audio_devices_t audio_device,

    audio_channel_mask_t channel_mask, int sample_rate, int acdb_id);

    audio_channel_mask_t channel_mask, int sample_rate, int acdb_id, int app_type);

#ifndef INSTANCE_ID_ENABLED

int audio_extn_gef_send_audio_cal(void* adev, int acdb_dev_id, int acdb_device_type,

    int app_type, int topology_id, int sample_rate, uint32_t module_id,

hal/audio_extn/gef.c

+3 −3
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
typedef void* (*gef_init_t)(void*);

typedef void (*gef_deinit_t)(void*);

typedef void (*gef_device_config_cb_t)(void*, audio_devices_t,

    audio_channel_mask_t, int, int);

    audio_channel_mask_t, int, int, int);



typedef struct {

    void* handle;
@@ -428,14 +428,14 @@ int audio_extn_gef_retrieve_audio_cal(void* dev, int acdb_dev_id, 


//this will be called from HAL to notify GEF of new device configuration

void audio_extn_gef_notify_device_config(audio_devices_t audio_device,

    audio_channel_mask_t channel_mask, int sample_rate, int acdb_id)

    audio_channel_mask_t channel_mask, int sample_rate, int acdb_id, int app_type)

{

    ALOGV("%s: Enter", __func__);



    //call into GEF to share channel mask and device info

    if (gef_hal_handle.handle && gef_hal_handle.device_config_cb) {

        gef_hal_handle.device_config_cb(gef_hal_handle.gef_ptr, audio_device, channel_mask,

            sample_rate, acdb_id);

            sample_rate, acdb_id, app_type);

    }



    ALOGV("%s: Exit", __func__);

hal/audio_hw.c

+2 −1
Original line number Diff line number Diff line
@@ -2707,7 +2707,8 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id) 
                usecase->stream.out->devices,

                usecase->stream.out->channel_mask,

                usecase->stream.out->app_type_cfg.sample_rate,

                platform_get_snd_device_acdb_id(usecase->out_snd_device));

                platform_get_snd_device_acdb_id(usecase->out_snd_device),

                usecase->stream.out->app_type_cfg.app_type);

    }



    audio_extn_qdsp_set_device(usecase);