[FFmpeg-devel] [PATCH v2] aacenc: move encoder to libavcodec/aac/

[Michael Niedermayer]

On Fri, Feb 28, 2025 at 02:54:40PM +0100, Lynne wrote:
> ---
>  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%)

seems to break:
make fate

tests/checkasm/aacencdsp.c:25:10: fatal error: libavcodec/aacenc_utils.h: No such file or directory
   25 | #include "libavcodec/aacenc_utils.h"
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make: *** [ffbuild/common.mak:81: tests/checkasm/aacencdsp.o] Error 1

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

There will always be a question for which you do not know the correct answer.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20250302/79c2158f/attachment.sig>