From: Lynne <dev@lynne.ee> To: ffmpeg-devel@ffmpeg.org Cc: Lynne <dev@lynne.ee> Subject: [FFmpeg-devel] [PATCH] aac: move SBR code to libavcodec/aac Date: Fri, 28 Feb 2025 15:50:39 +0100 Message-ID: <20250228145102.110763-1-dev@lynne.ee> (raw) In-Reply-To: <20250228135445.101947-1-dev@lynne.ee> --- libavcodec/Makefile | 8 -------- libavcodec/aac/Makefile | 9 +++++++++ libavcodec/{ => aac}/aac_defines.h | 0 libavcodec/aac/aacdec.c | 4 ++-- libavcodec/aac/aacdec_fixed.c | 4 ++-- libavcodec/aac/aacdec_float.c | 4 ++-- libavcodec/aac/aacdec_tab.c | 2 +- libavcodec/aac/aacdec_usac.c | 2 +- libavcodec/{ => aac}/aacps.c | 0 libavcodec/{ => aac}/aacps.h | 2 +- libavcodec/{ => aac}/aacps_common.c | 2 +- libavcodec/{ => aac}/aacps_fixed.c | 0 libavcodec/{ => aac}/aacps_fixed_tablegen.c | 0 libavcodec/{ => aac}/aacps_fixed_tablegen.h | 0 libavcodec/{ => aac}/aacps_float.c | 0 libavcodec/{ => aac}/aacps_tablegen.c | 0 libavcodec/{ => aac}/aacps_tablegen.h | 0 libavcodec/{ => aac}/aacps_tablegen_template.c | 0 libavcodec/{ => aac}/aacpsdata.c | 0 libavcodec/{ => aac}/aacpsdsp.h | 0 libavcodec/{ => aac}/aacpsdsp_fixed.c | 0 libavcodec/{ => aac}/aacpsdsp_float.c | 0 libavcodec/{ => aac}/aacpsdsp_template.c | 0 libavcodec/{ => aac}/aacsbr.c | 2 +- libavcodec/{ => aac}/aacsbr.h | 4 ++-- libavcodec/{ => aac}/aacsbr_fixed.c | 2 +- libavcodec/{ => aac}/aacsbr_template.c | 6 +++--- libavcodec/{ => aac}/aacsbrdata.h | 0 libavcodec/{ => aac}/sbr.h | 0 libavcodec/{ => aac}/sbrdsp.c | 2 +- libavcodec/{ => aac}/sbrdsp.h | 0 libavcodec/{ => aac}/sbrdsp_fixed.c | 2 +- libavcodec/{ => aac}/sbrdsp_template.c | 0 libavcodec/aarch64/aacpsdsp_init_aarch64.c | 2 +- libavcodec/aarch64/sbrdsp_init_aarch64.c | 2 +- libavcodec/cbrt_tablegen.h | 2 +- libavcodec/x86/aacpsdsp_init.c | 2 +- libavcodec/x86/sbrdsp_init.c | 2 +- 38 files changed, 33 insertions(+), 32 deletions(-) rename libavcodec/{ => aac}/aac_defines.h (100%) rename libavcodec/{ => aac}/aacps.c (100%) rename libavcodec/{ => aac}/aacps.h (99%) rename libavcodec/{ => aac}/aacps_common.c (99%) rename libavcodec/{ => aac}/aacps_fixed.c (100%) rename libavcodec/{ => aac}/aacps_fixed_tablegen.c (100%) rename libavcodec/{ => aac}/aacps_fixed_tablegen.h (100%) rename libavcodec/{ => aac}/aacps_float.c (100%) rename libavcodec/{ => aac}/aacps_tablegen.c (100%) rename libavcodec/{ => aac}/aacps_tablegen.h (100%) rename libavcodec/{ => aac}/aacps_tablegen_template.c (100%) rename libavcodec/{ => aac}/aacpsdata.c (100%) rename libavcodec/{ => aac}/aacpsdsp.h (100%) rename libavcodec/{ => aac}/aacpsdsp_fixed.c (100%) rename libavcodec/{ => aac}/aacpsdsp_float.c (100%) rename libavcodec/{ => aac}/aacpsdsp_template.c (100%) rename libavcodec/{ => aac}/aacsbr.c (99%) rename libavcodec/{ => aac}/aacsbr.h (98%) rename libavcodec/{ => aac}/aacsbr_fixed.c (99%) rename libavcodec/{ => aac}/aacsbr_template.c (99%) rename libavcodec/{ => aac}/aacsbrdata.h (100%) rename libavcodec/{ => aac}/sbr.h (100%) rename libavcodec/{ => aac}/sbrdsp.c (99%) rename libavcodec/{ => aac}/sbrdsp.h (100%) rename libavcodec/{ => aac}/sbrdsp_fixed.c (99%) rename libavcodec/{ => aac}/sbrdsp_template.c (100%) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1b3e22eaf6..da8b14efb9 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -186,14 +186,6 @@ OBJS-$(CONFIG_WMV2DSP) += wmv2dsp.o OBJS-$(CONFIG_ZERO12V_DECODER) += 012v.o OBJS-$(CONFIG_A64MULTI_ENCODER) += a64multienc.o elbg.o OBJS-$(CONFIG_A64MULTI5_ENCODER) += a64multienc.o elbg.o -OBJS-$(CONFIG_AAC_DECODER) += aac/aactab.o \ - aacsbr.o aacps_common.o aacps_float.o \ - kbdwin.o \ - sbrdsp.o aacpsdsp_float.o cbrt_data.o -OBJS-$(CONFIG_AAC_FIXED_DECODER) += aac/aactab.o \ - aacsbr_fixed.o aacps_common.o aacps_fixed.o \ - kbdwin.o \ - sbrdsp_fixed.o aacpsdsp_fixed.o cbrt_data_fixed.o OBJS-$(CONFIG_AAC_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_AAC_MF_ENCODER) += mfenc.o mf_utils.o OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o diff --git a/libavcodec/aac/Makefile b/libavcodec/aac/Makefile index a956fb6cb6..c1973d2338 100644 --- a/libavcodec/aac/Makefile +++ b/libavcodec/aac/Makefile @@ -7,6 +7,15 @@ OBJS-$(CONFIG_AAC_DECODER) += aac/aacdec.o aac/aacdec_tab.o \ OBJS-$(CONFIG_AAC_FIXED_DECODER) += aac/aacdec.o aac/aacdec_tab.o \ aac/aacdec_fixed.o +OBJS-$(CONFIG_AAC_DECODER) += aac/aactab.o \ + aac/aacsbr.o aac/aacps_common.o aac/aacps_float.o \ + kbdwin.o \ + aac/sbrdsp.o aac/aacpsdsp_float.o cbrt_data.o +OBJS-$(CONFIG_AAC_FIXED_DECODER) += aac/aactab.o \ + aac/aacsbr_fixed.o aac/aacps_common.o aac/aacps_fixed.o \ + kbdwin.o \ + aac/sbrdsp_fixed.o aac/aacpsdsp_fixed.o cbrt_data_fixed.o + OBJS-$(CONFIG_AAC_ENCODER) += aac/aacenc.o aac/aaccoder.o aac/aacenctab.o \ aac/aacpsy.o aac/aactab.o \ aac/aacenc_is.o \ diff --git a/libavcodec/aac_defines.h b/libavcodec/aac/aac_defines.h similarity index 100% rename from libavcodec/aac_defines.h rename to libavcodec/aac/aac_defines.h diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c index c48edb66c9..5a4c726599 100644 --- a/libavcodec/aac/aacdec.c +++ b/libavcodec/aac/aacdec.c @@ -43,8 +43,8 @@ #include "aacdec_usac.h" #include "aac.h" -#include "libavcodec/aac_defines.h" -#include "libavcodec/aacsbr.h" +#include "aac_defines.h" +#include "aacsbr.h" #include "aactab.h" #include "libavcodec/adts_header.h" diff --git a/libavcodec/aac/aacdec_fixed.c b/libavcodec/aac/aacdec_fixed.c index dbf312cfdd..6bea92f1fa 100644 --- a/libavcodec/aac/aacdec_fixed.c +++ b/libavcodec/aac/aacdec_fixed.c @@ -33,7 +33,7 @@ #include "libavutil/thread.h" -#include "libavcodec/aac_defines.h" +#include "aac_defines.h" #include "libavcodec/avcodec.h" #include "aacdec.h" @@ -41,7 +41,7 @@ #include "libavcodec/sinewin_fixed_tablegen.h" #include "libavcodec/kbdwin.h" #include "libavcodec/cbrt_data.h" -#include "libavcodec/aacsbr.h" +#include "aacsbr.h" DECLARE_ALIGNED(32, static int, aac_kbd_long_1024_fixed)[1024]; DECLARE_ALIGNED(32, static int, aac_kbd_short_128_fixed)[128]; diff --git a/libavcodec/aac/aacdec_float.c b/libavcodec/aac/aacdec_float.c index c9b1035ab4..03481c17ea 100644 --- a/libavcodec/aac/aacdec_float.c +++ b/libavcodec/aac/aacdec_float.c @@ -33,7 +33,7 @@ #include "libavutil/thread.h" -#include "libavcodec/aac_defines.h" +#include "aac_defines.h" #include "libavcodec/avcodec.h" #include "aacdec.h" @@ -42,7 +42,7 @@ #include "libavcodec/kbdwin.h" #include "libavcodec/cbrt_data.h" #include "libavutil/mathematics.h" -#include "libavcodec/aacsbr.h" +#include "aacsbr.h" DECLARE_ALIGNED(32, static float, sine_96)[96]; DECLARE_ALIGNED(32, static float, sine_120)[120]; diff --git a/libavcodec/aac/aacdec_tab.c b/libavcodec/aac/aacdec_tab.c index 093afeafc4..587ccb3be7 100644 --- a/libavcodec/aac/aacdec_tab.c +++ b/libavcodec/aac/aacdec_tab.c @@ -28,7 +28,7 @@ #include "aacdec_tab.h" #include "aac.h" -#include "libavcodec/aacps.h" +#include "aacps.h" #include "aactab.h" #include "libavcodec/vlc.h" diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index 7bb871b6f0..046537210b 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -23,7 +23,7 @@ #include "aacdec_lpd.h" #include "aacdec_ac.h" -#include "libavcodec/aacsbr.h" +#include "aacsbr.h" #include "aactab.h" #include "libavutil/mem.h" diff --git a/libavcodec/aacps.c b/libavcodec/aac/aacps.c similarity index 100% rename from libavcodec/aacps.c rename to libavcodec/aac/aacps.c diff --git a/libavcodec/aacps.h b/libavcodec/aac/aacps.h similarity index 99% rename from libavcodec/aacps.h rename to libavcodec/aac/aacps.h index 08c92dc404..f3c4ec52b9 100644 --- a/libavcodec/aacps.h +++ b/libavcodec/aac/aacps.h @@ -27,7 +27,7 @@ #include "libavutil/mem_internal.h" #include "aacpsdsp.h" -#include "get_bits.h" +#include "libavcodec/get_bits.h" #define PS_MAX_NUM_ENV 5 #define PS_MAX_NR_IIDICC 34 diff --git a/libavcodec/aacps_common.c b/libavcodec/aac/aacps_common.c similarity index 99% rename from libavcodec/aacps_common.c rename to libavcodec/aac/aacps_common.c index 74fa005aaf..31143570e3 100644 --- a/libavcodec/aacps_common.c +++ b/libavcodec/aac/aacps_common.c @@ -22,7 +22,7 @@ #include <stdint.h> #include "libavutil/common.h" #include "aacps.h" -#include "get_bits.h" +#include "libavcodec/get_bits.h" #include "aacpsdata.c" static const int8_t num_env_tab[2][4] = { diff --git a/libavcodec/aacps_fixed.c b/libavcodec/aac/aacps_fixed.c similarity index 100% rename from libavcodec/aacps_fixed.c rename to libavcodec/aac/aacps_fixed.c diff --git a/libavcodec/aacps_fixed_tablegen.c b/libavcodec/aac/aacps_fixed_tablegen.c similarity index 100% rename from libavcodec/aacps_fixed_tablegen.c rename to libavcodec/aac/aacps_fixed_tablegen.c diff --git a/libavcodec/aacps_fixed_tablegen.h b/libavcodec/aac/aacps_fixed_tablegen.h similarity index 100% rename from libavcodec/aacps_fixed_tablegen.h rename to libavcodec/aac/aacps_fixed_tablegen.h diff --git a/libavcodec/aacps_float.c b/libavcodec/aac/aacps_float.c similarity index 100% rename from libavcodec/aacps_float.c rename to libavcodec/aac/aacps_float.c diff --git a/libavcodec/aacps_tablegen.c b/libavcodec/aac/aacps_tablegen.c similarity index 100% rename from libavcodec/aacps_tablegen.c rename to libavcodec/aac/aacps_tablegen.c diff --git a/libavcodec/aacps_tablegen.h b/libavcodec/aac/aacps_tablegen.h similarity index 100% rename from libavcodec/aacps_tablegen.h rename to libavcodec/aac/aacps_tablegen.h diff --git a/libavcodec/aacps_tablegen_template.c b/libavcodec/aac/aacps_tablegen_template.c similarity index 100% rename from libavcodec/aacps_tablegen_template.c rename to libavcodec/aac/aacps_tablegen_template.c diff --git a/libavcodec/aacpsdata.c b/libavcodec/aac/aacpsdata.c similarity index 100% rename from libavcodec/aacpsdata.c rename to libavcodec/aac/aacpsdata.c diff --git a/libavcodec/aacpsdsp.h b/libavcodec/aac/aacpsdsp.h similarity index 100% rename from libavcodec/aacpsdsp.h rename to libavcodec/aac/aacpsdsp.h diff --git a/libavcodec/aacpsdsp_fixed.c b/libavcodec/aac/aacpsdsp_fixed.c similarity index 100% rename from libavcodec/aacpsdsp_fixed.c rename to libavcodec/aac/aacpsdsp_fixed.c diff --git a/libavcodec/aacpsdsp_float.c b/libavcodec/aac/aacpsdsp_float.c similarity index 100% rename from libavcodec/aacpsdsp_float.c rename to libavcodec/aac/aacpsdsp_float.c diff --git a/libavcodec/aacpsdsp_template.c b/libavcodec/aac/aacpsdsp_template.c similarity index 100% rename from libavcodec/aacpsdsp_template.c rename to libavcodec/aac/aacpsdsp_template.c diff --git a/libavcodec/aacsbr.c b/libavcodec/aac/aacsbr.c similarity index 99% rename from libavcodec/aacsbr.c rename to libavcodec/aac/aacsbr.c index a7cc4c1f95..78f0aead8e 100644 --- a/libavcodec/aacsbr.c +++ b/libavcodec/aac/aacsbr.c @@ -27,7 +27,7 @@ */ #define USE_FIXED 0 -#include "aac/aac.h" +#include "aac.h" #include "sbr.h" #include "aacsbr.h" #include "aacsbrdata.h" diff --git a/libavcodec/aacsbr.h b/libavcodec/aac/aacsbr.h similarity index 98% rename from libavcodec/aacsbr.h rename to libavcodec/aac/aacsbr.h index 3958b43b91..295923d976 100644 --- a/libavcodec/aacsbr.h +++ b/libavcodec/aac/aacsbr.h @@ -29,8 +29,8 @@ #ifndef AVCODEC_AACSBR_H #define AVCODEC_AACSBR_H -#include "get_bits.h" -#include "aac/aacdec.h" +#include "libavcodec/get_bits.h" +#include "aacdec.h" #include "libavutil/attributes_internal.h" diff --git a/libavcodec/aacsbr_fixed.c b/libavcodec/aac/aacsbr_fixed.c similarity index 99% rename from libavcodec/aacsbr_fixed.c rename to libavcodec/aac/aacsbr_fixed.c index eaec8571e8..06d07e1941 100644 --- a/libavcodec/aacsbr_fixed.c +++ b/libavcodec/aac/aacsbr_fixed.c @@ -56,7 +56,7 @@ */ #define USE_FIXED 1 -#include "aac/aac.h" +#include "aac.h" #include "sbr.h" #include "aacsbr.h" #include "aacsbrdata.h" diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aac/aacsbr_template.c similarity index 99% rename from libavcodec/aacsbr_template.c rename to libavcodec/aac/aacsbr_template.c index 9fae44d9a5..b8ce403970 100644 --- a/libavcodec/aacsbr_template.c +++ b/libavcodec/aac/aacsbr_template.c @@ -32,9 +32,9 @@ * @author Zoran Basaric ( zoran.basaric@imgtec.com ) */ -#include "aac/aacdec.h" -#include "aac/aacdec_tab.h" -#include "avcodec.h" +#include "aacdec.h" +#include "aacdec_tab.h" +#include "libavcodec/avcodec.h" #include "libavutil/qsort.h" #include "libavutil/mem.h" diff --git a/libavcodec/aacsbrdata.h b/libavcodec/aac/aacsbrdata.h similarity index 100% rename from libavcodec/aacsbrdata.h rename to libavcodec/aac/aacsbrdata.h diff --git a/libavcodec/sbr.h b/libavcodec/aac/sbr.h similarity index 100% rename from libavcodec/sbr.h rename to libavcodec/aac/sbr.h diff --git a/libavcodec/sbrdsp.c b/libavcodec/aac/sbrdsp.c similarity index 99% rename from libavcodec/sbrdsp.c rename to libavcodec/aac/sbrdsp.c index edf5bc4248..8d6ffdfe7e 100644 --- a/libavcodec/sbrdsp.c +++ b/libavcodec/aac/sbrdsp.c @@ -22,7 +22,7 @@ #define USE_FIXED 0 -#include "aac/aac.h" +#include "aac.h" #include "libavutil/attributes.h" #include "libavutil/intfloat.h" #include "sbrdsp.h" diff --git a/libavcodec/sbrdsp.h b/libavcodec/aac/sbrdsp.h similarity index 100% rename from libavcodec/sbrdsp.h rename to libavcodec/aac/sbrdsp.h diff --git a/libavcodec/sbrdsp_fixed.c b/libavcodec/aac/sbrdsp_fixed.c similarity index 99% rename from libavcodec/sbrdsp_fixed.c rename to libavcodec/aac/sbrdsp_fixed.c index 71c8606491..f5784f801d 100644 --- a/libavcodec/sbrdsp_fixed.c +++ b/libavcodec/aac/sbrdsp_fixed.c @@ -25,7 +25,7 @@ #define USE_FIXED 1 -#include "aac/aac.h" +#include "aac.h" #include "libavutil/attributes.h" #include "libavutil/intfloat.h" #include "sbrdsp.h" diff --git a/libavcodec/sbrdsp_template.c b/libavcodec/aac/sbrdsp_template.c similarity index 100% rename from libavcodec/sbrdsp_template.c rename to libavcodec/aac/sbrdsp_template.c diff --git a/libavcodec/aarch64/aacpsdsp_init_aarch64.c b/libavcodec/aarch64/aacpsdsp_init_aarch64.c index cc9e4d79bd..e1d6a52162 100644 --- a/libavcodec/aarch64/aacpsdsp_init_aarch64.c +++ b/libavcodec/aarch64/aacpsdsp_init_aarch64.c @@ -20,7 +20,7 @@ #include "libavutil/attributes.h" #include "libavutil/aarch64/cpu.h" -#include "libavcodec/aacpsdsp.h" +#include "libavcodec/aac/aacpsdsp.h" void ff_ps_add_squares_neon(float *dst, const float (*src)[2], int n); void ff_ps_mul_pair_single_neon(float (*dst)[2], float (*src0)[2], diff --git a/libavcodec/aarch64/sbrdsp_init_aarch64.c b/libavcodec/aarch64/sbrdsp_init_aarch64.c index 9c967990df..1f395824c1 100644 --- a/libavcodec/aarch64/sbrdsp_init_aarch64.c +++ b/libavcodec/aarch64/sbrdsp_init_aarch64.c @@ -19,7 +19,7 @@ #include "config.h" #include "libavutil/aarch64/cpu.h" #include "libavutil/attributes.h" -#include "libavcodec/sbrdsp.h" +#include "libavcodec/aac/sbrdsp.h" void ff_sbr_sum64x5_neon(float *z); float ff_sbr_sum_square_neon(float (*x)[2], int n); diff --git a/libavcodec/cbrt_tablegen.h b/libavcodec/cbrt_tablegen.h index 9af18d8ab5..c054c20e6d 100644 --- a/libavcodec/cbrt_tablegen.h +++ b/libavcodec/cbrt_tablegen.h @@ -27,7 +27,7 @@ #include <math.h> #include "libavutil/attributes.h" #include "libavutil/intfloat.h" -#include "libavcodec/aac_defines.h" +#include "libavcodec/aac/aac_defines.h" #if USE_FIXED #define CBRT(x) lrint((x) * 8192) diff --git a/libavcodec/x86/aacpsdsp_init.c b/libavcodec/x86/aacpsdsp_init.c index 0b0ee07db4..41bad9836a 100644 --- a/libavcodec/x86/aacpsdsp_init.c +++ b/libavcodec/x86/aacpsdsp_init.c @@ -24,7 +24,7 @@ #include "libavutil/x86/cpu.h" #include "libavutil/attributes.h" -#include "libavcodec/aacpsdsp.h" +#include "libavcodec/aac/aacpsdsp.h" void ff_ps_add_squares_sse (float *dst, const float (*src)[2], int n); void ff_ps_add_squares_sse3 (float *dst, const float (*src)[2], int n); diff --git a/libavcodec/x86/sbrdsp_init.c b/libavcodec/x86/sbrdsp_init.c index 999f681220..7341e4d1cd 100644 --- a/libavcodec/x86/sbrdsp_init.c +++ b/libavcodec/x86/sbrdsp_init.c @@ -23,7 +23,7 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/x86/cpu.h" -#include "libavcodec/sbrdsp.h" +#include "libavcodec/aac/sbrdsp.h" float ff_sbr_sum_square_sse(float (*x)[2], int n); void ff_sbr_sum64x5_sse(float *z); -- 2.47.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
prev parent reply other threads:[~2025-02-28 14:51 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2025-02-28 13:54 [FFmpeg-devel] [PATCH v2] aacenc: move encoder to libavcodec/aac/ Lynne 2025-02-28 14:50 ` Lynne [this message]
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20250228145102.110763-1-dev@lynne.ee \ --to=dev@lynne.ee \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git