From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 5A5424DB50 for ; Fri, 28 Feb 2025 13:55:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2555A68DEAB; Fri, 28 Feb 2025 15:55:01 +0200 (EET) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B099468DAB8 for ; Fri, 28 Feb 2025 15:54:54 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; s=202405r; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1740750894; bh=JtjA68sKa8423DJg0OiHQRE xoJ351yfdUUDvr1ImJzA=; b=G4TLFg0sNxmM2hsUBkAGGRsyKGjk9xc3dqW7H70e9YfONIWHwV iPomQ4SDjNvVvHGfk4jGH5feKTOkEfbvUjfkYT2C/iwk9K7zEb70x8lqfL5LyBdA+G19dHbdU06 si7ZsZbwhZqJWw6cror4JRETTXZyg7MPu/IdZtiaxW8PmY7NS4KFCGaJQS1j4QUnuD//qbGW5xB 6x6xjR04dYi/pMWS+7DUN1XGk3uHe6GH/navbNOZn1ONrIJAd9mWC6Px/S/Fwu2VMRNLLPSCl/r mf/gc3KDlCxafhjsQ0jmLALgo7iwE+8psLzFXYWRRNQRtkv3e/W1ErVhvKYPaZpGi0g==; DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1740750894; bh=JtjA68sKa8423DJg0OiHQRE xoJ351yfdUUDvr1ImJzA=; b=irRO3FuM3gjX1m0JfyV/iWtfGwMAnmaOCZgaJiiywpWDucICx6 57dMNS+4F5x5NVjkUI9IqeSqQLzIkkSHfzDg==; From: Lynne To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Feb 2025 14:54:40 +0100 Message-ID: <20250228135445.101947-1-dev@lynne.ee> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] aacenc: move encoder to libavcodec/aac/ X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Lynne Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavcodec/Makefile | 18 ++++++------------ libavcodec/aac/Makefile | 7 +++++++ libavcodec/{ => aac}/aac.h | 0 libavcodec/{ => aac}/aaccoder.c | 10 +++++----- libavcodec/{ => aac}/aaccoder_trellis.h | 4 ++-- libavcodec/{ => aac}/aaccoder_twoloop.h | 6 +++--- libavcodec/aac/aacdec.c | 4 ++-- libavcodec/aac/aacdec.h | 2 +- libavcodec/aac/aacdec_ac.c | 2 +- libavcodec/aac/aacdec_dsp_template.c | 2 +- libavcodec/aac/aacdec_fixed.c | 2 +- libavcodec/aac/aacdec_float.c | 2 +- libavcodec/aac/aacdec_tab.c | 4 ++-- libavcodec/aac/aacdec_usac.c | 2 +- libavcodec/{ => aac}/aacenc.c | 18 +++++++++--------- libavcodec/{ => aac}/aacenc.h | 11 +++++------ libavcodec/{ => aac}/aacenc_is.c | 0 libavcodec/{ => aac}/aacenc_is.h | 0 libavcodec/{ => aac}/aacenc_quantization.h | 2 +- .../{ => aac}/aacenc_quantization_misc.h | 0 libavcodec/{ => aac}/aacenc_tns.c | 2 +- libavcodec/{ => aac}/aacenc_tns.h | 0 libavcodec/{ => aac}/aacenc_utils.h | 0 libavcodec/{ => aac}/aacencdsp.h | 0 libavcodec/{ => aac}/aacenctab.c | 0 libavcodec/{ => aac}/aacenctab.h | 3 ++- libavcodec/{ => aac}/aacpsy.c | 4 ++-- libavcodec/{ => aac}/aactab.c | 4 ++-- libavcodec/{ => aac}/aactab.h | 0 libavcodec/aacsbr.c | 2 +- libavcodec/aacsbr_fixed.c | 2 +- libavcodec/aarch64/aacencdsp_init.c | 2 +- libavcodec/sbrdsp.c | 2 +- libavcodec/sbrdsp_fixed.c | 2 +- libavcodec/x86/aacencdsp_init.c | 2 +- 35 files changed, 61 insertions(+), 60 deletions(-) rename libavcodec/{ => aac}/aac.h (100%) rename libavcodec/{ => aac}/aaccoder.c (99%) rename libavcodec/{ => aac}/aaccoder_trellis.h (99%) rename libavcodec/{ => aac}/aaccoder_twoloop.h (99%) rename libavcodec/{ => aac}/aacenc.c (99%) rename libavcodec/{ => aac}/aacenc.h (98%) rename libavcodec/{ => aac}/aacenc_is.c (100%) rename libavcodec/{ => aac}/aacenc_is.h (100%) rename libavcodec/{ => aac}/aacenc_quantization.h (98%) rename libavcodec/{ => aac}/aacenc_quantization_misc.h (100%) rename libavcodec/{ => aac}/aacenc_tns.c (99%) rename libavcodec/{ => aac}/aacenc_tns.h (100%) rename libavcodec/{ => aac}/aacenc_utils.h (100%) rename libavcodec/{ => aac}/aacencdsp.h (100%) rename libavcodec/{ => aac}/aacenctab.c (100%) rename libavcodec/{ => aac}/aacenctab.h (99%) rename libavcodec/{ => aac}/aacpsy.c (99%) rename libavcodec/{ => aac}/aactab.c (99%) rename libavcodec/{ => aac}/aactab.h (100%) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 499f826635..1b3e22eaf6 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -186,20 +186,14 @@ 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) += aactab.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) += aactab.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_ENCODER) += aacenc.o aaccoder.o aacenctab.o \ - aacpsy.o aactab.o \ - aacenc_is.o \ - aacenc_tns.o \ - psymodel.o kbdwin.o \ - mpeg4audio_sample_rates.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 @@ -819,10 +813,10 @@ OBJS-$(CONFIG_WEBVTT_DECODER) += webvttdec.o ass.o OBJS-$(CONFIG_WEBVTT_ENCODER) += webvttenc.o ass_split.o OBJS-$(CONFIG_WMALOSSLESS_DECODER) += wmalosslessdec.o wma_common.o OBJS-$(CONFIG_WMAPRO_DECODER) += wmaprodec.o wma.o wma_common.o -OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.o wma.o wma_common.o aactab.o -OBJS-$(CONFIG_WMAV1_ENCODER) += wmaenc.o wma.o wma_common.o aactab.o -OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.o wma.o wma_common.o aactab.o -OBJS-$(CONFIG_WMAV2_ENCODER) += wmaenc.o wma.o wma_common.o aactab.o +OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.o wma.o wma_common.o aac/aactab.o +OBJS-$(CONFIG_WMAV1_ENCODER) += wmaenc.o wma.o wma_common.o aac/aactab.o +OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.o wma.o wma_common.o aac/aactab.o +OBJS-$(CONFIG_WMAV2_ENCODER) += wmaenc.o wma.o wma_common.o aac/aactab.o OBJS-$(CONFIG_WMAVOICE_DECODER) += wmavoice.o \ celp_filters.o \ acelp_vectors.o acelp_filters.o diff --git a/libavcodec/aac/Makefile b/libavcodec/aac/Makefile index 70b1dca274..a956fb6cb6 100644 --- a/libavcodec/aac/Makefile +++ b/libavcodec/aac/Makefile @@ -6,3 +6,10 @@ OBJS-$(CONFIG_AAC_DECODER) += aac/aacdec.o aac/aacdec_tab.o \ aac/aacdec_ac.o aac/aacdec_lpd.o OBJS-$(CONFIG_AAC_FIXED_DECODER) += aac/aacdec.o aac/aacdec_tab.o \ aac/aacdec_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 \ + aac/aacenc_tns.o \ + psymodel.o kbdwin.o \ + mpeg4audio_sample_rates.o diff --git a/libavcodec/aac.h b/libavcodec/aac/aac.h similarity index 100% rename from libavcodec/aac.h rename to libavcodec/aac/aac.h diff --git a/libavcodec/aaccoder.c b/libavcodec/aac/aaccoder.c similarity index 99% rename from libavcodec/aaccoder.c rename to libavcodec/aac/aaccoder.c index 96915c9731..e1a4fbdc9d 100644 --- a/libavcodec/aaccoder.c +++ b/libavcodec/aac/aaccoder.c @@ -35,9 +35,9 @@ #include #include "libavutil/mathematics.h" -#include "mathops.h" -#include "avcodec.h" -#include "put_bits.h" +#include "libavcodec/mathops.h" +#include "libavcodec/avcodec.h" +#include "libavcodec/put_bits.h" #include "aac.h" #include "aacenc.h" #include "aactab.h" @@ -48,7 +48,7 @@ #include "aacenc_is.h" #include "aacenc_tns.h" -#include "libavcodec/aaccoder_twoloop.h" +#include "aaccoder_twoloop.h" /* Parameter of f(x) = a*(lambda/100), defines the maximum fourier spread * beyond which no PNS is used (since the SFBs contain tone rather than noise) */ @@ -58,7 +58,7 @@ * replace low energy non zero bands */ #define NOISE_LAMBDA_REPLACE 1.948f -#include "libavcodec/aaccoder_trellis.h" +#include "aaccoder_trellis.h" typedef float (*quantize_and_encode_band_func)(struct AACEncContext *s, PutBitContext *pb, const float *in, float *quant, const float *scaled, diff --git a/libavcodec/aaccoder_trellis.h b/libavcodec/aac/aaccoder_trellis.h similarity index 99% rename from libavcodec/aaccoder_trellis.h rename to libavcodec/aac/aaccoder_trellis.h index 245aa1c11b..0622d77fc6 100644 --- a/libavcodec/aaccoder_trellis.h +++ b/libavcodec/aac/aaccoder_trellis.h @@ -39,8 +39,8 @@ #include #include "libavutil/mathematics.h" -#include "avcodec.h" -#include "put_bits.h" +#include "libavcodec/avcodec.h" +#include "libavcodec/put_bits.h" #include "aac.h" #include "aacenc.h" #include "aactab.h" diff --git a/libavcodec/aaccoder_twoloop.h b/libavcodec/aac/aaccoder_twoloop.h similarity index 99% rename from libavcodec/aaccoder_twoloop.h rename to libavcodec/aac/aaccoder_twoloop.h index c56abc68a7..514ec8f693 100644 --- a/libavcodec/aaccoder_twoloop.h +++ b/libavcodec/aac/aaccoder_twoloop.h @@ -42,9 +42,9 @@ #include #include "libavutil/mathematics.h" -#include "mathops.h" -#include "avcodec.h" -#include "put_bits.h" +#include "libavcodec/mathops.h" +#include "libavcodec/avcodec.h" +#include "libavcodec/put_bits.h" #include "aac.h" #include "aacenc.h" #include "aactab.h" diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c index 8d50ad6d09..c48edb66c9 100644 --- a/libavcodec/aac/aacdec.c +++ b/libavcodec/aac/aacdec.c @@ -42,10 +42,10 @@ #include "aacdec_tab.h" #include "aacdec_usac.h" -#include "libavcodec/aac.h" +#include "aac.h" #include "libavcodec/aac_defines.h" #include "libavcodec/aacsbr.h" -#include "libavcodec/aactab.h" +#include "aactab.h" #include "libavcodec/adts_header.h" #include "libavcodec/avcodec.h" diff --git a/libavcodec/aac/aacdec.h b/libavcodec/aac/aacdec.h index e5a79a7139..9ad50bed0f 100644 --- a/libavcodec/aac/aacdec.h +++ b/libavcodec/aac/aacdec.h @@ -38,7 +38,7 @@ #include "libavutil/mem_internal.h" #include "libavutil/tx.h" -#include "libavcodec/aac.h" +#include "aac.h" #include "libavcodec/avcodec.h" #include "libavcodec/mpeg4audio.h" diff --git a/libavcodec/aac/aacdec_ac.c b/libavcodec/aac/aacdec_ac.c index 7e5077cd19..ef7c254070 100644 --- a/libavcodec/aac/aacdec_ac.c +++ b/libavcodec/aac/aacdec_ac.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/aactab.h" +#include "aactab.h" #include "aacdec_ac.h" uint32_t ff_aac_ac_map_process(AACArithState *state, int reset, int N) diff --git a/libavcodec/aac/aacdec_dsp_template.c b/libavcodec/aac/aacdec_dsp_template.c index 8d31af22f8..4eea57e576 100644 --- a/libavcodec/aac/aacdec_dsp_template.c +++ b/libavcodec/aac/aacdec_dsp_template.c @@ -32,7 +32,7 @@ #include "aacdec.h" #include "libavcodec/lpc_functions.h" -#include "libavcodec/aactab.h" +#include "aactab.h" /** * Convert integer scalefactors to the decoder's native expected diff --git a/libavcodec/aac/aacdec_fixed.c b/libavcodec/aac/aacdec_fixed.c index 89f1ea0384..dbf312cfdd 100644 --- a/libavcodec/aac/aacdec_fixed.c +++ b/libavcodec/aac/aacdec_fixed.c @@ -37,7 +37,7 @@ #include "libavcodec/avcodec.h" #include "aacdec.h" -#include "libavcodec/aactab.h" +#include "aactab.h" #include "libavcodec/sinewin_fixed_tablegen.h" #include "libavcodec/kbdwin.h" #include "libavcodec/cbrt_data.h" diff --git a/libavcodec/aac/aacdec_float.c b/libavcodec/aac/aacdec_float.c index 14169e95d8..c9b1035ab4 100644 --- a/libavcodec/aac/aacdec_float.c +++ b/libavcodec/aac/aacdec_float.c @@ -37,7 +37,7 @@ #include "libavcodec/avcodec.h" #include "aacdec.h" -#include "libavcodec/aactab.h" +#include "aactab.h" #include "libavcodec/sinewin.h" #include "libavcodec/kbdwin.h" #include "libavcodec/cbrt_data.h" diff --git a/libavcodec/aac/aacdec_tab.c b/libavcodec/aac/aacdec_tab.c index 45a84a9a72..093afeafc4 100644 --- a/libavcodec/aac/aacdec_tab.c +++ b/libavcodec/aac/aacdec_tab.c @@ -27,9 +27,9 @@ #include "aacdec_tab.h" -#include "libavcodec/aac.h" +#include "aac.h" #include "libavcodec/aacps.h" -#include "libavcodec/aactab.h" +#include "aactab.h" #include "libavcodec/vlc.h" #include "libavutil/attributes.h" diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index ccdf58bc8e..7bb871b6f0 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -25,7 +25,7 @@ #include "libavcodec/aacsbr.h" -#include "libavcodec/aactab.h" +#include "aactab.h" #include "libavutil/mem.h" #include "libavcodec/mpeg4audio.h" #include "libavcodec/unary.h" diff --git a/libavcodec/aacenc.c b/libavcodec/aac/aacenc.c similarity index 99% rename from libavcodec/aacenc.c rename to libavcodec/aac/aacenc.c index 673bcea5d8..34dfa5eabc 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aac/aacenc.c @@ -35,14 +35,14 @@ #include "libavutil/float_dsp.h" #include "libavutil/mem.h" #include "libavutil/opt.h" -#include "avcodec.h" -#include "codec_internal.h" -#include "encode.h" -#include "put_bits.h" -#include "mpeg4audio.h" -#include "sinewin.h" -#include "profiles.h" -#include "version.h" +#include "libavcodec/avcodec.h" +#include "libavcodec/codec_internal.h" +#include "libavcodec/encode.h" +#include "libavcodec/put_bits.h" +#include "libavcodec/mpeg4audio.h" +#include "libavcodec/sinewin.h" +#include "libavcodec/profiles.h" +#include "libavcodec/version.h" #include "aac.h" #include "aactab.h" @@ -50,7 +50,7 @@ #include "aacenctab.h" #include "aacenc_utils.h" -#include "psymodel.h" +#include "libavcodec/psymodel.h" /** * List of PCE (Program Configuration Element) for the channel layouts listed diff --git a/libavcodec/aacenc.h b/libavcodec/aac/aacenc.h similarity index 98% rename from libavcodec/aacenc.h rename to libavcodec/aac/aacenc.h index 241d75025a..b8bdddeed8 100644 --- a/libavcodec/aacenc.h +++ b/libavcodec/aac/aacenc.h @@ -29,15 +29,14 @@ #include "libavutil/mem_internal.h" #include "libavutil/tx.h" -#include "avcodec.h" -#include "put_bits.h" +#include "libavcodec/avcodec.h" +#include "libavcodec/put_bits.h" #include "aac.h" #include "aacencdsp.h" -#include "audio_frame_queue.h" -#include "psymodel.h" - -#include "lpc.h" +#include "libavcodec/audio_frame_queue.h" +#include "libavcodec/psymodel.h" +#include "libavcodec/lpc.h" #define CLIP_AVOIDANCE_FACTOR 0.95f diff --git a/libavcodec/aacenc_is.c b/libavcodec/aac/aacenc_is.c similarity index 100% rename from libavcodec/aacenc_is.c rename to libavcodec/aac/aacenc_is.c diff --git a/libavcodec/aacenc_is.h b/libavcodec/aac/aacenc_is.h similarity index 100% rename from libavcodec/aacenc_is.h rename to libavcodec/aac/aacenc_is.h diff --git a/libavcodec/aacenc_quantization.h b/libavcodec/aac/aacenc_quantization.h similarity index 98% rename from libavcodec/aacenc_quantization.h rename to libavcodec/aac/aacenc_quantization.h index 185430b0dd..2a98dfd742 100644 --- a/libavcodec/aacenc_quantization.h +++ b/libavcodec/aac/aacenc_quantization.h @@ -31,7 +31,7 @@ #include #include "aacenc.h" -#include "put_bits.h" +#include "libavcodec/put_bits.h" float ff_quantize_and_encode_band_cost(AACEncContext *s, PutBitContext *pb, diff --git a/libavcodec/aacenc_quantization_misc.h b/libavcodec/aac/aacenc_quantization_misc.h similarity index 100% rename from libavcodec/aacenc_quantization_misc.h rename to libavcodec/aac/aacenc_quantization_misc.h diff --git a/libavcodec/aacenc_tns.c b/libavcodec/aac/aacenc_tns.c similarity index 99% rename from libavcodec/aacenc_tns.c rename to libavcodec/aac/aacenc_tns.c index 7884c035cb..183a15a896 100644 --- a/libavcodec/aacenc_tns.c +++ b/libavcodec/aac/aacenc_tns.c @@ -30,7 +30,7 @@ #include "aacenc_tns.h" #include "aactab.h" #include "aacenc_utils.h" -#include "lpc_functions.h" +#include "libavcodec/lpc_functions.h" /* Could be set to 3 to save an additional bit at the cost of little quality */ #define TNS_Q_BITS 4 diff --git a/libavcodec/aacenc_tns.h b/libavcodec/aac/aacenc_tns.h similarity index 100% rename from libavcodec/aacenc_tns.h rename to libavcodec/aac/aacenc_tns.h diff --git a/libavcodec/aacenc_utils.h b/libavcodec/aac/aacenc_utils.h similarity index 100% rename from libavcodec/aacenc_utils.h rename to libavcodec/aac/aacenc_utils.h diff --git a/libavcodec/aacencdsp.h b/libavcodec/aac/aacencdsp.h similarity index 100% rename from libavcodec/aacencdsp.h rename to libavcodec/aac/aacencdsp.h diff --git a/libavcodec/aacenctab.c b/libavcodec/aac/aacenctab.c similarity index 100% rename from libavcodec/aacenctab.c rename to libavcodec/aac/aacenctab.c diff --git a/libavcodec/aacenctab.h b/libavcodec/aac/aacenctab.h similarity index 99% rename from libavcodec/aacenctab.h rename to libavcodec/aac/aacenctab.h index 60e1f22387..561c9cc5f6 100644 --- a/libavcodec/aacenctab.h +++ b/libavcodec/aac/aacenctab.h @@ -29,8 +29,9 @@ #define AVCODEC_AACENCTAB_H #include "libavutil/channel_layout.h" +#include "libavcodec/defs.h" + #include "aac.h" -#include "defs.h" /** Total number of usable codebooks **/ #define CB_TOT 12 diff --git a/libavcodec/aacpsy.c b/libavcodec/aac/aacpsy.c similarity index 99% rename from libavcodec/aacpsy.c rename to libavcodec/aac/aacpsy.c index 019be09fa3..eea8f36ba8 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aac/aacpsy.c @@ -28,9 +28,9 @@ #include "libavutil/ffmath.h" #include "libavutil/mem.h" -#include "avcodec.h" +#include "libavcodec/avcodec.h" #include "aac.h" -#include "psymodel.h" +#include "libavcodec/psymodel.h" /*********************************** * TODOs: diff --git a/libavcodec/aactab.c b/libavcodec/aac/aactab.c similarity index 99% rename from libavcodec/aactab.c rename to libavcodec/aac/aactab.c index 8d4587d241..505de52dcc 100644 --- a/libavcodec/aactab.c +++ b/libavcodec/aac/aactab.c @@ -37,8 +37,8 @@ #include "aactab.h" #if CONFIG_AAC_ENCODER || CONFIG_AAC_DECODER -#include "kbdwin.h" -#include "sinewin.h" +#include "libavcodec/kbdwin.h" +#include "libavcodec/sinewin.h" float ff_aac_pow2sf_tab[428]; float ff_aac_pow34sf_tab[428]; diff --git a/libavcodec/aactab.h b/libavcodec/aac/aactab.h similarity index 100% rename from libavcodec/aactab.h rename to libavcodec/aac/aactab.h diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c index 78f0aead8e..a7cc4c1f95 100644 --- a/libavcodec/aacsbr.c +++ b/libavcodec/aacsbr.c @@ -27,7 +27,7 @@ */ #define USE_FIXED 0 -#include "aac.h" +#include "aac/aac.h" #include "sbr.h" #include "aacsbr.h" #include "aacsbrdata.h" diff --git a/libavcodec/aacsbr_fixed.c b/libavcodec/aacsbr_fixed.c index 06d07e1941..eaec8571e8 100644 --- a/libavcodec/aacsbr_fixed.c +++ b/libavcodec/aacsbr_fixed.c @@ -56,7 +56,7 @@ */ #define USE_FIXED 1 -#include "aac.h" +#include "aac/aac.h" #include "sbr.h" #include "aacsbr.h" #include "aacsbrdata.h" diff --git a/libavcodec/aarch64/aacencdsp_init.c b/libavcodec/aarch64/aacencdsp_init.c index 23498e7891..bd2ccfc68d 100644 --- a/libavcodec/aarch64/aacencdsp_init.c +++ b/libavcodec/aarch64/aacencdsp_init.c @@ -22,7 +22,7 @@ #include "libavutil/arm/cpu.h" #include "libavutil/attributes.h" -#include "libavcodec/aacencdsp.h" +#include "libavcodec/aac/aacencdsp.h" void ff_abs_pow34_neon(float *out, const float *in, const int size); void ff_aac_quant_bands_neon(int *, const float *, const float *, int, int, diff --git a/libavcodec/sbrdsp.c b/libavcodec/sbrdsp.c index 8d6ffdfe7e..edf5bc4248 100644 --- a/libavcodec/sbrdsp.c +++ b/libavcodec/sbrdsp.c @@ -22,7 +22,7 @@ #define USE_FIXED 0 -#include "aac.h" +#include "aac/aac.h" #include "libavutil/attributes.h" #include "libavutil/intfloat.h" #include "sbrdsp.h" diff --git a/libavcodec/sbrdsp_fixed.c b/libavcodec/sbrdsp_fixed.c index f5784f801d..71c8606491 100644 --- a/libavcodec/sbrdsp_fixed.c +++ b/libavcodec/sbrdsp_fixed.c @@ -25,7 +25,7 @@ #define USE_FIXED 1 -#include "aac.h" +#include "aac/aac.h" #include "libavutil/attributes.h" #include "libavutil/intfloat.h" #include "sbrdsp.h" diff --git a/libavcodec/x86/aacencdsp_init.c b/libavcodec/x86/aacencdsp_init.c index cf17dbf91d..5485eefd07 100644 --- a/libavcodec/x86/aacencdsp_init.c +++ b/libavcodec/x86/aacencdsp_init.c @@ -23,7 +23,7 @@ #include "libavutil/attributes.h" #include "libavutil/x86/cpu.h" -#include "libavcodec/aacencdsp.h" +#include "libavcodec/aac/aacencdsp.h" void ff_abs_pow34_sse(float *out, const float *in, const int size); -- 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".