This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit b5ce98b3ff4266e45898153b8ea1c5e6ddae0a75 Author: Andreas Rheinhardt <[email protected]> AuthorDate: Mon Mar 23 19:14:34 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Sat Mar 28 11:25:38 2026 +0100 avcodec/sbcdsp: Constify Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/arm/sbcdsp_init_arm.c | 2 +- libavcodec/sbcdsp.c | 16 ++++++++-------- libavcodec/sbcdsp.h | 6 +++--- libavcodec/x86/sbcdsp.asm | 2 +- libavcodec/x86/sbcdsp_init.c | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libavcodec/arm/sbcdsp_init_arm.c b/libavcodec/arm/sbcdsp_init_arm.c index b3a2c3d083..9463c75c2c 100644 --- a/libavcodec/arm/sbcdsp_init_arm.c +++ b/libavcodec/arm/sbcdsp_init_arm.c @@ -40,7 +40,7 @@ void ff_sbc_analyze_8_armv6(const int16_t *in, int32_t *out, const int16_t *cons void ff_sbc_analyze_4_neon(const int16_t *in, int32_t *out, const int16_t *consts); void ff_sbc_analyze_8_neon(const int16_t *in, int32_t *out, const int16_t *consts); -void ff_sbc_calc_scalefactors_neon(int32_t sb_sample_f[16][2][8], +void ff_sbc_calc_scalefactors_neon(const int32_t sb_sample_f[16][2][8], uint32_t scale_factor[2][8], int blocks, int channels, int subbands); int ff_sbc_calc_scalefactors_j_neon(int32_t sb_sample_f[16][2][8], diff --git a/libavcodec/sbcdsp.c b/libavcodec/sbcdsp.c index 5674bdc4a7..7c298c1d15 100644 --- a/libavcodec/sbcdsp.c +++ b/libavcodec/sbcdsp.c @@ -103,8 +103,8 @@ static void sbc_analyze_8_simd(const int16_t *in, int32_t *out, sbc_analyze_simd(in, out, consts, 8); } -static inline void sbc_analyze_4b_4s_simd(SBCDSPContext *s, - int16_t *x, int32_t *out, int out_stride) +static inline void sbc_analyze_4b_4s_simd(SBCDSPContext *s, const int16_t *x, + int32_t *out, int out_stride) { /* Analyze blocks */ s->sbc_analyze_4(x + 12, out, sbcdsp_analysis_consts_fixed4_simd_odd); @@ -116,8 +116,8 @@ static inline void sbc_analyze_4b_4s_simd(SBCDSPContext *s, s->sbc_analyze_4(x + 0, out, sbcdsp_analysis_consts_fixed4_simd_even); } -static inline void sbc_analyze_4b_8s_simd(SBCDSPContext *s, - int16_t *x, int32_t *out, int out_stride) +static inline void sbc_analyze_4b_8s_simd(SBCDSPContext *s, const int16_t *x, + int32_t *out, int out_stride) { /* Analyze blocks */ s->sbc_analyze_8(x + 24, out, sbcdsp_analysis_consts_fixed8_simd_odd); @@ -130,11 +130,11 @@ static inline void sbc_analyze_4b_8s_simd(SBCDSPContext *s, } static inline void sbc_analyze_1b_8s_simd_even(SBCDSPContext *s, - int16_t *x, int32_t *out, + const int16_t *x, int32_t *out, int out_stride); static inline void sbc_analyze_1b_8s_simd_odd(SBCDSPContext *s, - int16_t *x, int32_t *out, + const int16_t *x, int32_t *out, int out_stride) { s->sbc_analyze_8(x, out, sbcdsp_analysis_consts_fixed8_simd_odd); @@ -142,7 +142,7 @@ static inline void sbc_analyze_1b_8s_simd_odd(SBCDSPContext *s, } static inline void sbc_analyze_1b_8s_simd_even(SBCDSPContext *s, - int16_t *x, int32_t *out, + const int16_t *x, int32_t *out, int out_stride) { s->sbc_analyze_8(x, out, sbcdsp_analysis_consts_fixed8_simd_even); @@ -267,7 +267,7 @@ static int sbc_enc_process_input_8s(int position, const uint8_t *pcm, return position; } -static void sbc_calc_scalefactors(int32_t sb_sample_f[16][2][8], +static void sbc_calc_scalefactors(const int32_t sb_sample_f[16][2][8], uint32_t scale_factor[2][8], int blocks, int channels, int subbands) { diff --git a/libavcodec/sbcdsp.h b/libavcodec/sbcdsp.h index 20266bf25e..828ff852d1 100644 --- a/libavcodec/sbcdsp.h +++ b/libavcodec/sbcdsp.h @@ -53,11 +53,11 @@ struct sbc_dsp_context { /* Polyphase analysis filter for 4 subbands configuration, * it handles "increment" blocks at once */ void (*sbc_analyze_4s)(SBCDSPContext *s, - int16_t *x, int32_t *out, int out_stride); + const int16_t *x, int32_t *out, int out_stride); /* Polyphase analysis filter for 8 subbands configuration, * it handles "increment" blocks at once */ void (*sbc_analyze_8s)(SBCDSPContext *s, - int16_t *x, int32_t *out, int out_stride); + const int16_t *x, int32_t *out, int out_stride); /* Process input data (deinterleave, endian conversion, reordering), * depending on the number of subbands and input data byte order */ int (*sbc_enc_process_input_4s)(int position, const uint8_t *pcm, @@ -67,7 +67,7 @@ struct sbc_dsp_context { int16_t X[2][SBC_X_BUFFER_SIZE], int nsamples, int nchannels); /* Scale factors calculation */ - void (*sbc_calc_scalefactors)(int32_t sb_sample_f[16][2][8], + void (*sbc_calc_scalefactors)(const int32_t sb_sample_f[16][2][8], uint32_t scale_factor[2][8], int blocks, int channels, int subbands); /* Scale factors calculation with joint stereo support */ diff --git a/libavcodec/x86/sbcdsp.asm b/libavcodec/x86/sbcdsp.asm index d46141b40c..ddc1237d8f 100644 --- a/libavcodec/x86/sbcdsp.asm +++ b/libavcodec/x86/sbcdsp.asm @@ -115,7 +115,7 @@ cglobal sbc_analyze_8, 3, 3, 4, in, out, consts ;******************************************************************* -;void ff_sbc_calc_scalefactors(int32_t sb_sample_f[16][2][8], +;void ff_sbc_calc_scalefactors(const int32_t sb_sample_f[16][2][8], ; uint32_t scale_factor[2][8], ; int blocks, int channels, int subbands) ;******************************************************************* diff --git a/libavcodec/x86/sbcdsp_init.c b/libavcodec/x86/sbcdsp_init.c index 7416a86ac6..d959f76f8c 100644 --- a/libavcodec/x86/sbcdsp_init.c +++ b/libavcodec/x86/sbcdsp_init.c @@ -36,7 +36,7 @@ void ff_sbc_analyze_4_mmx(const int16_t *in, int32_t *out, const int16_t *consts); void ff_sbc_analyze_8_mmx(const int16_t *in, int32_t *out, const int16_t *consts); -void ff_sbc_calc_scalefactors_mmx(int32_t sb_sample_f[16][2][8], +void ff_sbc_calc_scalefactors_mmx(const int32_t sb_sample_f[16][2][8], uint32_t scale_factor[2][8], int blocks, int channels, int subbands); _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
