Skip to content

pipeline: params: don't use uninitialized hw_params #5570

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
Mar 21, 2022
Merged

pipeline: params: don't use uninitialized hw_params #5570

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
30 changes: 27 additions & 3 deletions src/audio/pipeline/pipeline-params.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,7 @@ static void pipeline_update_buffer_pcm_params(struct comp_buffer *buffer,
params->chmap[i] = buffer->chmap[i];
}

/* fetch hardware stream parameters from DAI and propagate them to the remaining
* buffers in pipeline.
*/
/* fetch hardware stream parameters from DAI */
static int pipeline_comp_hw_params(struct comp_dev *current,
struct comp_buffer *calling_buf,
struct pipeline_walk_context *ctx, int dir)
Expand All @@ -168,6 +166,20 @@ static int pipeline_comp_hw_params(struct comp_dev *current,
}
}

return ret;
}

/* propagate hw_params to buffers in pipeline. */
static int pipeline_comp_hw_params_buf(struct comp_dev *current,
struct comp_buffer *calling_buf,
struct pipeline_walk_context *ctx, int dir)
{
struct pipeline_data *ppl_data = ctx->comp_data;
int ret;

ret = pipeline_for_each_comp(current, ctx, dir);
if (ret < 0)
return ret;
/* set buffer parameters */
if (calling_buf) {
calling_buf = buffer_acquire(calling_buf);
Expand Down Expand Up @@ -207,6 +219,11 @@ int pipeline_params(struct pipeline *p, struct comp_dev *host,
.comp_data = &data,
.skip_incomplete = true,
};
struct pipeline_walk_context buf_param_ctx = {
.comp_func = pipeline_comp_hw_params_buf,
.comp_data = &data,
.skip_incomplete = true,
};
struct pipeline_walk_context param_ctx = {
.comp_func = pipeline_comp_params,
.comp_data = &data,
Expand All @@ -232,6 +249,13 @@ int pipeline_params(struct pipeline *p, struct comp_dev *host,
return ret;
}

ret = buf_param_ctx.comp_func(host, NULL, &buf_param_ctx, dir);
if (ret < 0) {
pipe_err(p, "pipeline_params(): ret = %d, dev->comp.id = %u",
ret, dev_comp_id(host));
return ret;
}

/* setting pcm params */
data.params = params;
data.start = host;
Expand Down