Skip to content

pipeline: fix aborting STOP or PAUSE propagation #5374

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 18, 2022
Merged

pipeline: fix aborting STOP or PAUSE propagation #5374

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
18 changes: 9 additions & 9 deletions src/audio/pipeline/pipeline-schedule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,7 @@ static enum task_state pipeline_task_cmd(struct pipeline *p,

if (err == PPL_STATUS_PATH_STOP) {
/* comp_trigger() interrupted trigger propagation or an xrun occurred */
err = SOF_TASK_STATE_COMPLETED;
} else if (p->trigger.cmd != cmd) {
/* PRE stage completed */
if (p->trigger.delay)
return SOF_TASK_STATE_RESCHEDULE;
/* No delay: the final stage has already run too */
err = SOF_TASK_STATE_RESCHEDULE;
} else if (p->status == COMP_STATE_PAUSED) {
if (p->trigger.aborted) {
if (p->trigger.aborted && p->status == COMP_STATE_PAUSED) {
p->status = COMP_STATE_ACTIVE;
/*
* the pipeline aborted a STOP or a PAUSE
Expand All @@ -99,6 +91,14 @@ static enum task_state pipeline_task_cmd(struct pipeline *p,
} else {
err = SOF_TASK_STATE_COMPLETED;
}
} else if (p->trigger.cmd != cmd) {
/* PRE stage completed */
if (p->trigger.delay)
return SOF_TASK_STATE_RESCHEDULE;
/* No delay: the final stage has already run too */
err = SOF_TASK_STATE_RESCHEDULE;
} else if (p->status == COMP_STATE_PAUSED) {
err = SOF_TASK_STATE_COMPLETED;
} else {
p->status = COMP_STATE_ACTIVE;
err = SOF_TASK_STATE_RESCHEDULE;
Expand Down