[7/7] build: Factor out celp dependencies to CONFIG_CELP

Message ID 1345977182-19195-7-git-send-email-diego@biurrun.de
State New
Headers show

Commit Message

Diego Biurrun Aug. 26, 2012, 10:33 a.m.
A new hidden config variable is added for the codecs that depend on
the celp parts.
---
 configure           |   15 ++++++++++-----
 libavcodec/Makefile |   22 ++++++++++------------
 2 files changed, 20 insertions(+), 17 deletions(-)

Patch

diff --git a/configure b/configure
index 12052c0..6ad60ca 100755
--- a/configure
+++ b/configure
@@ -1212,6 +1212,7 @@  CONFIG_EXTRA="
     aandcttables
     ac3dsp
     avutil
+    celp
     error_resilience
     gcrypt
     golomb
@@ -1345,8 +1346,8 @@  ac3_decoder_select="mdct ac3dsp ac3_parser"
 ac3_encoder_select="mdct ac3dsp"
 ac3_fixed_encoder_select="mdct ac3dsp"
 alac_encoder_select="lpc"
-amrnb_decoder_select="lsp"
-amrwb_decoder_select="lsp"
+amrnb_decoder_select="celp lsp"
+amrwb_decoder_select="celp lsp"
 atrac1_decoder_select="mdct sinewin"
 atrac3_decoder_select="mdct"
 binkaudio_dct_decoder_select="mdct rdft dct sinewin"
@@ -1372,6 +1373,7 @@  flashsv2_decoder_select="zlib"
 flv_decoder_select="h263_decoder"
 flv_encoder_select="h263_encoder"
 fraps_decoder_select="huffman"
+g723_1_decoder_select="celp"
 h261_decoder_select="error_resilience mpegvideo"
 h261_encoder_select="aandcttables mpegvideoenc"
 h263_decoder_select="error_resilience h263_parser mpegvideo"
@@ -1431,9 +1433,11 @@  nellymoser_decoder_select="mdct sinewin"
 nellymoser_encoder_select="mdct sinewin"
 png_decoder_select="zlib"
 png_encoder_select="zlib"
-qcelp_decoder_select="lsp"
+qcelp_decoder_select="celp lsp"
 qdm2_decoder_select="mdct rdft mpegaudiodsp"
-ra_144_encoder_select="lpc"
+ra_144_decoder_select="celp"
+ra_144_encoder_select="celp lpc"
+ra_288_decoder_select="celp"
 ralf_decoder_select="golomb"
 rv10_decoder_select="h263_decoder"
 rv10_encoder_select="h263_encoder"
@@ -1442,7 +1446,7 @@  rv20_encoder_select="h263_encoder"
 rv30_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo"
 rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo"
 shorten_decoder_select="golomb"
-sipr_decoder_select="lsp"
+sipr_decoder_select="celp lsp"
 snow_decoder_select="dwt rangecoder"
 snow_encoder_select="aandcttables dwt error_resilience mpegvideoenc rangecoder"
 svq1_decoder_select="error_resilience mpegvideo"
@@ -1470,6 +1474,7 @@  vp6a_decoder_select="vp6_decoder"
 vp6f_decoder_select="vp6_decoder"
 vp8_decoder_select="h264pred h264qpel"
 wmapro_decoder_select="mdct sinewin"
+wmavoice_decoder_select="celp"
 wmav1_decoder_select="mdct sinewin"
 wmav1_encoder_select="mdct sinewin"
 wmav2_decoder_select="mdct sinewin"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 4750ade..4603051 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -34,6 +34,7 @@  OBJS = allcodecs.o                                                      \
 OBJS-$(CONFIG_AANDCTTABLES)            += aandcttab.o
 OBJS-$(CONFIG_AC3DSP)                  += ac3dsp.o
 OBJS-$(CONFIG_ENCODERS)                += faandct.o jfdctfst.o jfdctint.o
+OBJS-$(CONFIG_CELP)                    += celp.o
 OBJS-$(CONFIG_DCT)                     += dct.o dct32_fixed.o dct32_float.o
 OBJS-$(CONFIG_DWT)                     += dwt.o
 OBJS-$(CONFIG_DXVA2)                   += dxva2.o
@@ -83,11 +84,11 @@  OBJS-$(CONFIG_AC3_FIXED_ENCODER)       += ac3enc_fixed.o ac3enc.o ac3tab.o ac3.o
 OBJS-$(CONFIG_ALAC_DECODER)            += alac.o
 OBJS-$(CONFIG_ALAC_ENCODER)            += alacenc.o
 OBJS-$(CONFIG_ALS_DECODER)             += alsdec.o bgmc.o mpeg4audio.o
-OBJS-$(CONFIG_AMRNB_DECODER)           += amrnbdec.o celp.o           \
+OBJS-$(CONFIG_AMRNB_DECODER)           += amrnbdec.o                  \
                                           acelp_filters.o             \
                                           acelp_vectors.o             \
                                           acelp_pitch_delay.o
-OBJS-$(CONFIG_AMRWB_DECODER)           += amrwbdec.o celp.o           \
+OBJS-$(CONFIG_AMRWB_DECODER)           += amrwbdec.o                  \
                                           acelp_filters.o             \
                                           acelp_vectors.o             \
                                           acelp_pitch_delay.o
@@ -170,7 +171,7 @@  OBJS-$(CONFIG_FLIC_DECODER)            += flicvideo.o
 OBJS-$(CONFIG_FOURXM_DECODER)          += 4xm.o
 OBJS-$(CONFIG_FRAPS_DECODER)           += fraps.o
 OBJS-$(CONFIG_FRWU_DECODER)            += frwu.o
-OBJS-$(CONFIG_G723_1_DECODER)          += g723_1.o acelp_vectors.o celp.o
+OBJS-$(CONFIG_G723_1_DECODER)          += g723_1.o acelp_vectors.o
 OBJS-$(CONFIG_GIF_DECODER)             += gifdec.o lzw.o
 OBJS-$(CONFIG_GIF_ENCODER)             += gif.o lzwenc.o
 OBJS-$(CONFIG_GSM_DECODER)             += gsmdec.o gsmdec_data.o msgsmdec.o
@@ -297,8 +298,7 @@  OBJS-$(CONFIG_PPM_ENCODER)             += pnmenc.o pnm.o
 OBJS-$(CONFIG_PRORES_DECODER)          += proresdec.o proresdata.o proresdsp.o
 OBJS-$(CONFIG_PRORES_ENCODER)          += proresenc.o proresdata.o proresdsp.o
 OBJS-$(CONFIG_PTX_DECODER)             += ptx.o
-OBJS-$(CONFIG_QCELP_DECODER)           += qcelpdec.o                     \
-                                          celp.o acelp_vectors.o         \
+OBJS-$(CONFIG_QCELP_DECODER)           += qcelpdec.o acelp_vectors.o    \
                                           acelp_filters.o
 OBJS-$(CONFIG_QDM2_DECODER)            += qdm2.o
 OBJS-$(CONFIG_QDRAW_DECODER)           += qdrw.o
@@ -307,10 +307,9 @@  OBJS-$(CONFIG_QTRLE_DECODER)           += qtrle.o
 OBJS-$(CONFIG_QTRLE_ENCODER)           += qtrleenc.o
 OBJS-$(CONFIG_R10K_DECODER)            += r210dec.o
 OBJS-$(CONFIG_R210_DECODER)            += r210dec.o
-OBJS-$(CONFIG_RA_144_DECODER)          += ra144dec.o ra144.o celp.o
-OBJS-$(CONFIG_RA_144_ENCODER)          += ra144enc.o ra144.o celp.o     \
-                                          audio_frame_queue.o
-OBJS-$(CONFIG_RA_288_DECODER)          += ra288.o celp.o
+OBJS-$(CONFIG_RA_144_DECODER)          += ra144dec.o ra144.o
+OBJS-$(CONFIG_RA_144_ENCODER)          += ra144enc.o ra144.o audio_frame_queue.o
+OBJS-$(CONFIG_RA_288_DECODER)          += ra288.o
 OBJS-$(CONFIG_RALF_DECODER)            += ralf.o
 OBJS-$(CONFIG_RAWVIDEO_DECODER)        += rawdec.o
 OBJS-$(CONFIG_RAWVIDEO_ENCODER)        += rawenc.o
@@ -331,8 +330,7 @@  OBJS-$(CONFIG_SGI_DECODER)             += sgidec.o
 OBJS-$(CONFIG_SGI_ENCODER)             += sgienc.o rle.o
 OBJS-$(CONFIG_SHORTEN_DECODER)         += shorten.o
 OBJS-$(CONFIG_SIPR_DECODER)            += sipr.o acelp_pitch_delay.o \
-                                          acelp_vectors.o \
-                                          acelp_filters.o celp.o \
+                                          acelp_vectors.o acelp_filters.o \
                                           sipr16k.o
 OBJS-$(CONFIG_SMACKAUD_DECODER)        += smacker.o
 OBJS-$(CONFIG_SMACKER_DECODER)         += smacker.o
@@ -406,7 +404,7 @@  OBJS-$(CONFIG_WMAV1_DECODER)           += wmadec.o wma.o wma_common.o aactab.o
 OBJS-$(CONFIG_WMAV1_ENCODER)           += wmaenc.o wma.o wma_common.o aactab.o
 OBJS-$(CONFIG_WMAV2_DECODER)           += wmadec.o wma.o wma_common.o aactab.o
 OBJS-$(CONFIG_WMAV2_ENCODER)           += wmaenc.o wma.o wma_common.o aactab.o
-OBJS-$(CONFIG_WMAVOICE_DECODER)        += wmavoice.o celp.o             \
+OBJS-$(CONFIG_WMAVOICE_DECODER)        += wmavoice.o                    \
                                           acelp_vectors.o acelp_filters.o
 OBJS-$(CONFIG_WMV1_DECODER)            += msmpeg4.o msmpeg4data.o
 OBJS-$(CONFIG_WMV2_DECODER)            += wmv2dec.o wmv2.o        \