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

audio: waves: Fix buffer accessors 

Since 3P code can't be compiled without the library (for now) we rely on
reviews for API conversions which unfortunately has proven to not be
perfect. Fixup the accessors for the waves module.

Fixes: e57883f3c2 ("buffer: use an accessor to read struct audio_stream::channels")
Fixes: f8e4d693b2 ("buffer: use an accessor to read struct audio_stream::rate")
Fixes: 017b8ebcde ("buffer: use an accessor to read struct audio_stream::frame_fmt")
Fixes: 90828e2305 ("buffer: external modules use API to access buffer_fmt")
Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
This commit is contained in:
Curtis Malainey 2023-07-13 11:24:50 -07:00 committed by Kai Vehmanen
parent 46a78b20b8
commit 90aebd1d9c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/audio/module_adapter/module/waves.c
View File

@ -232,7 +232,7 @@ static int waves_effect_check(struct comp_dev *dev)
/* todo use fallback to comp_verify_params when ready */ /* todo use fallback to comp_verify_params when ready */
/* resampling not supported */ /* resampling not supported */
if (src_fmt->rate != audio_stream_get_rate(snk_fmt)) { if (audio_stream_get_rate(src_fmt) != audio_stream_get_rate(snk_fmt)) {
comp_err(dev, "waves_effect_check() source %d sink %d rate mismatch", comp_err(dev, "waves_effect_check() source %d sink %d rate mismatch",
audio_stream_get_rate(src_fmt), audio_stream_get_rate(snk_fmt)); audio_stream_get_rate(src_fmt), audio_stream_get_rate(snk_fmt));
ret = -EINVAL; ret = -EINVAL;
@ -240,7 +240,7 @@ static int waves_effect_check(struct comp_dev *dev)
} }
/* upmix/downmix not supported */ /* upmix/downmix not supported */
if (src_fmt->channels != audio_stream_get_channels(snk_fmt)) { if (audio_stream_get_channels(src_fmt) != audio_stream_get_channels(snk_fmt)) {
comp_err(dev, "waves_effect_check() source %d sink %d channels mismatch", comp_err(dev, "waves_effect_check() source %d sink %d channels mismatch",
audio_stream_get_channels(src_fmt), audio_stream_get_channels(snk_fmt)); audio_stream_get_channels(src_fmt), audio_stream_get_channels(snk_fmt));
ret = -EINVAL; ret = -EINVAL;
@ -248,7 +248,7 @@ static int waves_effect_check(struct comp_dev *dev)
} }
/* different frame format not supported */ /* different frame format not supported */
if (src_fmt->frame_fmt != audio_stream_get_frm_fmt(snk_fmt)) { if (audio_stream_get_frm_fmt(src_fmt) != audio_stream_get_frm_fmt(snk_fmt)) {
comp_err(dev, "waves_effect_check() source %d sink %d sample format mismatch", comp_err(dev, "waves_effect_check() source %d sink %d sample format mismatch",
audio_stream_get_frm_fmt(src_fmt), audio_stream_get_frm_fmt(snk_fmt)); audio_stream_get_frm_fmt(src_fmt), audio_stream_get_frm_fmt(snk_fmt));
ret = -EINVAL; ret = -EINVAL;
@ -256,7 +256,7 @@ static int waves_effect_check(struct comp_dev *dev)
} }
/* different interleaving is not supported */ /* different interleaving is not supported */
if (source_c->buffer_fmt != sink_c->buffer_fmt) { if (audio_stream_get_buffer_fmt(src_fmt) != audio_stream_get_buffer_fmt(snk_fmt)) {
comp_err(dev, "waves_effect_check() source %d sink %d buffer format mismatch"); comp_err(dev, "waves_effect_check() source %d sink %d buffer format mismatch");
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
@ -268,7 +268,7 @@ static int waves_effect_check(struct comp_dev *dev)
goto out; goto out;
} }
if (!layout_is_supported(source_c->buffer_fmt)) { if (!layout_is_supported(audio_stream_get_buffer_fmt(src_fmt))) {
comp_err(dev, "waves_effect_check() non interleaved format not supported"); comp_err(dev, "waves_effect_check() non interleaved format not supported");
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
@ -281,7 +281,7 @@ static int waves_effect_check(struct comp_dev *dev)
goto out; goto out;
} }
if (src_fmt->channels != 2) { if (audio_stream_get_channels(src_fmt) != 2) {
comp_err(dev, "waves_effect_check() channels %d not supported", comp_err(dev, "waves_effect_check() channels %d not supported",
audio_stream_get_channels(src_fmt)); audio_stream_get_channels(src_fmt));
ret = -EINVAL; ret = -EINVAL;
@ -325,10 +325,10 @@ static int waves_effect_init(struct processing_module *mod)
goto out; goto out;
} }
buffer_format = layout_convert_sof_to_me(source_c->buffer_fmt); buffer_format = layout_convert_sof_to_me(audio_stream_get_buffer_fmt(src_fmt));
if (buffer_format < 0) { if (buffer_format < 0) {
comp_err(dev, "waves_effect_init() sof buffer format %d not supported", comp_err(dev, "waves_effect_init() sof buffer format %d not supported",
source_c->buffer_fmt); audio_stream_get_buffer_fmt(src_fmt));
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }