Skip to content

Commit 43e40ff

Browse files
softwareckikv2019i
authored andcommitted
audio: dcblock: Constify source read pointers in HiFi paths
Declare source-side pointers as const and remove const-stripping casts in HiFi3 and HiFi4 implementations. Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
1 parent fb7eba7 commit 43e40ff

2 files changed

Lines changed: 32 additions & 26 deletions

File tree

‎src/audio/dcblock/dcblock_hifi3.c‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ static inline ae_int32x2 dcblock_cal(ae_int32x2 R, ae_int32x2 state_x, ae_int32
3131
}
3232

3333
/* Set source as circular buffer 0 for the strided per-channel reads */
34-
static inline void dcblock_set_circular(void *src_begin, void *src_end)
34+
static inline void dcblock_set_circular(const void *src_begin, const void *src_end)
3535
{
3636
AE_SETCBEGIN0(src_begin);
3737
AE_SETCEND0(src_end);
@@ -43,13 +43,14 @@ static int dcblock_s16_default(struct comp_data *cd,
4343
struct cir_buf_sink *sink,
4444
uint32_t frames)
4545
{
46-
ae_int16 *src = (ae_int16 *)source->ptr;
46+
const ae_int16 *src = source->ptr;
4747
ae_int16 *dst = (ae_int16 *)sink->ptr;
48-
ae_int16 *x_start = (ae_int16 *)source->buf_start;
48+
const ae_int16 *x_start = source->buf_start;
4949
ae_int16 *y_start = (ae_int16 *)sink->buf_start;
50-
ae_int16 *x_end = (ae_int16 *)source->buf_end;
50+
const ae_int16 *x_end = source->buf_end;
5151
ae_int16 *y_end = (ae_int16 *)sink->buf_end;
52-
ae_int16 *in, *out;
52+
const ae_int16 *in;
53+
ae_int16 *out;
5354
ae_int32x2 R, state_x, state_y, sample;
5455
ae_int16x4 in_sample, out_sample;
5556
int x_size = x_end - x_start;
@@ -106,13 +107,14 @@ static int dcblock_s24_default(struct comp_data *cd,
106107
struct cir_buf_sink *sink,
107108
uint32_t frames)
108109
{
109-
ae_int32 *src = (ae_int32 *)source->ptr;
110+
const ae_int32 *src = source->ptr;
110111
ae_int32 *dst = (ae_int32 *)sink->ptr;
111-
ae_int32 *x_start = (ae_int32 *)source->buf_start;
112+
const ae_int32 *x_start = source->buf_start;
112113
ae_int32 *y_start = (ae_int32 *)sink->buf_start;
113-
ae_int32 *x_end = (ae_int32 *)source->buf_end;
114+
const ae_int32 *x_end = source->buf_end;
114115
ae_int32 *y_end = (ae_int32 *)sink->buf_end;
115-
ae_int32 *in, *out;
116+
const ae_int32 *in;
117+
ae_int32 *out;
116118
ae_int32x2 R, state_x, state_y;
117119
ae_int32x2 in_sample, out_sample;
118120
int x_size = x_end - x_start;
@@ -165,13 +167,14 @@ static int dcblock_s32_default(struct comp_data *cd,
165167
struct cir_buf_sink *sink,
166168
uint32_t frames)
167169
{
168-
ae_int32 *src = (ae_int32 *)source->ptr;
170+
const ae_int32 *src = source->ptr;
169171
ae_int32 *dst = (ae_int32 *)sink->ptr;
170-
ae_int32 *x_start = (ae_int32 *)source->buf_start;
172+
const ae_int32 *x_start = source->buf_start;
171173
ae_int32 *y_start = (ae_int32 *)sink->buf_start;
172-
ae_int32 *x_end = (ae_int32 *)source->buf_end;
174+
const ae_int32 *x_end = source->buf_end;
173175
ae_int32 *y_end = (ae_int32 *)sink->buf_end;
174-
ae_int32 *in, *out;
176+
const ae_int32 *in;
177+
ae_int32 *out;
175178
ae_int32x2 R, state_x, state_y;
176179
ae_int32x2 in_sample;
177180
int x_size = x_end - x_start;

‎src/audio/dcblock/dcblock_hifi4.c‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ static inline ae_int32x2 dcblock_cal(ae_int32x2 R, ae_int32x2 state_x, ae_int32
3131
}
3232

3333
/* Set source as circular buffer 0 and sink as circular buffer 1 */
34-
static inline void dcblock_set_circular(void *src_begin, void *src_end,
34+
static inline void dcblock_set_circular(const void *src_begin, const void *src_end,
3535
void *sink_begin, void *sink_end)
3636
{
3737
AE_SETCBEGIN0(src_begin);
@@ -46,13 +46,14 @@ static int dcblock_s16_default(struct comp_data *cd,
4646
struct cir_buf_sink *sink,
4747
uint32_t frames)
4848
{
49-
ae_int16 *src = (ae_int16 *)source->ptr;
49+
const ae_int16 *src = source->ptr;
5050
ae_int16 *dst = (ae_int16 *)sink->ptr;
51-
ae_int16 *x_start = (ae_int16 *)source->buf_start;
51+
const ae_int16 *x_start = source->buf_start;
5252
ae_int16 *y_start = (ae_int16 *)sink->buf_start;
53-
ae_int16 *x_end = (ae_int16 *)source->buf_end;
53+
const ae_int16 *x_end = source->buf_end;
5454
ae_int16 *y_end = (ae_int16 *)sink->buf_end;
55-
ae_int16 *in, *out;
55+
const ae_int16 *in;
56+
ae_int16 *out;
5657
ae_int32x2 R, state_x, state_y, sample;
5758
ae_int16x4 in_sample, out_sample;
5859
int nch = cd->channels;
@@ -91,13 +92,14 @@ static int dcblock_s24_default(struct comp_data *cd,
9192
struct cir_buf_sink *sink,
9293
uint32_t frames)
9394
{
94-
ae_int32 *src = (ae_int32 *)source->ptr;
95+
const ae_int32 *src = source->ptr;
9596
ae_int32 *dst = (ae_int32 *)sink->ptr;
96-
ae_int32 *x_start = (ae_int32 *)source->buf_start;
97+
const ae_int32 *x_start = source->buf_start;
9798
ae_int32 *y_start = (ae_int32 *)sink->buf_start;
98-
ae_int32 *x_end = (ae_int32 *)source->buf_end;
99+
const ae_int32 *x_end = source->buf_end;
99100
ae_int32 *y_end = (ae_int32 *)sink->buf_end;
100-
ae_int32 *in, *out;
101+
const ae_int32 *in;
102+
ae_int32 *out;
101103
ae_int32x2 R, state_x, state_y;
102104
ae_int32x2 in_sample, out_sample;
103105
int nch = cd->channels;
@@ -136,13 +138,14 @@ static int dcblock_s32_default(struct comp_data *cd,
136138
struct cir_buf_sink *sink,
137139
uint32_t frames)
138140
{
139-
ae_int32 *src = (ae_int32 *)source->ptr;
141+
const ae_int32 *src = source->ptr;
140142
ae_int32 *dst = (ae_int32 *)sink->ptr;
141-
ae_int32 *x_start = (ae_int32 *)source->buf_start;
143+
const ae_int32 *x_start = source->buf_start;
142144
ae_int32 *y_start = (ae_int32 *)sink->buf_start;
143-
ae_int32 *x_end = (ae_int32 *)source->buf_end;
145+
const ae_int32 *x_end = source->buf_end;
144146
ae_int32 *y_end = (ae_int32 *)sink->buf_end;
145-
ae_int32 *in, *out;
147+
const ae_int32 *in;
148+
ae_int32 *out;
146149
ae_int32x2 R, state_x, state_y;
147150
ae_int32x2 in_sample;
148151
int nch = cd->channels;

0 commit comments

Comments
 (0)