Start to clean up the decoder. Also renames a confusingly named file.
Unified · Split
| @@ -64,6 +64,7 @@ OBJS = ac3_parser.o \ · 63 unmodified lines | |||
| 64 | xiph.o \ | 64 | xiph.o \ |
| 65 | 65 | ||
| 66 | # subsystems | 66 | # subsystems |
| 67 | include $(SRC_PATH)/libavcodec/aac/Makefile | ||
| 67 | include $(SRC_PATH)/libavcodec/vvc/Makefile | 68 | include $(SRC_PATH)/libavcodec/vvc/Makefile |
| 68 | -include $(SRC_PATH)/libavcodec/$(ARCH)/vvc/Makefile | 69 | -include $(SRC_PATH)/libavcodec/$(ARCH)/vvc/Makefile |
| 69 | OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o | 70 | OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o |
| @@ -179,11 +180,11 @@ OBJS-$(CONFIG_WMV2DSP) += wmv2dsp.o · 109 unmodified lines | |||
| 179 | OBJS-$(CONFIG_ZERO12V_DECODER) += 012v.o | 180 | OBJS-$(CONFIG_ZERO12V_DECODER) += 012v.o |
| 180 | OBJS-$(CONFIG_A64MULTI_ENCODER) += a64multienc.o elbg.o | 181 | OBJS-$(CONFIG_A64MULTI_ENCODER) += a64multienc.o elbg.o |
| 181 | OBJS-$(CONFIG_A64MULTI5_ENCODER) += a64multienc.o elbg.o | 182 | OBJS-$(CONFIG_A64MULTI5_ENCODER) += a64multienc.o elbg.o |
| 182 | OBJS-$(CONFIG_AAC_DECODER) += aacdec.o aacdec_common.o aactab.o \ | 183 | OBJS-$(CONFIG_AAC_DECODER) += aacdec.o aactab.o \ |
| 183 | aacsbr.o aacps_common.o aacps_float.o \ | 184 | aacsbr.o aacps_common.o aacps_float.o \ |
| 184 | kbdwin.o \ | 185 | kbdwin.o \ |
| 185 | sbrdsp.o aacpsdsp_float.o cbrt_data.o | 186 | sbrdsp.o aacpsdsp_float.o cbrt_data.o |
| 186 | OBJS-$(CONFIG_AAC_FIXED_DECODER) += aacdec_fixed.o aacdec_common.o aactab.o \ | 187 | OBJS-$(CONFIG_AAC_FIXED_DECODER) += aacdec_fixed.o aactab.o \ |
| 187 | aacsbr_fixed.o aacps_common.o aacps_fixed.o \ | 188 | aacsbr_fixed.o aacps_common.o aacps_fixed.o \ |
| 188 | kbdwin.o \ | 189 | kbdwin.o \ |
| 189 | sbrdsp_fixed.o aacpsdsp_fixed.o cbrt_data_fixed.o | 190 | sbrdsp_fixed.o aacpsdsp_fixed.o cbrt_data_fixed.o |
| @@ -0,0 +1,5 @@ | |||
| 1 | clean:: | ||
| 2 | $(RM) $(CLEANSUFFIXES:%=libavcodec/aac/%) | ||
| 3 | |||
| 4 | OBJS-$(CONFIG_AAC_DECODER) += aac/aacdec_tab.o | ||
| 5 | OBJS-$(CONFIG_AAC_FIXED_DECODER) += aac/aacdec_tab.o | ||
| @@ -25,11 +25,12 @@ · 24 unmodified lines | |||
| 25 | * Common code and tables of the AAC fixed- and floating-point decoders | 25 | * Common code and tables of the AAC fixed- and floating-point decoders |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include "aac.h" | 28 | #include "aacdec_tab.h" |
| 29 | #include "aacdectab.h" | 29 | |
| 30 | #include "aacps.h" | 30 | #include "libavcodec/aac.h" |
| 31 | #include "aactab.h" | 31 | #include "libavcodec/aacps.h" |
| 32 | #include "vlc.h" | 32 | #include "libavcodec/aactab.h" |
| 33 | #include "libavcodec/vlc.h" | ||
| 33 | 34 | ||
| 34 | #include "libavutil/attributes.h" | 35 | #include "libavutil/attributes.h" |
| 35 | #include "libavutil/thread.h" | 36 | #include "libavutil/thread.h" |
| @@ -25,12 +25,12 @@ · 24 unmodified lines | |||
| 25 | * @author Maxim Gavrilov ( maxim.gavrilov gmail com ) | 25 | * @author Maxim Gavrilov ( maxim.gavrilov gmail com ) |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #ifndef AVCODEC_AACDECTAB_H | 28 | #ifndef AVCODEC_AAC_AACDEC_TAB_H |
| 29 | #define AVCODEC_AACDECTAB_H | 29 | #define AVCODEC_AAC_AACDEC_TAB_H |
| 30 | 30 | ||
| 31 | #include <stdint.h> | 31 | #include <stdint.h> |
| 32 | 32 | ||
| 33 | #include "vlc.h" | 33 | #include "libavcodec/vlc.h" |
| 34 | 34 | ||
| 35 | #include "libavutil/attributes_internal.h" | 35 | #include "libavutil/attributes_internal.h" |
| 36 | #include "libavutil/channel_layout.h" | 36 | #include "libavutil/channel_layout.h" |
| @@ -52,4 +52,4 @@ extern const int16_t ff_aac_channel_map[3][4][6]; · 15 unmodified lines | |||
| 52 | extern const AVChannelLayout ff_aac_ch_layout[]; | 52 | extern const AVChannelLayout ff_aac_ch_layout[]; |
| 53 | FF_VISIBILITY_POP_HIDDEN | 53 | FF_VISIBILITY_POP_HIDDEN |
| 54 | 54 | ||
| 55 | #endif /* AVCODEC_AACDECTAB_H */ | 55 | #endif /* AVCODEC_AAC_AACDEC_TAB_H */ |
| @@ -47,7 +47,7 @@ · 46 unmodified lines | |||
| 47 | #include "aac.h" | 47 | #include "aac.h" |
| 48 | #include "aacdec.h" | 48 | #include "aacdec.h" |
| 49 | #include "aactab.h" | 49 | #include "aactab.h" |
| 50 | #include "aacdectab.h" | 50 | #include "aac/aacdec_tab.h" |
| 51 | #include "adts_header.h" | 51 | #include "adts_header.h" |
| 52 | #include "cbrt_data.h" | 52 | #include "cbrt_data.h" |
| 53 | #include "sbr.h" | 53 | #include "sbr.h" |
| @@ -72,7 +72,7 @@ · 71 unmodified lines | |||
| 72 | #include "aac.h" | 72 | #include "aac.h" |
| 73 | #include "aacdec.h" | 73 | #include "aacdec.h" |
| 74 | #include "aactab.h" | 74 | #include "aactab.h" |
| 75 | #include "aacdectab.h" | 75 | #include "aac/aacdec_tab.h" |
| 76 | #include "adts_header.h" | 76 | #include "adts_header.h" |
| 77 | #include "cbrt_data.h" | 77 | #include "cbrt_data.h" |
| 78 | #include "sbr.h" | 78 | #include "sbr.h" |
| @@ -33,7 +33,7 @@ · 32 unmodified lines | |||
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include "aacdec.h" | 35 | #include "aacdec.h" |
| 36 | #include "aacdectab.h" | 36 | #include "aac/aacdec_tab.h" |
| 37 | #include "avcodec.h" | 37 | #include "avcodec.h" |
| 38 | #include "libavutil/qsort.h" | 38 | #include "libavutil/qsort.h" |
| 39 | 39 | ||