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

pipeline: change preload conditions 

Changes pipeline's preload conditions to take into
consideration the situation, where we don't always
want to do playback preload, because the sink part
of pipeline is already running e.g. mixer topology.
However the host component still needs to perform
preload on its own, so for now we make the decision
based on stream's direction.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
This commit is contained in:
Tomasz Lauda 2019-06-26 11:44:39 +02:00 committed by Liam Girdwood
parent 4c59ef3b87
commit 440cd55f60
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/audio/host.c
View File

@ -692,7 +692,8 @@ static int host_copy(struct comp_dev *dev)
/* here only do preload, further copies happen /* here only do preload, further copies happen
* in host_buffer_cb() * in host_buffer_cb()
*/ */
if (pipeline_is_preload(dev->pipeline) && !dev->position) { if (dev->params.direction == SOF_IPC_STREAM_PLAYBACK &&
!dev->position) {
ret = dma_copy(hd->dma, hd->chan, hd->dma_buffer->size, ret = dma_copy(hd->dma, hd->chan, hd->dma_buffer->size,
DMA_COPY_PRELOAD); DMA_COPY_PRELOAD);
if (ret < 0) { if (ret < 0) {

7
src/audio/pipeline.c
View File

@ -388,8 +388,11 @@ int pipeline_prepare(struct pipeline *p, struct comp_dev *dev)
goto out; goto out;
} }
/* pipeline preload needed only for playback streams */ /* pipeline preload needed only for playback streams without active
p->preload = dev->params.direction == SOF_IPC_STREAM_PLAYBACK; * sink component (it can be active for e.g. mixer pipelines)
*/
p->preload = dev->params.direction == SOF_IPC_STREAM_PLAYBACK &&
p->sink_comp->state != COMP_STATE_ACTIVE;
p->status = COMP_STATE_PREPARE; p->status = COMP_STATE_PREPARE;
out: out: