Skip to content

Audio: EQIIR: Optimize pass-through mode read/write frags #5333

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

Audio: EQIIR: Optimize pass-through mode read/write frags #5333

Show file tree
Hide file tree
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
50 changes: 36 additions & 14 deletions src/audio/eq_iir/eq_iir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,15 +297,26 @@ static void eq_iir_s32_s16_pass(const struct comp_dev *dev,
struct audio_stream *sink,
uint32_t frames)
{
int32_t *x;
int16_t *y;
int32_t *x = source->r_ptr;
int16_t *y = sink->w_ptr;
int nmax;
int n;
int i;
int n = frames * source->channels;
int remaining_samples = frames * source->channels;

for (i = 0; i < n; i++) {
x = audio_stream_read_frag_s32(source, i);
y = audio_stream_write_frag_s16(sink, i);
*y = sat_int16(Q_SHIFT_RND(*x, 31, 15));
while (remaining_samples) {
nmax = EQ_IIR_BYTES_TO_S32_SAMPLES(audio_stream_bytes_without_wrap(source, x));
n = MIN(remaining_samples, nmax);
nmax = EQ_IIR_BYTES_TO_S16_SAMPLES(audio_stream_bytes_without_wrap(sink, y));
n = MIN(n, nmax);
for (i = 0; i < n; i++) {
*y = sat_int16(Q_SHIFT_RND(*x, 31, 15));
x++;
y++;
}
remaining_samples -= n;
x = audio_stream_wrap(source, x);
y = audio_stream_wrap(sink, y);
}
}
#endif /* CONFIG_FORMAT_S16LE && CONFIG_FORMAT_S32LE */
Expand All @@ -316,15 +327,26 @@ static void eq_iir_s32_s24_pass(const struct comp_dev *dev,
struct audio_stream *sink,
uint32_t frames)
{
int32_t *x;
int32_t *y;
int32_t *x = source->r_ptr;
int32_t *y = sink->w_ptr;
int nmax;
int n;
int i;
int n = frames * source->channels;
int remaining_samples = frames * source->channels;

for (i = 0; i < n; i++) {
x = audio_stream_read_frag_s32(source, i);
y = audio_stream_write_frag_s16(sink, i);
*y = sat_int24(Q_SHIFT_RND(*x, 31, 23));
while (remaining_samples) {
nmax = EQ_IIR_BYTES_TO_S32_SAMPLES(audio_stream_bytes_without_wrap(source, x));
n = MIN(remaining_samples, nmax);
nmax = EQ_IIR_BYTES_TO_S32_SAMPLES(audio_stream_bytes_without_wrap(sink, y));
n = MIN(n, nmax);
for (i = 0; i < n; i++) {
*y = sat_int24(Q_SHIFT_RND(*x, 31, 23));
x++;
y++;
}
remaining_samples -= n;
x = audio_stream_wrap(source, x);
y = audio_stream_wrap(sink, y);
}
}
#endif /* CONFIG_FORMAT_S24LE && CONFIG_FORMAT_S32LE */
Expand Down
4 changes: 4 additions & 0 deletions src/include/sof/audio/eq_iir/eq_iir.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
#include <stdint.h>
#include <sof/math/iir_df2t.h>

/** \brief Macros to convert without division bytes count to samples count */
#define EQ_IIR_BYTES_TO_S16_SAMPLES(b) ((b) >> 1)
#define EQ_IIR_BYTES_TO_S32_SAMPLES(b) ((b) >> 2)

struct audio_stream;
struct comp_dev;

Expand Down