On 08/02/2025 16:54, James Almer wrote:
On 2/8/2025 2:32 AM, Lynne wrote:The decoder was already moved there. --- libavcodec/Makefile | 5 +- libavcodec/aac/Makefile | 2 + libavcodec/{ => aac}/aaccoder.c | 0 libavcodec/aac/aaccoder.h | 46 +++++++++++++++++++ libavcodec/{ => aac}/aaccoder_twoloop.h | 0 libavcodec/{ => aac}/aacenc.c | 0 libavcodec/{ => aac}/aacenc.h | 0 libavcodec/{ => aac}/aacenc_is.c | 0 libavcodec/{ => aac}/aacenc_is.h | 0 libavcodec/{ => aac}/aacenc_quantization.h | 0 .../{ => aac}/aacenc_quantization_misc.h | 0 libavcodec/{ => aac}/aacenc_tns.c | 0 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 | 0 libavcodec/aarch64/aacencdsp_init.c | 2 +- libavcodec/riscv/aacencdsp_init.c | 2 +- libavcodec/x86/aacencdsp_init.c | 2 +- tests/checkasm/aacencdsp.c | 4 +- 21 files changed, 54 insertions(+), 9 deletions(-) rename libavcodec/{ => aac}/aaccoder.c (100%) create mode 100644 libavcodec/aac/aaccoder.h rename libavcodec/{ => aac}/aaccoder_twoloop.h (100%) rename libavcodec/{ => aac}/aacenc.c (100%) rename libavcodec/{ => aac}/aacenc.h (100%) rename libavcodec/{ => aac}/aacenc_is.c (100%) rename libavcodec/{ => aac}/aacenc_is.h (100%) rename libavcodec/{ => aac}/aacenc_quantization.h (100%) rename libavcodec/{ => aac}/aacenc_quantization_misc.h (100%) rename libavcodec/{ => aac}/aacenc_tns.c (100%) 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 (100%)diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 499f826635..a5dcfb7d1b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -194,10 +194,7 @@ OBJS-$(CONFIG_AAC_FIXED_DECODER) += 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 \ +OBJS-$(CONFIG_AAC_ENCODER) += aacpsy.o aactab.o \ psymodel.o kbdwin.o \ mpeg4audio_sample_rates.o OBJS-$(CONFIG_AAC_MEDIACODEC_DECODER) += mediacodecdec.o diff --git a/libavcodec/aac/Makefile b/libavcodec/aac/Makefile index 70b1dca274..489fa9f67a 100644 --- a/libavcodec/aac/Makefile +++ b/libavcodec/aac/Makefile @@ -1,6 +1,8 @@ clean:: $(RM) $(CLEANSUFFIXES:%=libavcodec/aac/%)+OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o aacenctab.o \+ aacenc_is.o aacenc_tns.o OBJS-$(CONFIG_AAC_DECODER) += aac/aacdec.o aac/aacdec_tab.o \aac/aacdec_float.o aac/ aacdec_usac.o \ aac/aacdec_ac.o aac/ aacdec_lpd.odiff --git a/libavcodec/aaccoder.c b/libavcodec/aac/aaccoder.c similarity index 100% rename from libavcodec/aaccoder.c rename to libavcodec/aac/aaccoder.c diff --git a/libavcodec/aac/aaccoder.h b/libavcodec/aac/aaccoder.h new file mode 100644 index 0000000000..3f3b2612aa --- /dev/null +++ b/libavcodec/aac/aaccoder.h @@ -0,0 +1,46 @@ +/* + * AAC encoder + * Copyright (C) 2008 Konstantin Shishkov + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA+ */ + +#ifndef AVCODEC_AACCODER_H +#define AVCODEC_AACCODER_H + +#include "aacenc.h" ++void ff_aac_search_for_quantizers(AVCodecContext *avctx, AACEncContext *s, + SingleChannelElement *sce, const float lambda);+void ff_aac_set_special_band_scalefactors(AACEncContext *s, + SingleChannelElement *sce); + +void ff_aac_search_for_pns(AACEncContext *s, AVCodecContext *avctx, + SingleChannelElement *sce); +void ff_aac_mark_pns(AACEncContext *s, AVCodecContext *avctx, + SingleChannelElement *sce); + +void ff_aac_search_for_ms(AACEncContext *s, ChannelElement *cpe); ++void ff_aac_encode_window_bands_info(AACEncContext *s, SingleChannelElement *sce, + int win, int group_len, const float lambda); +void ff_aac_quantize_and_encode_band(AACEncContext *s, PutBitContext *pb, + const float *in, float *out, int size, + int scale_idx, int cb, const float lambda,+ int rtz); + +#endif /* AVCODEC_AACCODER_H */This new header seems unrelated to this change? _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Its meant to be in the previous commit.
OpenPGP_0xA2FEA5F03F034464.asc
Description: OpenPGP public key
OpenPGP_signature.asc
Description: OpenPGP digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
