Skip to content

Fixup waves adapter - #7942

Merged
kv2019i merged 2 commits into
thesofproject:mainfrom
cujomalainey:waves
Jul 14, 2023
Merged

kv2019i merged 2 commits into
thesofproject:mainfrom
cujomalainey:waves

Conversation

@cujomalainey

@cujomalainey cujomalainey commented Jul 13, 2023 •

Copy link
Copy Markdown
Contributor

Fixups for Waves adapter

Now that waves headers are published they should not be trying to
include local headers or modifying the global scope. Fixup headers so
they include like the rest of public headers.

Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
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: e57883f ("buffer: use an accessor to read struct audio_stream::channels")
Fixes: f8e4d69 ("buffer: use an accessor to read struct audio_stream::rate")
Fixes: 017b8eb ("buffer: use an accessor to read struct audio_stream::frame_fmt")
Fixes: 90828e2 ("buffer: external modules use API to access buffer_fmt")
Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
@cujomalainey cujomalainey changed the title audio: waves: fix header include pathing Fixup waves adapter Jul 13, 2023
@cujomalainey
cujomalainey requested review from lyakh and stolx July 13, 2023 19:11

/* 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)) {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

oh, yeah, that's the punishment for being too inventive with names, we couldn't possibly have guessed to grep for src_fmt as a buffer stream name ;-)


/* 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)) {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

ok, these ones should've been caught, but looks like they were wrong too

@kv2019i kv2019i left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

wow, waves.c had a lot of missed places

@kv2019i

kv2019i commented Jul 14, 2023

Copy link
Copy Markdown
Collaborator

Build failures are caused by a regression (to be fixed by #7949 ), rest looks good as expected as this is only touching code not covered by CI.

@kv2019i
kv2019i merged commit 90aebd1 into thesofproject:main Jul 14, 2023
@cujomalainey

Copy link
Copy Markdown
Contributor Author

Build failures are caused by a regression (to be fixed by #7949 ), rest looks good as expected as this is only touching code not covered by CI.

Working to fix that so this is covered by CI going forward :)

@cujomalainey
cujomalainey deleted the waves branch July 14, 2023 15:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants