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

ASoC: msm: qdsp6v2: latency mode support for transcode loopback

Browse source 
Add metadata to configure latency mode for DSP transcode
loopback to set legacy or low latency path. Userspace API
introduced to configure the same.

CRs-Fixed: 2092562
Change-Id: I914c68a9e9d8647530b72c42548e571b7508c423
Signed-off-by: Siddartha Shaik <sshaik@codeaurora.org>
This commit is contained in:
Siddartha Shaik 2017-08-14 04:18:35 +05:30
parent dd32d9226c
commit 97390bee20
2 changed files with 59 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/uapi/sound/compress_offload.h
View file

@ -138,6 +138,11 @@ struct snd_compr_audio_info {
#define SNDRV_COMPRESS_CLK_REC_MODE_NONE 0 #define SNDRV_COMPRESS_CLK_REC_MODE_NONE 0
#define SNDRV_COMPRESS_CLK_REC_MODE_AUTO 1 #define SNDRV_COMPRESS_CLK_REC_MODE_AUTO 1
enum sndrv_compress_latency_mode {
SNDRV_COMPRESS_LEGACY_LATENCY_MODE = 0,
SNDRV_COMPRESS_LOW_LATENCY_MODE = 1,
};
/** /**
* enum sndrv_compress_encoder * enum sndrv_compress_encoder
* @SNDRV_COMPRESS_ENCODER_PADDING: no of samples appended by the encoder at the * @SNDRV_COMPRESS_ENCODER_PADDING: no of samples appended by the encoder at the
@ -164,6 +169,7 @@ enum sndrv_compress_encoder {
SNDRV_COMPRESS_START_DELAY = 9, SNDRV_COMPRESS_START_DELAY = 9,
SNDRV_COMPRESS_ENABLE_ADJUST_SESSION_CLOCK = 10, SNDRV_COMPRESS_ENABLE_ADJUST_SESSION_CLOCK = 10,
SNDRV_COMPRESS_ADJUST_SESSION_CLOCK = 11, SNDRV_COMPRESS_ADJUST_SESSION_CLOCK = 11,
SNDRV_COMPRESS_LATENCY_MODE = 12,
}; };
#define SNDRV_COMPRESS_PATH_DELAY SNDRV_COMPRESS_PATH_DELAY #define SNDRV_COMPRESS_PATH_DELAY SNDRV_COMPRESS_PATH_DELAY
@ -174,6 +180,7 @@ enum sndrv_compress_encoder {
#define SNDRV_COMPRESS_ENABLE_ADJUST_SESSION_CLOCK \ #define SNDRV_COMPRESS_ENABLE_ADJUST_SESSION_CLOCK \
SNDRV_COMPRESS_ENABLE_ADJUST_SESSION_CLOCK SNDRV_COMPRESS_ENABLE_ADJUST_SESSION_CLOCK
#define SNDRV_COMPRESS_ADJUST_SESSION_CLOCK SNDRV_COMPRESS_ADJUST_SESSION_CLOCK #define SNDRV_COMPRESS_ADJUST_SESSION_CLOCK SNDRV_COMPRESS_ADJUST_SESSION_CLOCK
#define SNDRV_COMPRESS_LATENCY_MODE SNDRV_COMPRESS_LATENCY_MODE
/** /**
* struct snd_compr_metadata - compressed stream metadata * struct snd_compr_metadata - compressed stream metadata

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

@ -28,6 +28,7 @@
#include <sound/control.h> #include <sound/control.h>
#include <sound/q6asm-v2.h> #include <sound/q6asm-v2.h>
#include <sound/q6core.h> #include <sound/q6core.h>
#include <sound/q6audio-v2.h>
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/timer.h> #include <sound/timer.h>
#include <sound/tlv.h> #include <sound/tlv.h>
@ -55,6 +56,7 @@ struct trans_loopback_pdata {
struct snd_compr_stream *cstream[MSM_FRONTEND_DAI_MAX]; struct snd_compr_stream *cstream[MSM_FRONTEND_DAI_MAX];
int32_t ion_fd[MSM_FRONTEND_DAI_MAX]; int32_t ion_fd[MSM_FRONTEND_DAI_MAX];
uint32_t master_gain; uint32_t master_gain;
int perf_mode;
}; };
struct loopback_stream { struct loopback_stream {
@ -406,6 +408,8 @@ static int msm_transcode_loopback_set_params(struct snd_compr_stream *cstream,
struct msm_transcode_loopback *trans = runtime->private_data; struct msm_transcode_loopback *trans = runtime->private_data;
struct snd_soc_pcm_runtime *soc_pcm_rx; struct snd_soc_pcm_runtime *soc_pcm_rx;
struct snd_soc_pcm_runtime *soc_pcm_tx; struct snd_soc_pcm_runtime *soc_pcm_tx;
struct snd_soc_pcm_runtime *rtd;
struct trans_loopback_pdata *pdata;
uint32_t bit_width = 16; uint32_t bit_width = 16;
int ret = 0; int ret = 0;
@ -416,6 +420,9 @@ static int msm_transcode_loopback_set_params(struct snd_compr_stream *cstream,
mutex_lock(&trans->lock); mutex_lock(&trans->lock);
rtd = snd_pcm_substream_chip(cstream);
pdata = snd_soc_platform_get_drvdata(rtd->platform);
if (cstream->direction == SND_COMPRESS_PLAYBACK) { if (cstream->direction == SND_COMPRESS_PLAYBACK) {
if (codec_param->codec.id == SND_AUDIOCODEC_PCM) { if (codec_param->codec.id == SND_AUDIOCODEC_PCM) {
trans->sink.codec_format = trans->sink.codec_format =
@ -497,7 +504,7 @@ static int msm_transcode_loopback_set_params(struct snd_compr_stream *cstream,
pr_debug("%s: ASM client allocated, callback %pK\n", __func__, pr_debug("%s: ASM client allocated, callback %pK\n", __func__,
loopback_event_handler); loopback_event_handler);
trans->session_id = trans->audio_client->session; trans->session_id = trans->audio_client->session;
trans->audio_client->perf_mode = false; trans->audio_client->perf_mode = pdata->perf_mode;
ret = q6asm_open_transcode_loopback(trans->audio_client, ret = q6asm_open_transcode_loopback(trans->audio_client,
bit_width, bit_width,
trans->source.codec_format, trans->source.codec_format,
@ -516,7 +523,7 @@ static int msm_transcode_loopback_set_params(struct snd_compr_stream *cstream,
if (trans->source.codec_format != FORMAT_LINEAR_PCM) if (trans->source.codec_format != FORMAT_LINEAR_PCM)
msm_pcm_routing_reg_phy_compr_stream( msm_pcm_routing_reg_phy_compr_stream(
soc_pcm_tx->dai_link->be_id, soc_pcm_tx->dai_link->be_id,
trans->audio_client->perf_mode, false,
trans->session_id, trans->session_id,
SNDRV_PCM_STREAM_CAPTURE, SNDRV_PCM_STREAM_CAPTURE,
COMPRESSED_PASSTHROUGH_GEN); COMPRESSED_PASSTHROUGH_GEN);
@ -529,7 +536,7 @@ static int msm_transcode_loopback_set_params(struct snd_compr_stream *cstream,
/* Opening Rx ADM in LOW_LATENCY mode by default */ /* Opening Rx ADM in LOW_LATENCY mode by default */
msm_pcm_routing_reg_phy_stream( msm_pcm_routing_reg_phy_stream(
soc_pcm_rx->dai_link->be_id, soc_pcm_rx->dai_link->be_id,
true, trans->audio_client->perf_mode,
trans->session_id, trans->session_id,
SNDRV_PCM_STREAM_PLAYBACK); SNDRV_PCM_STREAM_PLAYBACK);
pr_debug("%s: Successfully opened ADM sessions\n", __func__); pr_debug("%s: Successfully opened ADM sessions\n", __func__);
@ -562,6 +569,46 @@ static int msm_transcode_loopback_get_caps(struct snd_compr_stream *cstream,
return 0; return 0;
} }
static int msm_transcode_loopback_set_metadata(struct snd_compr_stream *cstream,
struct snd_compr_metadata *metadata)
{
struct snd_soc_pcm_runtime *rtd;
struct trans_loopback_pdata *pdata;
if (!metadata || !cstream) {
pr_err("%s: Invalid arguments\n", __func__);
return -EINVAL;
}
rtd = snd_pcm_substream_chip(cstream);
pdata = snd_soc_platform_get_drvdata(rtd->platform);
switch (metadata->key) {
case SNDRV_COMPRESS_LATENCY_MODE:
{
switch (metadata->value[0]) {
case SNDRV_COMPRESS_LEGACY_LATENCY_MODE:
pdata->perf_mode = LEGACY_PCM_MODE;
break;
case SNDRV_COMPRESS_LOW_LATENCY_MODE:
pdata->perf_mode = LOW_LATENCY_PCM_MODE;
break;
default:
pr_debug("%s: Unsupported latency mode %d, default to Legacy\n",
__func__, metadata->value[0]);
pdata->perf_mode = LEGACY_PCM_MODE;
break;
}
}
break;
default:
pr_debug("%s: Unsupported metadata %d\n",
__func__, metadata->key);
break;
}
return 0;
}
static int msm_transcode_stream_cmd_put(struct snd_kcontrol *kcontrol, static int msm_transcode_stream_cmd_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
@ -1278,6 +1325,7 @@ static struct snd_compr_ops msm_transcode_loopback_ops = {
.trigger = msm_transcode_loopback_trigger, .trigger = msm_transcode_loopback_trigger,
.set_params = msm_transcode_loopback_set_params, .set_params = msm_transcode_loopback_set_params,
.get_caps = msm_transcode_loopback_get_caps, .get_caps = msm_transcode_loopback_get_caps,
.set_metadata = msm_transcode_loopback_set_metadata,
}; };
@ -1292,6 +1340,7 @@ static int msm_transcode_loopback_probe(struct snd_soc_platform *platform)
if (!pdata) if (!pdata)
return -ENOMEM; return -ENOMEM;
pdata->perf_mode = LOW_LATENCY_PCM_MODE;
snd_soc_platform_set_drvdata(platform, pdata); snd_soc_platform_set_drvdata(platform, pdata);
return 0; return 0;
} }