evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: msm: mixer control queue handling in sink stream"

Browse source
This commit is contained in:
Linux Build Service Account 2017-07-25 00:35:47 -07:00 • committed by Gerrit - the friendly Code Review server
commit ba7b97eed0
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sound/soc/msm/qdsp6v2/msm-transcode-loopback-q6-v2.c
View file

@ -100,7 +100,7 @@ static void loopback_event_handler(uint32_t opcode,
return; return;
} }
cstream = trans->source.cstream; cstream = trans->sink.cstream;
ac = trans->audio_client; ac = trans->audio_client;
/* /*
@ -223,6 +223,7 @@ static int msm_transcode_loopback_open(struct snd_compr_stream *cstream)
ret = -EINVAL; ret = -EINVAL;
goto exit; goto exit;
} }
msm_adsp_init_mixer_ctl_pp_event_queue(rtd);
} }
pr_debug("%s: num stream%d, stream name %s\n", __func__, pr_debug("%s: num stream%d, stream name %s\n", __func__,
@ -237,8 +238,7 @@ static int msm_transcode_loopback_open(struct snd_compr_stream *cstream)
} }
runtime->private_data = trans; runtime->private_data = trans;
if (trans->num_streams == 1)
msm_adsp_init_mixer_ctl_pp_event_queue(rtd);
exit: exit:
mutex_unlock(&trans->lock); mutex_unlock(&trans->lock);
return ret; return ret;
@ -283,14 +283,14 @@ static int msm_transcode_loopback_free(struct snd_compr_stream *cstream)
trans->num_streams--; trans->num_streams--;
stop_transcoding(trans); stop_transcoding(trans);
if (cstream->direction == SND_COMPRESS_PLAYBACK) if (cstream->direction == SND_COMPRESS_PLAYBACK) {
memset(&trans->sink, 0, sizeof(struct loopback_stream)); memset(&trans->sink, 0, sizeof(struct loopback_stream));
else if (cstream->direction == SND_COMPRESS_CAPTURE) msm_adsp_clean_mixer_ctl_pp_event_queue(rtd);
} else if (cstream->direction == SND_COMPRESS_CAPTURE) {
memset(&trans->source, 0, sizeof(struct loopback_stream)); memset(&trans->source, 0, sizeof(struct loopback_stream));
}
trans->session_state = LOOPBACK_SESSION_CLOSE; trans->session_state = LOOPBACK_SESSION_CLOSE;
if (trans->num_streams == 1)
msm_adsp_clean_mixer_ctl_pp_event_queue(rtd);
mutex_unlock(&trans->lock); mutex_unlock(&trans->lock);
return ret; return ret;
} }