dereference
/
android_hardware_qcom_audio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hal: add apptype as a part of event_value 

Add apptype as a part of event_value.

Change-Id: Ic9f33994693afafd0b1c2d5d34688be76a0c811a
This commit is contained in:
Weiyin Jiang 2019-07-08 17:31:52 +08:00
parent cdece20dd9
commit 40dcdb9b53
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hal/audio_extn/audio_extn.h
View File

@ -998,7 +998,8 @@ int audio_extn_keep_alive_set_parameters(struct audio_device *adev,
#define audio_extn_gef_init(adev) (0) #define audio_extn_gef_init(adev) (0)
#define audio_extn_gef_deinit(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 #ifndef INSTANCE_ID_ENABLED
#define audio_extn_gef_send_audio_cal(dev, acdb_dev_id, acdb_device_type,\ #define audio_extn_gef_send_audio_cal(dev, acdb_dev_id, acdb_device_type,\
@ -1030,7 +1031,7 @@ void audio_extn_gef_init(struct audio_device *adev);
void audio_extn_gef_deinit(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, 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 #ifndef INSTANCE_ID_ENABLED
int audio_extn_gef_send_audio_cal(void* adev, int acdb_dev_id, int acdb_device_type, 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, int app_type, int topology_id, int sample_rate, uint32_t module_id,

6
hal/audio_extn/gef.c
View File

@ -64,7 +64,7 @@
typedef void* (*gef_init_t)(void*); typedef void* (*gef_init_t)(void*);
typedef void (*gef_deinit_t)(void*); typedef void (*gef_deinit_t)(void*);
typedef void (*gef_device_config_cb_t)(void*, audio_devices_t, 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 { typedef struct {
void* handle; 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 //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, 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__); ALOGV("%s: Enter", __func__);
//call into GEF to share channel mask and device info //call into GEF to share channel mask and device info
if (gef_hal_handle.handle && gef_hal_handle.device_config_cb) { 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, 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__); ALOGV("%s: Exit", __func__);

3
hal/audio_hw.c
View File

@ -2707,7 +2707,8 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id)
usecase->stream.out->devices, usecase->stream.out->devices,
usecase->stream.out->channel_mask, usecase->stream.out->channel_mask,
usecase->stream.out->app_type_cfg.sample_rate, 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); audio_extn_qdsp_set_device(usecase);