virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

swresample/rematrix: Constify

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-06-23 02:15:00 +02:00
parent 589f1e5cc7
commit 2db60f90df
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libswresample/rematrix.c
View File

@ -581,7 +581,7 @@ int swri_rematrix(SwrContext *s, AudioData *out, AudioData *in, int len, int mus
int off = 0; int off = 0;
if(s->mix_any_f) { 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; return 0;
} }

11
libswresample/rematrix_template.c
View File

@ -50,7 +50,7 @@
#endif #endif
static void RENAME(sum2)(void *out_, const void *in1_, const void *in2_, 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 SAMPLE *in1 = in1_, *in2 = in2_;
const COEFF *coeffp = coeffp_; 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]); 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 COEFF *coeffp = coeffp_;
const SAMPLE *in = in_; 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]); 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_; const SAMPLE *const *const in = (const SAMPLE *const *)in_;
SAMPLE *const *const out = (SAMPLE *const*)out_; 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_; const SAMPLE *const *const in = (const SAMPLE *const *)in_;
SAMPLE *const *const out = (SAMPLE *const*)out_; SAMPLE *const *const out = (SAMPLE *const*)out_;

6
libswresample/swresample_internal.h
View File

@ -37,10 +37,10 @@ typedef int64_t integer;
typedef int integer; typedef int integer;
#endif #endif
typedef void (mix_1_1_func_type)(void *out, const void *in, void *coeffp, integer index, 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, void *coeffp, integer index1, integer index2, 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{ typedef struct AudioData{
uint8_t *ch[SWR_CH_MAX]; ///< samples buffer per channel uint8_t *ch[SWR_CH_MAX]; ///< samples buffer per channel