diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2025-06-23 02:15:00 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2025-07-03 18:17:56 +0200 |
| commit | 2db60f90dfcdfef308b80846dcd7779aaf3b2983 (patch) | |
| tree | e8434b389bd5b82fbacc995dd7d2026921c97249 | |
| parent | 589f1e5cc7286e76f196d27fb55dec94e83ff3ab (diff) | |
| download | ffmpeg-2db60f90dfcdfef308b80846dcd7779aaf3b2983.tar.gz | |
swresample/rematrix: Constify
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libswresample/rematrix.c | 2 | ||||
| -rw-r--r-- | libswresample/rematrix_template.c | 11 | ||||
| -rw-r--r-- | libswresample/swresample_internal.h | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c index ed2d9fd883..6e1fb0c66f 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -581,7 +581,7 @@ int swri_rematrix(SwrContext *s, AudioData *out, AudioData *in, int len, int mus int off = 0; if(s->mix_any_f) { - s->mix_any_f(out->ch, (const uint8_t **)in->ch, s->native_matrix, len); + s->mix_any_f(out->ch, (const uint8_t *const *)in->ch, s->native_matrix, len); return 0; } diff --git a/libswresample/rematrix_template.c b/libswresample/rematrix_template.c index 62ba3e53bf..b70e7489b0 100644 --- a/libswresample/rematrix_template.c +++ b/libswresample/rematrix_template.c @@ -50,7 +50,7 @@ #endif static void RENAME(sum2)(void *out_, const void *in1_, const void *in2_, - void *coeffp_, integer index1, integer index2, integer len) + const void *coeffp_, integer index1, integer index2, integer len) { const SAMPLE *in1 = in1_, *in2 = in2_; const COEFF *coeffp = coeffp_; @@ -63,7 +63,8 @@ static void RENAME(sum2)(void *out_, const void *in1_, const void *in2_, out[i] = R(coeff1*in1[i] + coeff2*in2[i]); } -static void RENAME(copy)(void *out_, const void *in_, void *coeffp_, integer index, integer len) +static void RENAME(copy)(void *out_, const void *in_, const void *coeffp_, + integer index, integer len) { const COEFF *coeffp = coeffp_; const SAMPLE *in = in_; @@ -74,7 +75,8 @@ static void RENAME(copy)(void *out_, const void *in_, void *coeffp_, integer ind out[i] = R(coeff*in[i]); } -static void RENAME(mix6to2)(uint8_t **out_, const uint8_t **in_, void *coeffp_, integer len) +static void RENAME(mix6to2)(uint8_t *const *out_, const uint8_t *const *in_, + const void *coeffp_, integer len) { const SAMPLE *const *const in = (const SAMPLE *const *)in_; SAMPLE *const *const out = (SAMPLE *const*)out_; @@ -88,7 +90,8 @@ static void RENAME(mix6to2)(uint8_t **out_, const uint8_t **in_, void *coeffp_, } } -static void RENAME(mix8to2)(uint8_t **out_, const uint8_t **in_, void *coeffp_, integer len) +static void RENAME(mix8to2)(uint8_t *const *out_, const uint8_t *const *in_, + const void *coeffp_, integer len) { const SAMPLE *const *const in = (const SAMPLE *const *)in_; SAMPLE *const *const out = (SAMPLE *const*)out_; diff --git a/libswresample/swresample_internal.h b/libswresample/swresample_internal.h index 7e46b16fb2..21c9e33fa1 100644 --- a/libswresample/swresample_internal.h +++ b/libswresample/swresample_internal.h @@ -37,10 +37,10 @@ typedef int64_t integer; typedef int integer; #endif -typedef void (mix_1_1_func_type)(void *out, const void *in, void *coeffp, integer index, integer len); -typedef void (mix_2_1_func_type)(void *out, const void *in1, const void *in2, void *coeffp, integer index1, integer index2, integer len); +typedef void (mix_1_1_func_type)(void *out, const void *in, const void *coeffp, integer index, integer len); +typedef void (mix_2_1_func_type)(void *out, const void *in1, const void *in2, const void *coeffp, integer index1, integer index2, integer len); -typedef void (mix_any_func_type)(uint8_t **out, const uint8_t **in1, void *coeffp, integer len); +typedef void (mix_any_func_type)(uint8_t *const *out, const uint8_t *const *in1, const void *coeffp, integer len); typedef struct AudioData{ uint8_t *ch[SWR_CH_MAX]; ///< samples buffer per channel |