[FFmpeg-devel] [PATCH] aac: move SBR code to libavcodec/aac

[Michael Niedermayer]

On Fri, Feb 28, 2025 at 03:50:39PM +0100, Lynne wrote:
> ---
>  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%)

breaks arm build

src/libavcodec/arm/aacpsdsp_init_arm.c:25:10: fatal error: libavcodec/aacpsdsp.h: No such file or directory
 #include "libavcodec/aacpsdsp.h"
          ^~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
src/libavcodec/arm/sbrdsp_init_arm.c:24:10: fatal error: libavcodec/sbrdsp.h: No such file or directory
 #include "libavcodec/sbrdsp.h"
          ^~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make: *** [src/ffbuild/common.mak:81: libavcodec/arm/aacpsdsp_init_arm.o] Error 1
make: *** Waiting for unfinished jobs....
make: *** [src/ffbuild/common.mak:81: libavcodec/arm/sbrdsp_init_arm.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/dfdfe305/attachment.sig>