OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

component: set source buffer params for capture component .params() 

Considering of capture pipeline, when doing .params(), we need
set params to each component's source buffer.

This patch implement that for host/volume component, as mixer is
only for playback ATM, and dai don't have source buffer for capture,
we don't need change them ATM.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
This commit is contained in:
Keyon Jie 2017-03-01 17:31:59 +08:00 committed by Liam Girdwood
parent 1cdbc3e426
commit 28b48f83b0
3 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/audio/host.c
View File

@ -535,10 +535,12 @@ static int host_params(struct comp_dev *dev, struct stream_params *params)
/* set params */
hd->params = *params;
comp_set_sink_params(dev, params);
/* determine source and sink buffer elems */
if (params->direction == STREAM_DIRECTION_PLAYBACK) {
/* set sink buffer params */
comp_set_sink_params(dev, params);
hd->source = &hd->host;
hd->sink = &hd->local;
hd->dma_buffer = list_first_item(&dev->bsink_list,
@ -546,6 +548,9 @@ static int host_params(struct comp_dev *dev, struct stream_params *params)
hd->period = &hd->dma_buffer->desc.source_period;
config->direction = DMA_DIR_HMEM_TO_LMEM;
} else {
/* set source buffer params */
comp_set_source_params(dev, params);
hd->source = &hd->local;
hd->sink = &hd->host;
hd->dma_buffer = list_first_item(&dev->bsource_list,

37
src/audio/volume.c
View File

@ -341,26 +341,37 @@ static void volume_free(struct comp_dev *dev)
/* set component audio stream paramters */
static int volume_params(struct comp_dev *dev, struct stream_params *params)
{
struct stream_params sink_params = *params;
struct comp_buffer *sink;
struct stream_params buffer_params = *params;
struct comp_buffer *next_buf;
struct comp_dev *next_dev;
/* volume components will only ever have 1 source and 1 sink buffer */
sink = list_first_item(&dev->bsink_list, struct comp_buffer, source_list);
if (params->direction == STREAM_DIRECTION_PLAYBACK) {
/* volume components will only ever have 1 sink buffer */
next_buf = list_first_item(&dev->bsink_list, struct comp_buffer, source_list);
next_dev = next_buf->sink;
} else {
/* volume components will only ever have 1 source buffer */
next_buf = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
next_dev = next_buf->source;
}
/* hard coded until new IPC is ready */
if (sink->sink->is_host) {
sink_params.pcm.format = STREAM_FORMAT_S16_LE;
sink_params.frame_size = 2 * params->channels; /* 16bit container */
} else if (sink->sink->is_dai) {
sink_params.pcm.format = PLATFORM_SSP_STREAM_FORMAT;
sink_params.frame_size = 4 * params->channels; /* 32bit container */
if (next_dev->is_host) {
buffer_params.pcm.format = STREAM_FORMAT_S16_LE;
buffer_params.frame_size = 2 * params->channels; /* 16bit container */
} else if (next_dev->is_dai) {
buffer_params.pcm.format = PLATFORM_SSP_STREAM_FORMAT;
buffer_params.frame_size = 4 * params->channels; /* 32bit container */
} else {
sink_params.pcm.format = STREAM_FORMAT_S32_LE;
sink_params.frame_size = 4 * params->channels; /* 32bit container */
buffer_params.pcm.format = STREAM_FORMAT_S32_LE;
buffer_params.frame_size = 4 * params->channels; /* 32bit container */
}
/* dont do any data transformation */
comp_set_sink_params(dev, &sink_params);
if (params->direction == STREAM_DIRECTION_PLAYBACK)
comp_set_sink_params(dev, &buffer_params);
else
comp_set_source_params(dev, &buffer_params);
return 0;
}

13
src/include/reef/audio/component.h
View File

@ -420,4 +420,17 @@ static inline void comp_set_sink_params(struct comp_dev *dev,
}
}
static inline void comp_set_source_params(struct comp_dev *dev,
struct stream_params *params)
{
struct list_item *clist;
struct comp_buffer *source;
list_for_item(clist, &dev->bsource_list) {
source = container_of(clist, struct comp_buffer, sink_list);
source->params = *params;
}
}
#endif