samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dsp: Handle media fmt update events

Browse Source 
Handle media format update events from ADSP in case of DSP loopback.

Change-Id: I4004759cc77a05f46106d359417f97f0326af19d
Signed-off-by: Ralf Herz <rherz@codeaurora.org>
This commit is contained in:
Ralf Herz
2018-11-26 14:59:40 +01:00
committed by Gerrit - the friendly Code Review server
parent 4bbc917e03
commit fba2a8270a
2 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
dsp/q6asm.c
View File

@@ -2342,10 +2342,13 @@ static int32_t q6asm_callback(struct apr_client_data *data, void *priv)
break;
case ASM_STREAM_PP_EVENT:
case ASM_STREAM_CMD_ENCDEC_EVENTS:
case ASM_STREAM_CMD_REGISTER_IEC_61937_FMT_UPDATE:
case ASM_IEC_61937_MEDIA_FMT_EVENT:
if (data->payload_size >= 2 * sizeof(uint32_t))
pr_debug("%s: ASM_STREAM_EVENT payload[0][0x%x] payload[1][0x%x]",
__func__, payload[0], payload[1]);
else if (data->payload_size >= sizeof(uint32_t))
pr_debug("%s: ASM_STREAM_EVENT payload[0][0x%x]",
__func__, payload[0]);
else
pr_debug("%s: payload size of %x is less than expected.\n",
__func__, data->payload_size);
@@ -2380,6 +2383,34 @@ static int32_t q6asm_callback(struct apr_client_data *data, void *priv)
pp_event_package->payload_len = payload_size;
memcpy((void *)pp_event_package->payload,
data->payload, payload_size);
if ((data->opcode == ASM_IEC_61937_MEDIA_FMT_EVENT) &&
(payload_size == 4)) {
switch (payload[0]) {
case ASM_MEDIA_FMT_AC3:
((uint32_t *)pp_event_package->payload)[0] =
SND_AUDIOCODEC_AC3;
break;
case ASM_MEDIA_FMT_EAC3:
((uint32_t *)pp_event_package->payload)[0] =
SND_AUDIOCODEC_EAC3;
break;
case ASM_MEDIA_FMT_DTS:
((uint32_t *)pp_event_package->payload)[0] =
SND_AUDIOCODEC_DTS;
break;
case ASM_MEDIA_FMT_TRUEHD:
((uint32_t *)pp_event_package->payload)[0] =
SND_AUDIOCODEC_TRUEHD;
break;
case ASM_MEDIA_FMT_AAC_V2:
((uint32_t *)pp_event_package->payload)[0] =
SND_AUDIOCODEC_AAC;
break;
default:
pr_debug("%s: Event with unknown media_fmt 0x%x\n",
__func__, payload[0]);
}
}
ac->cb(data->opcode, data->token,
(void *)pp_event_package, ac->priv);
kfree(pp_event_package);

5
include/dsp/apr_audio-v2.h
View File

@@ -646,8 +646,9 @@ struct adm_cmd_set_pp_params {
#define ASM_STREAM_CMD_REGISTER_PP_EVENTS 0x00013213
#define ASM_STREAM_PP_EVENT 0x00013214
#define ASM_STREAM_CMD_REGISTER_IEC_61937_FMT_UPDATE 0x13333
#define ASM_IEC_61937_MEDIA_FMT_EVENT 0x13334
#define ASM_STREAM_CMD_REGISTER_IEC_61937_FMT_UPDATE 0x1321C
#define ASM_IEC_61937_MEDIA_FMT_EVENT 0x1321D
#define DSP_STREAM_CMD "ADSP Stream Cmd"
#define DSP_STREAM_CALLBACK "ADSP Stream Callback Event"