diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1ad3787eb0..c169135020 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -968,8 +968,6 @@ TOOLS = fourcc2pixfmt HOSTPROGS = aacps_tablegen \ aacps_fixed_tablegen \ - aacsbr_tablegen \ - aacsbr_fixed_tablegen \ cbrt_tablegen \ cbrt_fixed_tablegen \ cos_tablegen \ @@ -999,8 +997,8 @@ else $(SUBDIR)%_tablegen$(HOSTEXESUF): HOSTCFLAGS += -DCONFIG_SMALL=0 endif -GEN_HEADERS = cbrt_tables.h cbrt_fixed_tables.h aacps_tables.h aacps_fixed_tables.h aacsbr_tables.h \ - aacsbr_fixed_tables.h dsd_tables.h dv_tables.h \ +GEN_HEADERS = cbrt_tables.h cbrt_fixed_tables.h aacps_tables.h aacps_fixed_tables.h \ + dsd_tables.h dv_tables.h \ sinewin_tables.h sinewin_fixed_tables.h mpegaudio_tables.h motionpixels_tables.h \ pcm_tables.h qdm2_tables.h GEN_HEADERS := $(addprefix $(SUBDIR), $(GEN_HEADERS)) @@ -1013,8 +1011,6 @@ $(SUBDIR)aacdec.o: $(SUBDIR)cbrt_tables.h $(SUBDIR)aacdec_fixed.o: $(SUBDIR)cbrt_fixed_tables.h $(SUBDIR)aacps_float.o: $(SUBDIR)aacps_tables.h $(SUBDIR)aacps_fixed.o: $(SUBDIR)aacps_fixed_tables.h -$(SUBDIR)aacsbr.o: $(SUBDIR)aacsbr_tables.h -$(SUBDIR)aacsbr_fixed.o: $(SUBDIR)aacsbr_fixed_tables.h $(SUBDIR)aactab_fixed.o: $(SUBDIR)aac_fixed_tables.h $(SUBDIR)dsddec.o: $(SUBDIR)dsd_tables.h $(SUBDIR)dvenc.o: $(SUBDIR)dv_tables.h diff --git a/libavcodec/aacsbr_fixed_tablegen.c b/libavcodec/aacsbr_fixed_tablegen.c deleted file mode 100644 index 832fcb7a6d..0000000000 --- a/libavcodec/aacsbr_fixed_tablegen.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Header file for hardcoded AAC SBR windows - * - * Copyright (c) 2014 Reimar Döffinger - * - * 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 - */ - -#include -#define CONFIG_HARDCODED_TABLES 0 -#define USE_FIXED 1 -#include "aacsbr_fixed_tablegen.h" -#include "tableprint.h" - -int main(void) -{ - aacsbr_tableinit(); - - write_fileheader(); - - WRITE_ARRAY_ALIGNED("static const", 32, int32_t, sbr_qmf_window_ds); - WRITE_ARRAY_ALIGNED("static const", 32, int32_t, sbr_qmf_window_us); - - return 0; -} diff --git a/libavcodec/aacsbr_fixed_tablegen.h b/libavcodec/aacsbr_fixed_tablegen.h index 1439ebe3a4..3fcf0204c3 100644 --- a/libavcodec/aacsbr_fixed_tablegen.h +++ b/libavcodec/aacsbr_fixed_tablegen.h @@ -25,8 +25,4 @@ #include "aacsbr_tablegen_common.h" -#if CONFIG_HARDCODED_TABLES -#include "libavcodec/aacsbr_fixed_tables.h" -#endif /* CONFIG_HARDCODED_TABLES */ - #endif /* AVCODEC_AACSBR_FIXED_TABLEGEN_H */ diff --git a/libavcodec/aacsbr_tablegen.c b/libavcodec/aacsbr_tablegen.c deleted file mode 100644 index c331c57673..0000000000 --- a/libavcodec/aacsbr_tablegen.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Header file for hardcoded AAC SBR windows - * - * Copyright (c) 2014 Reimar Döffinger - * - * 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 - */ - -#include -#define CONFIG_HARDCODED_TABLES 0 -#define USE_FIXED 0 -#include "aacsbr_tablegen.h" -#include "tableprint.h" - -int main(void) -{ - aacsbr_tableinit(); - - write_fileheader(); - - WRITE_ARRAY_ALIGNED("static const", 32, float, sbr_qmf_window_ds); - WRITE_ARRAY_ALIGNED("static const", 32, float, sbr_qmf_window_us); - - return 0; -} diff --git a/libavcodec/aacsbr_tablegen.h b/libavcodec/aacsbr_tablegen.h index d86eba7540..242a963557 100644 --- a/libavcodec/aacsbr_tablegen.h +++ b/libavcodec/aacsbr_tablegen.h @@ -25,8 +25,4 @@ #include "aacsbr_tablegen_common.h" -#if CONFIG_HARDCODED_TABLES -#include "libavcodec/aacsbr_tables.h" -#endif /* CONFIG_HARDCODED_TABLES */ - #endif /* AVCODEC_AACSBR_TABLEGEN_H */ diff --git a/libavcodec/aacsbr_tablegen_common.h b/libavcodec/aacsbr_tablegen_common.h index d7fc3061b0..8c8f6effa1 100644 --- a/libavcodec/aacsbr_tablegen_common.h +++ b/libavcodec/aacsbr_tablegen_common.h @@ -25,9 +25,6 @@ #include "aac_defines.h" #include "libavutil/mem.h" -#if CONFIG_HARDCODED_TABLES -#define aacsbr_tableinit() -#else ///< window coefficients for analysis/synthesis QMF banks static DECLARE_ALIGNED(32, INTFLOAT, sbr_qmf_window_ds)[320]; static DECLARE_ALIGNED(32, INTFLOAT, sbr_qmf_window_us)[640] = { @@ -125,6 +122,5 @@ static av_cold void aacsbr_tableinit(void) for (n = 0; n < 320; n++) sbr_qmf_window_ds[n] = sbr_qmf_window_us[2*n]; } -#endif /* CONFIG_HARDCODED_TABLES */ #endif /* AVCODEC_AACSBR_TABLEGEN_COMMON_H */