Skip to content

mux: enable playback of multiple simultaneous streams #3692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 1 commit into from
Feb 5, 2021
Merged

mux: enable playback of multiple simultaneous streams #3692

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 81 additions & 13 deletions src/audio/mux/mux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,48 +610,116 @@ static int mux_copy(struct comp_dev *dev)

static int mux_reset(struct comp_dev *dev)
{
int dir = dev->pipeline->source_comp->direction;
Copy link
Collaborator

@dbaluta dbaluta Dec 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Silly question here. So MUX is a component that allows to select one output stream from multiple input sources?

Copy link
Author

@juimonen juimonen Dec 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mux defined in "ASoC sense" will do what you said. Sof mux can basically pick any channels from all input streams (also duplication), but it will not mix any input channels. So it does a little bit more, than you might see in some ASoC slides in the internet. Hence it is not defined as asoc mux, but as generic processing component.

struct list_item *blist;
struct comp_buffer *source;

comp_info(dev, "mux_reset()");

return comp_set_state(dev, COMP_TRIGGER_RESET);
if (dir == SOF_IPC_STREAM_PLAYBACK) {
list_for_item(blist, &dev->bsource_list) {
source = container_of(blist, struct comp_buffer,
sink_list);
/* only mux the sources with the same state with mux */
if (source->source->state > COMP_STATE_READY)
/* should not reset the downstream components */
return PPL_STATUS_PATH_STOP;
}
}

comp_set_state(dev, COMP_TRIGGER_RESET);
return 0;
}

static int mux_prepare(struct comp_dev *dev)
{
struct comp_data *cd = comp_get_drvdata(dev);
struct list_item *blist;
struct comp_buffer *source;
int downstream = 0;
int ret;

comp_info(dev, "mux_prepare()");

if (dev->comp.type == SOF_COMP_MUX)
cd->mux = mux_get_processing_function(dev);
else
cd->demux = demux_get_processing_function(dev);
if (dev->state != COMP_STATE_ACTIVE) {
if (dev->comp.type == SOF_COMP_MUX)
cd->mux = mux_get_processing_function(dev);
else
cd->demux = demux_get_processing_function(dev);

if (!cd->mux && !cd->demux) {
comp_err(dev, "mux_prepare(): Invalid configuration, couldn't find suitable processing function.");
return -EINVAL;
if (!cd->mux && !cd->demux) {
comp_err(dev, "mux_prepare(): Invalid configuration, couldn't find suitable processing function.");
return -EINVAL;
}

ret = comp_set_state(dev, COMP_TRIGGER_PREPARE);
if (ret) {
comp_info(dev, "mux_prepare() comp_set_state() returned non-zero.");
return ret;
}
}

ret = comp_set_state(dev, COMP_TRIGGER_PREPARE);
if (ret) {
comp_info(dev, "mux_prepare() comp_set_state() returned non-zero.");
return ret;
/* check each mux source state */
list_for_item(blist, &dev->bsource_list) {
source = container_of(blist, struct comp_buffer, sink_list);

/* only prepare downstream if we have no active sources */
if (source->source->state == COMP_STATE_PAUSED ||
source->source->state == COMP_STATE_ACTIVE) {
downstream = 1;
}
}

return 0;
/* prepare downstream */
return downstream;
}

static int mux_source_status_count(struct comp_dev *mux, uint32_t status)
{
struct comp_buffer *source;
struct list_item *blist;
int count = 0;

/* count source with state == status */
list_for_item(blist, &mux->bsource_list) {
source = container_of(blist, struct comp_buffer, sink_list);
if (source->source->state == status)
count++;
}

return count;
}

static int mux_trigger(struct comp_dev *dev, int cmd)
{
int dir = dev->pipeline->source_comp->direction;
int ret = 0;

comp_info(dev, "mux_trigger(), command = %u", cmd);

ret = comp_set_state(dev, cmd);
if (ret < 0)
return ret;

if (ret == COMP_STATUS_STATE_ALREADY_SET)
ret = PPL_STATUS_PATH_STOP;

/* nothing else to check for capture streams */
if (dir == SOF_IPC_STREAM_CAPTURE)
return ret;

/* don't stop mux if at least one source is active */
if (mux_source_status_count(dev, COMP_STATE_ACTIVE) &&
(cmd == COMP_TRIGGER_PAUSE || cmd == COMP_TRIGGER_STOP)) {
dev->state = COMP_STATE_ACTIVE;
ret = PPL_STATUS_PATH_STOP;
/* don't stop mux if at least one source is paused */
} else if (mux_source_status_count(dev, COMP_STATE_PAUSED) &&
cmd == COMP_TRIGGER_STOP) {
dev->state = COMP_STATE_PAUSED;
ret = PPL_STATUS_PATH_STOP;
}

return ret;
}

Expand Down