Skip to content

audio: introduce and use source_cir_buf_wrap for const source reads #11170

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

Open
softwarecki wants to merge 7 commits into
base: main
Choose a base branch
from
Open

audio: introduce and use source_cir_buf_wrap for const source reads #11170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
43198ea
audio: audio_stream: Add source_cir_buf_wrap() helper
softwarecki Aug 6, 2026
5ba74a9
audio: pcm_converter: Use source_cir_buf_wrap() for source reads
softwarecki Aug 6, 2026
05fbee0
audio: asrc: Use source_cir_buf_wrap() for source reads
softwarecki Sep 2, 2026
126f8e0
audio: dcblock: Use source_cir_buf_wrap() for source reads
softwarecki Sep 2, 2026
f27c577
audio: component: Use source_cir_buf_wrap() in cir_buf_copy()
softwarecki Sep 2, 2026
79316d1
audio: volume: Use source_cir_buf_wrap() for source reads
softwarecki Sep 2, 2026
59b1f1b
audio: dcblock: Constify source read pointers in HiFi paths
softwarecki Sep 2, 2026
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
4 changes: 2 additions & 2 deletions src/audio/asrc/asrc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ static void src_copy_s32(struct processing_module *mod,

/* Update and check both source and destination for wrap */
n -= n_copy;
src = cir_buf_wrap(src, source->buf_start, source->buf_end);
src = source_cir_buf_wrap(src, source->buf_start, source->buf_end);
}

/* Run ASRC */
Expand Down Expand Up @@ -144,7 +144,7 @@ static void src_copy_s16(struct processing_module *mod,
n -= n_copy;
src += n_copy;
buf += n_copy;
src = cir_buf_wrap(src, source->buf_start, source->buf_end);
src = source_cir_buf_wrap(src, source->buf_start, source->buf_end);
}

/* Run ASRC */
Expand Down
4 changes: 2 additions & 2 deletions src/audio/component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ void cir_buf_copy(const void *src, const void *src_addr, const void *src_end, vo
ae_int16x4 in_sample1, in_sample2;
ae_valignx2 inu;
ae_valignx2 outu = AE_ZALIGN128();
const ae_int16x8 *in = cir_buf_wrap(src, src_addr, src_end);
const ae_int16x8 *in = source_cir_buf_wrap(src, src_addr, src_end);
ae_int16x8 *out = (ae_int16x8 *)dst;

while (bytes) {
Expand All @@ -307,7 +307,7 @@ void cir_buf_copy(const void *src, const void *src_addr, const void *src_end, vo
}

bytes -= bytes_copied;
in = cir_buf_wrap(in, src_addr, src_end);
in = source_cir_buf_wrap(in, src_addr, src_end);
out = cir_buf_wrap(out, dst_addr, dst_end);
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/audio/dcblock/dcblock_generic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ static int dcblock_s16_default(struct comp_data *cd,
if (++ch == nch)
ch = 0;
}
x = cir_buf_wrap((void *)x, source->buf_start, source->buf_end);
x = source_cir_buf_wrap(x, source->buf_start, source->buf_end);
y = cir_buf_wrap(y, sink->buf_start, sink->buf_end);
remaining_samples -= samples_without_wrap;
}
Expand Down Expand Up @@ -121,7 +121,7 @@ static int dcblock_s24_default(struct comp_data *cd,
if (++ch == nch)
ch = 0;
}
x = cir_buf_wrap((void *)x, source->buf_start, source->buf_end);
x = source_cir_buf_wrap(x, source->buf_start, source->buf_end);
y = cir_buf_wrap(y, sink->buf_start, sink->buf_end);
remaining_samples -= samples_without_wrap;
}
Expand Down Expand Up @@ -166,7 +166,7 @@ static int dcblock_s32_default(struct comp_data *cd,
if (++ch == nch)
ch = 0;
}
x = cir_buf_wrap((void *)x, source->buf_start, source->buf_end);
x = source_cir_buf_wrap(x, source->buf_start, source->buf_end);
y = cir_buf_wrap(y, sink->buf_start, sink->buf_end);
remaining_samples -= samples_without_wrap;
}
Expand Down
29 changes: 16 additions & 13 deletions src/audio/dcblock/dcblock_hifi3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static inline ae_int32x2 dcblock_cal(ae_int32x2 R, ae_int32x2 state_x, ae_int32
}

/* Set source as circular buffer 0 for the strided per-channel reads */
static inline void dcblock_set_circular(void *src_begin, void *src_end)
static inline void dcblock_set_circular(const void *src_begin, const void *src_end)
{
AE_SETCBEGIN0(src_begin);
AE_SETCEND0(src_end);
Expand All @@ -43,13 +43,14 @@ static int dcblock_s16_default(struct comp_data *cd,
struct cir_buf_sink *sink,
uint32_t frames)
{
ae_int16 *src = (ae_int16 *)source->ptr;
const ae_int16 *src = source->ptr;
ae_int16 *dst = (ae_int16 *)sink->ptr;
ae_int16 *x_start = (ae_int16 *)source->buf_start;
const ae_int16 *x_start = source->buf_start;
ae_int16 *y_start = (ae_int16 *)sink->buf_start;
ae_int16 *x_end = (ae_int16 *)source->buf_end;
const ae_int16 *x_end = source->buf_end;
ae_int16 *y_end = (ae_int16 *)sink->buf_end;
ae_int16 *in, *out;
const ae_int16 *in;
ae_int16 *out;
ae_int32x2 R, state_x, state_y, sample;
ae_int16x4 in_sample, out_sample;
int x_size = x_end - x_start;
Expand Down Expand Up @@ -106,13 +107,14 @@ static int dcblock_s24_default(struct comp_data *cd,
struct cir_buf_sink *sink,
uint32_t frames)
{
ae_int32 *src = (ae_int32 *)source->ptr;
const ae_int32 *src = source->ptr;
ae_int32 *dst = (ae_int32 *)sink->ptr;
ae_int32 *x_start = (ae_int32 *)source->buf_start;
const ae_int32 *x_start = source->buf_start;
ae_int32 *y_start = (ae_int32 *)sink->buf_start;
ae_int32 *x_end = (ae_int32 *)source->buf_end;
const ae_int32 *x_end = source->buf_end;
ae_int32 *y_end = (ae_int32 *)sink->buf_end;
ae_int32 *in, *out;
const ae_int32 *in;
ae_int32 *out;
ae_int32x2 R, state_x, state_y;
ae_int32x2 in_sample, out_sample;
int x_size = x_end - x_start;
Expand Down Expand Up @@ -165,13 +167,14 @@ static int dcblock_s32_default(struct comp_data *cd,
struct cir_buf_sink *sink,
uint32_t frames)
{
ae_int32 *src = (ae_int32 *)source->ptr;
const ae_int32 *src = source->ptr;
ae_int32 *dst = (ae_int32 *)sink->ptr;
ae_int32 *x_start = (ae_int32 *)source->buf_start;
const ae_int32 *x_start = source->buf_start;
ae_int32 *y_start = (ae_int32 *)sink->buf_start;
ae_int32 *x_end = (ae_int32 *)source->buf_end;
const ae_int32 *x_end = source->buf_end;
ae_int32 *y_end = (ae_int32 *)sink->buf_end;
ae_int32 *in, *out;
const ae_int32 *in;
ae_int32 *out;
ae_int32x2 R, state_x, state_y;
ae_int32x2 in_sample;
int x_size = x_end - x_start;
Expand Down
29 changes: 16 additions & 13 deletions src/audio/dcblock/dcblock_hifi4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static inline ae_int32x2 dcblock_cal(ae_int32x2 R, ae_int32x2 state_x, ae_int32
}

/* Set source as circular buffer 0 and sink as circular buffer 1 */
static inline void dcblock_set_circular(void *src_begin, void *src_end,
static inline void dcblock_set_circular(const void *src_begin, const void *src_end,
void *sink_begin, void *sink_end)
{
AE_SETCBEGIN0(src_begin);
Expand All @@ -46,13 +46,14 @@ static int dcblock_s16_default(struct comp_data *cd,
struct cir_buf_sink *sink,
uint32_t frames)
{
ae_int16 *src = (ae_int16 *)source->ptr;
const ae_int16 *src = source->ptr;
ae_int16 *dst = (ae_int16 *)sink->ptr;
ae_int16 *x_start = (ae_int16 *)source->buf_start;
const ae_int16 *x_start = source->buf_start;
ae_int16 *y_start = (ae_int16 *)sink->buf_start;
ae_int16 *x_end = (ae_int16 *)source->buf_end;
const ae_int16 *x_end = source->buf_end;
ae_int16 *y_end = (ae_int16 *)sink->buf_end;
ae_int16 *in, *out;
const ae_int16 *in;
ae_int16 *out;
ae_int32x2 R, state_x, state_y, sample;
ae_int16x4 in_sample, out_sample;
int nch = cd->channels;
Expand Down Expand Up @@ -91,13 +92,14 @@ static int dcblock_s24_default(struct comp_data *cd,
struct cir_buf_sink *sink,
uint32_t frames)
{
ae_int32 *src = (ae_int32 *)source->ptr;
const ae_int32 *src = source->ptr;
ae_int32 *dst = (ae_int32 *)sink->ptr;
ae_int32 *x_start = (ae_int32 *)source->buf_start;
const ae_int32 *x_start = source->buf_start;
ae_int32 *y_start = (ae_int32 *)sink->buf_start;
ae_int32 *x_end = (ae_int32 *)source->buf_end;
const ae_int32 *x_end = source->buf_end;
ae_int32 *y_end = (ae_int32 *)sink->buf_end;
ae_int32 *in, *out;
const ae_int32 *in;
ae_int32 *out;
ae_int32x2 R, state_x, state_y;
ae_int32x2 in_sample, out_sample;
int nch = cd->channels;
Expand Down Expand Up @@ -136,13 +138,14 @@ static int dcblock_s32_default(struct comp_data *cd,
struct cir_buf_sink *sink,
uint32_t frames)
{
ae_int32 *src = (ae_int32 *)source->ptr;
const ae_int32 *src = source->ptr;
ae_int32 *dst = (ae_int32 *)sink->ptr;
ae_int32 *x_start = (ae_int32 *)source->buf_start;
const ae_int32 *x_start = source->buf_start;
ae_int32 *y_start = (ae_int32 *)sink->buf_start;
ae_int32 *x_end = (ae_int32 *)source->buf_end;
const ae_int32 *x_end = source->buf_end;
ae_int32 *y_end = (ae_int32 *)sink->buf_end;
ae_int32 *in, *out;
const ae_int32 *in;
ae_int32 *out;
ae_int32x2 R, state_x, state_y;
ae_int32x2 in_sample;
int nch = cd->channels;
Expand Down
4 changes: 2 additions & 2 deletions src/audio/pcm_converter/pcm_converter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ int pcm_convert_as_linear(const struct cir_buf_source *source, size_t s_size_in,
converter(r_ptr, w_ptr, chunk);

/* move pointers */
r_ptr = cir_buf_wrap(r_ptr + chunk * s_size_in,
source->buf_start, source->buf_end);
r_ptr = source_cir_buf_wrap(r_ptr + chunk * s_size_in,
source->buf_start, source->buf_end);
w_ptr = cir_buf_wrap(w_ptr + chunk * s_size_out,
sink->buf_start, sink->buf_end);
i += chunk;
Expand Down
Loading
Loading