This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new 3e402514e5 avcodec/aacencdsp: move init methods outside of the header
3e402514e5 is described below
commit 3e402514e5e36ab5426afbe88d3df18a3b06daab
Author: James Almer <[email protected]>
AuthorDate: Thu May 28 00:01:37 2026 -0300
Commit: James Almer <[email protected]>
CommitDate: Thu May 28 00:04:06 2026 -0300
avcodec/aacencdsp: move init methods outside of the header
Signed-off-by: James Almer <[email protected]>
---
libavcodec/Makefile | 2 +-
libavcodec/{aacencdsp.h => aacencdsp.c} | 23 +++---------------
libavcodec/aacencdsp.h | 43 +--------------------------------
3 files changed, 6 insertions(+), 62 deletions(-)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index c6b878207b..ac3c4d1978 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -203,7 +203,7 @@ OBJS-$(CONFIG_AAC_FIXED_DECODER) += aactab.o \
sbrdsp_fixed.o aacpsdsp_fixed.o
cbrt_data_fixed.o \
$(if $(!CONFIG_HARDCODED_TABLES),
cbrt_tablegen_common.o)
OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o aacenctab.o \
- aacpsy.o aactab.o \
+ aacpsy.o aactab.o aacencdsp.o \
aacenc_is.o \
aacenc_tns.o \
psymodel.o kbdwin.o \
diff --git a/libavcodec/aacencdsp.h b/libavcodec/aacencdsp.c
similarity index 67%
copy from libavcodec/aacencdsp.h
copy to libavcodec/aacencdsp.c
index 77aa133691..fb809405f7 100644
--- a/libavcodec/aacencdsp.h
+++ b/libavcodec/aacencdsp.c
@@ -16,27 +16,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVCODEC_AACENCDSP_H
-#define AVCODEC_AACENCDSP_H
-
#include <math.h>
#include "config.h"
#include "libavutil/macros.h"
+#include "aacencdsp.h"
-typedef struct AACEncDSPContext {
- void (*abs_pow34)(float *out, const float *in, const int size);
- void (*quant_bands)(int *out, const float *in, const float *scaled,
- int size, int is_signed, int maxval, const float Q34,
- const float rounding);
-} AACEncDSPContext;
-
-void ff_aacenc_dsp_init_riscv(AACEncDSPContext *s);
-void ff_aacenc_dsp_init_x86(AACEncDSPContext *s);
-void ff_aacenc_dsp_init_aarch64(AACEncDSPContext *s);
-
-static inline void abs_pow34_v(float *out, const float *in, const int size)
+static void abs_pow34_v(float *out, const float *in, const int size)
{
for (int i = 0; i < size; i++) {
float a = fabsf(in[i]);
@@ -44,7 +31,7 @@ static inline void abs_pow34_v(float *out, const float *in,
const int size)
}
}
-static inline void quantize_bands(int *out, const float *in, const float
*scaled,
+static void quantize_bands(int *out, const float *in, const float *scaled,
int size, int is_signed, int maxval, const
float Q34,
const float rounding)
{
@@ -58,7 +45,7 @@ static inline void quantize_bands(int *out, const float *in,
const float *scaled
}
}
-static inline void ff_aacenc_dsp_init(AACEncDSPContext *s)
+void ff_aacenc_dsp_init(AACEncDSPContext *s)
{
s->abs_pow34 = abs_pow34_v;
s->quant_bands = quantize_bands;
@@ -71,5 +58,3 @@ static inline void ff_aacenc_dsp_init(AACEncDSPContext *s)
ff_aacenc_dsp_init_aarch64(s);
#endif
}
-
-#endif
diff --git a/libavcodec/aacencdsp.h b/libavcodec/aacencdsp.h
index 77aa133691..6d9ae221d1 100644
--- a/libavcodec/aacencdsp.h
+++ b/libavcodec/aacencdsp.h
@@ -19,12 +19,6 @@
#ifndef AVCODEC_AACENCDSP_H
#define AVCODEC_AACENCDSP_H
-#include <math.h>
-
-#include "config.h"
-
-#include "libavutil/macros.h"
-
typedef struct AACEncDSPContext {
void (*abs_pow34)(float *out, const float *in, const int size);
void (*quant_bands)(int *out, const float *in, const float *scaled,
@@ -32,44 +26,9 @@ typedef struct AACEncDSPContext {
const float rounding);
} AACEncDSPContext;
+void ff_aacenc_dsp_init(AACEncDSPContext *s);
void ff_aacenc_dsp_init_riscv(AACEncDSPContext *s);
void ff_aacenc_dsp_init_x86(AACEncDSPContext *s);
void ff_aacenc_dsp_init_aarch64(AACEncDSPContext *s);
-static inline void abs_pow34_v(float *out, const float *in, const int size)
-{
- for (int i = 0; i < size; i++) {
- float a = fabsf(in[i]);
- out[i] = sqrtf(a * sqrtf(a));
- }
-}
-
-static inline void quantize_bands(int *out, const float *in, const float
*scaled,
- int size, int is_signed, int maxval, const
float Q34,
- const float rounding)
-{
- for (int i = 0; i < size; i++) {
- float qc = scaled[i] * Q34;
- int tmp = (int)FFMIN((float)(qc + rounding), (float)maxval);
- if (is_signed && in[i] < 0.0f) {
- tmp = -tmp;
- }
- out[i] = tmp;
- }
-}
-
-static inline void ff_aacenc_dsp_init(AACEncDSPContext *s)
-{
- s->abs_pow34 = abs_pow34_v;
- s->quant_bands = quantize_bands;
-
-#if ARCH_RISCV
- ff_aacenc_dsp_init_riscv(s);
-#elif ARCH_X86 && HAVE_X86ASM
- ff_aacenc_dsp_init_x86(s);
-#elif ARCH_AARCH64
- ff_aacenc_dsp_init_aarch64(s);
-#endif
-}
-
#endif
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
