korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 00:04:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: qcom: audioreach: Commonize setting channel mappings

Browse Source 
Move code assigning channel mapping values to a common helper function.
This simplifies three out of four cases, with the last case using
incompatible type (uint16_t array instead of uint8_t array).

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://msgid.link/r/20231130180758.212172-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Krzysztof Kozlowski 2023-11-30 19:07:56 +01:00 committed by Mark Brown
parent 5012f9d8ac
commit ef14f40a36
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sound/soc/qcom/qdsp6/audioreach.c
View File

@ -267,6 +267,16 @@ void *audioreach_alloc_apm_cmd_pkt(int pkt_size, uint32_t opcode, uint32_t token
}
EXPORT_SYMBOL_GPL(audioreach_alloc_apm_cmd_pkt);
static void audioreach_set_channel_mapping(u8 *ch_map, int num_channels)
{
if (num_channels == 1) {
ch_map[0] = PCM_CHANNEL_L;
} else if (num_channels == 2) {
ch_map[0] = PCM_CHANNEL_L;
ch_map[1] = PCM_CHANNEL_R;
}
}
static void apm_populate_container_config(struct apm_container_obj *cfg,
struct audioreach_container *cont)
{
@ -864,12 +874,8 @@ static int audioreach_set_compr_media_format(struct media_format *media_fmt_hdr,
mp3_cfg->endianness = PCM_LITTLE_ENDIAN;
mp3_cfg->num_channels = mcfg->num_channels;
if (mcfg->num_channels == 1) {
mp3_cfg->channel_mapping[0] = PCM_CHANNEL_L;
} else if (mcfg->num_channels == 2) {
mp3_cfg->channel_mapping[0] = PCM_CHANNEL_L;
mp3_cfg->channel_mapping[1] = PCM_CHANNEL_R;
}
audioreach_set_channel_mapping(mp3_cfg->channel_mapping,
mcfg->num_channels);
break;
case SND_AUDIOCODEC_AAC:
media_fmt_hdr->data_format = DATA_FORMAT_RAW_COMPRESSED;
@ -1089,13 +1095,8 @@ static int audioreach_pcm_set_media_format(struct q6apm_graph *graph,
media_cfg->q_factor = mcfg->bit_width - 1;
media_cfg->bits_per_sample = mcfg->bit_width;
if (num_channels == 1) {
media_cfg->channel_mapping[0] = PCM_CHANNEL_L;
} else if (num_channels == 2) {
media_cfg->channel_mapping[0] = PCM_CHANNEL_L;
media_cfg->channel_mapping[1] = PCM_CHANNEL_R;
}
audioreach_set_channel_mapping(media_cfg->channel_mapping,
num_channels);
rc = q6apm_send_cmd_sync(graph->apm, pkt, 0);
@ -1153,12 +1154,8 @@ static int audioreach_shmem_set_media_format(struct q6apm_graph *graph,
cfg->endianness = PCM_LITTLE_ENDIAN;
cfg->num_channels = mcfg->num_channels;
if (mcfg->num_channels == 1)
cfg->channel_mapping[0] = PCM_CHANNEL_L;
else if (num_channels == 2) {
cfg->channel_mapping[0] = PCM_CHANNEL_L;
cfg->channel_mapping[1] = PCM_CHANNEL_R;
}
audioreach_set_channel_mapping(cfg->channel_mapping,
num_channels);
} else {
rc = audioreach_set_compr_media_format(header, p, mcfg);
if (rc) {