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

igo_nr: remove buffer_acquire from igo_nr 

remove buffer ops from igo_nr module

this is a continuation of changes
from commit 4a03699

Signed-off-by: Tobiasz Dryjanski <tobiaszx.dryjanski@intel.com>
This commit is contained in:
Tobiasz Dryjanski 2023-09-15 20:00:04 +02:00 committed by Kai Vehmanen
parent fe91b3c97f
commit 352a465759
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/audio/igo_nr/igo_nr.c
View File

@ -379,7 +379,6 @@ static int32_t igo_nr_params(struct comp_dev *dev,
{
struct comp_data *cd = comp_get_drvdata(dev);
struct comp_buffer *sinkb, *sourceb;
struct comp_buffer *sink_c, *source_c;
int32_t err;
comp_info(dev, "igo_nr_params()");
@ -395,22 +394,16 @@ static int32_t igo_nr_params(struct comp_dev *dev,
sinkb = list_first_item(&dev->bsink_list, struct comp_buffer,
source_list);
source_c = buffer_acquire(sourceb);
sink_c = buffer_acquire(sinkb);
/* set source/sink_frames/rate */
cd->source_rate = audio_stream_get_rate(&source_c->stream);
cd->sink_rate = audio_stream_get_rate(&sink_c->stream);
cd->source_rate = audio_stream_get_rate(&sourceb->stream);
cd->sink_rate = audio_stream_get_rate(&sinkb->stream);
if (audio_stream_get_channels(&source_c->stream) !=
audio_stream_get_channels(&sink_c->stream)) {
if (audio_stream_get_channels(&sourceb->stream) !=
audio_stream_get_channels(&sinkb->stream)) {
comp_err(dev, "igo_nr_params(), mismatch source/sink stream channels");
cd->invalid_param = true;
}
buffer_release(sink_c);
buffer_release(source_c);
if (!cd->sink_rate) {
comp_err(dev, "igo_nr_params(), zero sink rate");
return -EINVAL;
@ -701,7 +694,6 @@ static int32_t igo_nr_copy(struct comp_dev *dev)
{
struct comp_copy_limits cl;
struct comp_buffer *sourceb, *sinkb;
struct comp_buffer *source_c, *sink_c;
struct comp_data *cd = comp_get_drvdata(dev);
int32_t src_frames;
int32_t sink_frames;
@ -713,27 +705,21 @@ static int32_t igo_nr_copy(struct comp_dev *dev)
sinkb = list_first_item(&dev->bsink_list, struct comp_buffer,
source_list);
source_c = buffer_acquire(sourceb);
sink_c = buffer_acquire(sinkb);
/* Check for changed configuration */
if (comp_is_new_data_blob_available(cd->model_handler))
igo_nr_set_igo_params(dev);
/* Get source, sink, number of frames etc. to process. */
comp_get_copy_limits(source_c, sink_c, &cl);
comp_get_copy_limits(sourceb, sinkb, &cl);
src_frames = audio_stream_get_avail_frames(&source_c->stream);
sink_frames = audio_stream_get_free_frames(&sink_c->stream);
src_frames = audio_stream_get_avail_frames(&sourceb->stream);
sink_frames = audio_stream_get_free_frames(&sinkb->stream);
comp_dbg(dev, "src_frames = %d, sink_frames = %d.", src_frames, sink_frames);
/* Process only when frames count is enough. */
if (src_frames >= IGO_FRAME_SIZE && sink_frames >= IGO_FRAME_SIZE)
igo_nr_process(dev, source_c, sink_c, &cl, IGO_FRAME_SIZE);
buffer_release(sink_c);
buffer_release(source_c);
igo_nr_process(dev, sourceb, sinkb, &cl, IGO_FRAME_SIZE);
return 0;
}