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

hal: ip_hdlr intf for MAT decoder 

- ip-handler interface audio extension module changes to
  handle MAT decoder security mechanism.
- ip-handler deinit after lib de-allocated.

Change-Id: I050dce82ce57597b9bf135a81516f6401abd2315
This commit is contained in:
Gangadhar S 2019-04-19 20:24:26 +05:30
parent 3ca34ba844
commit cfec66baf4
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hal/audio_extn/ip_hdlr_intf.c
View File

@ -62,8 +62,8 @@
#define ADSP_DEC_SERVICE_ID 1 #define ADSP_DEC_SERVICE_ID 1
#define ADSP_EVENT_ID_RTIC 0x00013239 #define ADSP_EVENT_ID_RTIC 0x00013239
#define ADSP_EVENT_ID_RTIC_FAIL 0x0001323A #define ADSP_EVENT_ID_RTIC_FAIL 0x0001323A
#define TRUMPET_TOPOLOGY 0x11000099 #define TRUMPET_TOPOLOGY 0x11000099
#define TRUMPET_MODULE 0x0001099A #define TRUMPET_MODULE 0x0001099A
struct lib_fd_info { struct lib_fd_info {
int32_t fd; int32_t fd;
@ -212,10 +212,12 @@ int audio_extn_ip_hdlr_copp_update_cal_info(void *cfg, void *data)
return ret; return ret;
} }
bool audio_extn_ip_hdlr_intf_supported_for_copp(void *platform) bool audio_extn_ip_hdlr_intf_supported_for_copp(void *platform)
{ {
return adm_event_enable; return adm_event_enable;
} }
bool audio_extn_ip_hdlr_intf_supported(audio_format_t format, bool audio_extn_ip_hdlr_intf_supported(audio_format_t format,
bool is_direct_passthrough, bool is_direct_passthrough,
bool is_transcode_loopback) bool is_transcode_loopback)
@ -224,28 +226,30 @@ bool audio_extn_ip_hdlr_intf_supported(audio_format_t format,
if ((format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_DOLBY_TRUEHD) { if ((format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_DOLBY_TRUEHD) {
asm_event_enable = true; asm_event_enable = true;
return true; return true;
} else if ((format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_MAT) {
asm_event_enable = true;
return true;
} else if (!is_direct_passthrough && !audio_extn_qaf_is_enabled() && } else if (!is_direct_passthrough && !audio_extn_qaf_is_enabled() &&
(((format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_E_AC3) || (((format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_E_AC3) ||
((format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_AC3))) { ((format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_AC3))) {
asm_event_enable = true; asm_event_enable = true;
return true; return true;
} else if (is_transcode_loopback && } else if (is_transcode_loopback &&
(((format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_E_AC3) || (((format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_E_AC3) ||
((format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_AC3))) { ((format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_AC3))) {
asm_event_enable = true; asm_event_enable = true;
return true; return true;
} else { } else {
asm_event_enable = false; asm_event_enable = false;
return false; return false;
}
} }
int audio_extn_ip_hdlr_intf_event_adm(void *stream_handle __unused, int audio_extn_ip_hdlr_intf_event_adm(void *stream_handle __unused,
void *payload, void *ip_hdlr_handle ) void *payload, void *ip_hdlr_handle )
{ {
ALOGVV("%s:[%d] handle = %p\n",__func__, ip_hdlr->ref_cnt, ip_hdlr_handle); ALOGVV("%s:[%d] handle = %p\n",__func__, ip_hdlr->ref_cnt, ip_hdlr_handle);
return ip_hdlr->event_adm(ip_hdlr_handle, payload); return ip_hdlr->event_adm(ip_hdlr_handle, payload);
} }
int audio_extn_ip_hdlr_intf_event(void *stream_handle __unused, void *payload, void *ip_hdlr_handle ) int audio_extn_ip_hdlr_intf_event(void *stream_handle __unused, void *payload, void *ip_hdlr_handle )
@ -887,9 +891,6 @@ int audio_extn_ip_hdlr_intf_deinit(void *handle)
return -EINVAL; return -EINVAL;
} }
ALOGD("%s:[%d] handle = %p",__func__, ip_hdlr->ref_cnt, handle); ALOGD("%s:[%d] handle = %p",__func__, ip_hdlr->ref_cnt, handle);
ret = ip_hdlr->deinit(handle);
if (ret < 0)
ALOGE("%s:[%d] deinit failed ret = %d", __func__, ip_hdlr->ref_cnt, ret);
if (--ip_hdlr->ref_cnt == 0) { if (--ip_hdlr->ref_cnt == 0) {
ip_hdlr->get_lib_fd(handle, &lib_fd.fd); ip_hdlr->get_lib_fd(handle, &lib_fd.fd);
@ -917,8 +918,11 @@ int audio_extn_ip_hdlr_intf_deinit(void *handle)
goto dlclose; goto dlclose;
} }
ret = ip_hdlr->deinit_lib(ip_hdlr->ip_lib_handle); ret = ip_hdlr->deinit_lib(handle);
ip_hdlr->lib_fd_created = false; ip_hdlr->lib_fd_created = false;
ret = ip_hdlr->deinit(handle);
if (ret < 0)
ALOGE("%s:[%d] deinit failed ret = %d", __func__, ip_hdlr->ref_cnt, ret);
if (ip_hdlr->lib_hdl) if (ip_hdlr->lib_hdl)
dlclose(ip_hdlr->lib_hdl); dlclose(ip_hdlr->lib_hdl);
dlclose: dlclose: