From: Jovan Zelincevic <jovan.zelince...@imgtec.com>
Build system modified
Signed-off-by: Nedeljko Babic <nedeljko.ba...@imgtec.com>
---
configure | 1 +
libavcodec/Makefile | 16 +++++++++++++---
libavcodec/aacdec.c | 1 -
libavcodec/aacdec_fixed.c | 1 -
libavcodec/allcodecs.c | 1 +
5 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index 9c3af50..0b3ff41 100755
--- a/configure
+++ b/configure
@@ -2028,6 +2028,7 @@ mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp"
# decoders / encoders
aac_decoder_select="mdct sinewin"
+aac_fixed_decoder_select="mdct sinewin"
aac_encoder_select="audio_frame_queue iirfilter mdct sinewin"
aac_latm_decoder_select="aac_decoder aac_latm_parser"
ac3_decoder_select="ac3_parser ac3dsp bswapdsp mdct"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 6fe05ee..3ce317d 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -23,7 +23,9 @@ OBJS = allcodecs.o
\
codec_desc.o \
dv_profile.o \
fmtconvert.o \
+ float_emu_tab.o \
imgconvert.o \
+ log2_tab.o \
mathtables.o \
options.o \
parser.o \
@@ -91,6 +93,7 @@ RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o
OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes)
OBJS-$(CONFIG_SHARED) += log2_tab.o
OBJS-$(CONFIG_SINEWIN) += sinewin.o
+OBJS-$(CONFIG_SINEWIN) += sinewin.o sinewin_fixed.o
OBJS-$(CONFIG_TPELDSP) += tpeldsp.o
OBJS-$(CONFIG_VAAPI) += vaapi.o
OBJS-$(CONFIG_VDA) += vda.o
@@ -105,6 +108,8 @@ OBJS-$(CONFIG_A64MULTI5_ENCODER) += a64multienc.o
elbg.o
OBJS-$(CONFIG_AAC_DECODER) += aacdec.o aactab.o aacsbr.o aacps.o \
aacadtsdec.o mpeg4audio.o kbdwin.o \
sbrdsp.o aacpsdsp.o
+OBJS-$(CONFIG_AAC_FIXED_DECODER) += aacdec_fixed.o aactab.o \
+ aacadtsdec.o mpeg4audio.o kbdwin.o
OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \
aacpsy.o aactab.o \
psymodel.o mpeg4audio.o kbdwin.o
@@ -870,6 +875,7 @@ TOOLS = fourcc2pixfmt
HOSTPROGS = aac_tablegen \
aacps_tablegen \
cbrt_tablegen \
+ cbrt_fixed_tablegen \
cos_tablegen \
dsd_tablegen \
dv_tablegen \
@@ -878,6 +884,7 @@ HOSTPROGS = aac_tablegen
\
pcm_tablegen \
qdm2_tablegen \
sinewin_tablegen \
+ sinewin_fixed_tablegen \
CLEANFILES = *_tables.c *_tables.h *_tablegen$(HOSTEXESUF)
@@ -896,9 +903,9 @@ else
$(SUBDIR)%_tablegen$(HOSTEXESUF): HOSTCFLAGS += -DCONFIG_SMALL=0
endif
-GEN_HEADERS = cbrt_tables.h aacps_tables.h aac_tables.h dsd_tables.h
dv_tables.h \
- sinewin_tables.h mpegaudio_tables.h motionpixels_tables.h \
- pcm_tables.h qdm2_tables.h
+GEN_HEADERS = cbrt_tables.h cbrt_fixed_tables.h aacps_tables.h aac_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))
$(GEN_HEADERS): $(SUBDIR)%_tables.h: $(SUBDIR)%_tablegen$(HOSTEXESUF)
@@ -906,11 +913,14 @@ $(GEN_HEADERS): $(SUBDIR)%_tables.h:
$(SUBDIR)%_tablegen$(HOSTEXESUF)
ifdef CONFIG_HARDCODED_TABLES
$(SUBDIR)aacdec.o: $(SUBDIR)cbrt_tables.h
+$(SUBDIR)aacdec_fixed.o: $(SUBDIR)cbrt_fixed_tables.h
$(SUBDIR)aacps.o: $(SUBDIR)aacps_tables.h
$(SUBDIR)aactab.o: $(SUBDIR)aac_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
$(SUBDIR)sinewin.o: $(SUBDIR)sinewin_tables.h
+$(SUBDIR)sinewin_fixed.o: $(SUBDIR)sinewin_fixed_tables.h
$(SUBDIR)mpegaudiodec_fixed.o: $(SUBDIR)mpegaudio_tables.h
$(SUBDIR)mpegaudiodec_float.o: $(SUBDIR)mpegaudio_tables.h
$(SUBDIR)motionpixels.o: $(SUBDIR)motionpixels_tables.h
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 8cdd353..95c6d65 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -35,7 +35,6 @@
#define FFT_FLOAT 1
#define FFT_FIXED_32 0
#define USE_FIXED 0
-#define CONFIG_FIXED 0
#include "libavutil/float_dsp.h"
#include "libavutil/opt.h"
diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c
index e6f43ce..9f0d4e6 100644
--- a/libavcodec/aacdec_fixed.c
+++ b/libavcodec/aacdec_fixed.c
@@ -61,7 +61,6 @@
#define FFT_FLOAT 0
#define FFT_FIXED_32 1
#define USE_FIXED 1
-#define CONFIG_FIXED 1
#include "libavutil/fixed_dsp.h"
#include "libavutil/opt.h"
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 7650543..8275ba9 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -322,6 +322,7 @@ void avcodec_register_all(void)
/* audio codecs */
REGISTER_ENCDEC (AAC, aac);
+ REGISTER_DECODER(AAC_FIXED, aac_fixed);
REGISTER_DECODER(AAC_LATM, aac_latm);
REGISTER_ENCDEC (AC3, ac3);
REGISTER_ENCDEC (AC3_FIXED, ac3_fixed);
--
1.8.2.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
