har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/ac3dsp: make len a size_t in float_to_fixed24

Browse Source 
Should simplify asm implementations, and prevent UB on at least win64.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2023-11-22 16:41:00 -03:00
parent 4af412be71
commit 567c67c6c8
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/ac3dsp.c
View File

@ -54,7 +54,7 @@ static void ac3_exponent_min_c(uint8_t *exp, int num_reuse_blocks, int nb_coefs)
} }
} }
static void float_to_fixed24_c(int32_t *dst, const float *src, unsigned int len) static void float_to_fixed24_c(int32_t *dst, const float *src, size_t len)
{ {
const float scale = 1 << 24; const float scale = 1 << 24;
do { do {

2
libavcodec/ac3dsp.h
View File

@ -53,7 +53,7 @@ typedef struct AC3DSPContext {
* @param len number of elements to convert. * @param len number of elements to convert.
* constraints: multiple of 32 greater than zero * constraints: multiple of 32 greater than zero
*/ */
void (*float_to_fixed24)(int32_t *dst, const float *src, unsigned int len); void (*float_to_fixed24)(int32_t *dst, const float *src, size_t len);
/** /**
* Calculate bit allocation pointers. * Calculate bit allocation pointers.

2
libavcodec/arm/ac3dsp_init_arm.c
View File

@ -26,7 +26,7 @@
#include "config.h" #include "config.h"
void ff_ac3_exponent_min_neon(uint8_t *exp, int num_reuse_blocks, int nb_coefs); void ff_ac3_exponent_min_neon(uint8_t *exp, int num_reuse_blocks, int nb_coefs);
void ff_float_to_fixed24_neon(int32_t *dst, const float *src, unsigned int len); void ff_float_to_fixed24_neon(int32_t *dst, const float *src, size_t len);
void ff_ac3_extract_exponents_neon(uint8_t *exp, int32_t *coef, int nb_coefs); void ff_ac3_extract_exponents_neon(uint8_t *exp, int32_t *coef, int nb_coefs);
void ff_ac3_sum_square_butterfly_int32_neon(int64_t sum[4], void ff_ac3_sum_square_butterfly_int32_neon(int64_t sum[4],
const int32_t *coef0, const int32_t *coef0,

2
libavcodec/mips/ac3dsp_mips.c
View File

@ -203,7 +203,7 @@ static void ac3_update_bap_counts_mips(uint16_t mant_cnt[16], uint8_t *bap,
#if HAVE_MIPSFPU #if HAVE_MIPSFPU
#if !HAVE_MIPS32R6 && !HAVE_MIPS64R6 #if !HAVE_MIPS32R6 && !HAVE_MIPS64R6
static void float_to_fixed24_mips(int32_t *dst, const float *src, unsigned int len) static void float_to_fixed24_mips(int32_t *dst, const float *src, size_t len)
{ {
const float scale = 1 << 24; const float scale = 1 << 24;
float src0, src1, src2, src3, src4, src5, src6, src7; float src0, src1, src2, src3, src4, src5, src6, src7;

2
libavcodec/x86/ac3dsp_init.c
View File

@ -26,7 +26,7 @@
void ff_ac3_exponent_min_sse2 (uint8_t *exp, int num_reuse_blocks, int nb_coefs); void ff_ac3_exponent_min_sse2 (uint8_t *exp, int num_reuse_blocks, int nb_coefs);
void ff_float_to_fixed24_sse2 (int32_t *dst, const float *src, unsigned int len); void ff_float_to_fixed24_sse2 (int32_t *dst, const float *src, size_t len);
int ff_ac3_compute_mantissa_size_sse2(uint16_t mant_cnt[6][16]); int ff_ac3_compute_mantissa_size_sse2(uint16_t mant_cnt[6][16]);