1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00

configure: add celp_math component

libavcodec/tests/celp_math depends on libavcodec/celp_math.o

This fixes fate when configuring with --disable-everything
This commit is contained in:
Peter Ross
2025-06-10 07:46:31 +10:00
parent e5bb448543
commit 2663d97336
4 changed files with 19 additions and 16 deletions

13
configure vendored
View File

@ -2573,6 +2573,7 @@ CONFIG_EXTRA="
cbs_mpeg2 cbs_mpeg2
cbs_vp8 cbs_vp8
cbs_vp9 cbs_vp9
celp_math
d3d12va_encode d3d12va_encode
deflate_wrapper deflate_wrapper
dirac_parse dirac_parse
@ -2922,15 +2923,15 @@ ac3_decoder_select="ac3_parser ac3dsp bswapdsp fmtconvert"
ac3_fixed_decoder_select="ac3_parser ac3dsp bswapdsp" ac3_fixed_decoder_select="ac3_parser ac3dsp bswapdsp"
ac3_encoder_select="ac3dsp audiodsp me_cmp" ac3_encoder_select="ac3dsp audiodsp me_cmp"
ac3_fixed_encoder_select="ac3dsp audiodsp me_cmp" ac3_fixed_encoder_select="ac3dsp audiodsp me_cmp"
acelp_kelvin_decoder_select="audiodsp" acelp_kelvin_decoder_select="audiodsp celp_math"
adpcm_g722_decoder_select="g722dsp" adpcm_g722_decoder_select="g722dsp"
adpcm_g722_encoder_select="g722dsp" adpcm_g722_encoder_select="g722dsp"
agm_decoder_select="idctdsp" agm_decoder_select="idctdsp"
aic_decoder_select="golomb idctdsp" aic_decoder_select="golomb idctdsp"
alac_encoder_select="lpc" alac_encoder_select="lpc"
als_decoder_select="bswapdsp mpeg4audio" als_decoder_select="bswapdsp mpeg4audio"
amrnb_decoder_select="lsp" amrnb_decoder_select="lsp celp_math"
amrwb_decoder_select="lsp" amrwb_decoder_select="lsp celp_math"
amv_decoder_select="sp5x_decoder exif" amv_decoder_select="sp5x_decoder exif"
amv_encoder_select="jpegtables mpegvideoenc" amv_encoder_select="jpegtables mpegvideoenc"
ape_decoder_select="bswapdsp llauddsp" ape_decoder_select="bswapdsp llauddsp"
@ -2992,7 +2993,9 @@ fraps_decoder_select="bswapdsp huffman"
ftr_decoder_select="adts_header" ftr_decoder_select="adts_header"
g2m_decoder_deps="zlib" g2m_decoder_deps="zlib"
g2m_decoder_select="blockdsp idctdsp jpegtables" g2m_decoder_select="blockdsp idctdsp jpegtables"
g729_decoder_select="audiodsp" g723_1_decoder_select="celp_math"
g723_1_encoder_select="celp_math"
g729_decoder_select="audiodsp celp_math"
h261_decoder_select="mpegvideodec" h261_decoder_select="mpegvideodec"
h261_encoder_select="mpegvideoenc" h261_encoder_select="mpegvideoenc"
h263_decoder_select="h263_parser h263dsp mpegvideodec qpeldsp" h263_decoder_select="h263_parser h263dsp mpegvideodec qpeldsp"
@ -3100,7 +3103,7 @@ rv40_decoder_select="golomb h264pred h264qpel mpegvideodec rv34dsp"
rv60_decoder_select="videodsp golomb" rv60_decoder_select="videodsp golomb"
screenpresso_decoder_deps="zlib" screenpresso_decoder_deps="zlib"
shorten_decoder_select="bswapdsp" shorten_decoder_select="bswapdsp"
sipr_decoder_select="lsp" sipr_decoder_select="lsp celp_math"
smvjpeg_decoder_select="mjpeg_decoder" smvjpeg_decoder_select="mjpeg_decoder"
snow_decoder_select="dwt h264qpel rangecoder videodsp" snow_decoder_select="dwt h264qpel rangecoder videodsp"
snow_encoder_select="dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder videodsp" snow_encoder_select="dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder videodsp"

View File

@ -92,6 +92,7 @@ OBJS-$(CONFIG_CBS_JPEG) += cbs_jpeg.o
OBJS-$(CONFIG_CBS_MPEG2) += cbs_mpeg2.o OBJS-$(CONFIG_CBS_MPEG2) += cbs_mpeg2.o
OBJS-$(CONFIG_CBS_VP8) += cbs_vp8.o vp8data.o OBJS-$(CONFIG_CBS_VP8) += cbs_vp8.o vp8data.o
OBJS-$(CONFIG_CBS_VP9) += cbs_vp9.o OBJS-$(CONFIG_CBS_VP9) += cbs_vp9.o
OBJS-$(CONFIG_CELP_MATH) += celp_math.o
OBJS-$(CONFIG_D3D12VA_ENCODE) += d3d12va_encode.o hw_base_encode.o OBJS-$(CONFIG_D3D12VA_ENCODE) += d3d12va_encode.o hw_base_encode.o
OBJS-$(CONFIG_DEFLATE_WRAPPER) += zlib_wrapper.o OBJS-$(CONFIG_DEFLATE_WRAPPER) += zlib_wrapper.o
OBJS-$(CONFIG_DOVI_RPUDEC) += dovi_rpu.o dovi_rpudec.o OBJS-$(CONFIG_DOVI_RPUDEC) += dovi_rpu.o dovi_rpudec.o
@ -212,7 +213,7 @@ OBJS-$(CONFIG_AC3_ENCODER) += ac3enc_float.o ac3enc.o ac3tab.o \
ac3.o kbdwin.o ac3.o kbdwin.o
OBJS-$(CONFIG_AC3_FIXED_ENCODER) += ac3enc_fixed.o ac3enc.o ac3tab.o ac3.o kbdwin.o OBJS-$(CONFIG_AC3_FIXED_ENCODER) += ac3enc_fixed.o ac3enc.o ac3tab.o ac3.o kbdwin.o
OBJS-$(CONFIG_AC3_MF_ENCODER) += mfenc.o mf_utils.o OBJS-$(CONFIG_AC3_MF_ENCODER) += mfenc.o mf_utils.o
OBJS-$(CONFIG_ACELP_KELVIN_DECODER) += g729dec.o lsp.o celp_math.o celp_filters.o acelp_filters.o acelp_pitch_delay.o acelp_vectors.o g729postfilter.o OBJS-$(CONFIG_ACELP_KELVIN_DECODER) += g729dec.o lsp.o celp_filters.o acelp_filters.o acelp_pitch_delay.o acelp_vectors.o g729postfilter.o
OBJS-$(CONFIG_AGM_DECODER) += agm.o jpegquanttables.o OBJS-$(CONFIG_AGM_DECODER) += agm.o jpegquanttables.o
OBJS-$(CONFIG_AIC_DECODER) += aic.o OBJS-$(CONFIG_AIC_DECODER) += aic.o
OBJS-$(CONFIG_ALAC_DECODER) += alac.o alac_data.o alacdsp.o OBJS-$(CONFIG_ALAC_DECODER) += alac.o alac_data.o alacdsp.o
@ -221,11 +222,11 @@ OBJS-$(CONFIG_ALIAS_PIX_DECODER) += aliaspixdec.o
OBJS-$(CONFIG_ALIAS_PIX_ENCODER) += aliaspixenc.o OBJS-$(CONFIG_ALIAS_PIX_ENCODER) += aliaspixenc.o
OBJS-$(CONFIG_ALS_DECODER) += alsdec.o bgmc.o mlz.o OBJS-$(CONFIG_ALS_DECODER) += alsdec.o bgmc.o mlz.o
OBJS-$(CONFIG_AMRNB_DECODER) += amrnbdec.o celp_filters.o \ OBJS-$(CONFIG_AMRNB_DECODER) += amrnbdec.o celp_filters.o \
celp_math.o acelp_filters.o \ acelp_filters.o \
acelp_vectors.o \ acelp_vectors.o \
acelp_pitch_delay.o acelp_pitch_delay.o
OBJS-$(CONFIG_AMRWB_DECODER) += amrwbdec.o celp_filters.o \ OBJS-$(CONFIG_AMRWB_DECODER) += amrwbdec.o celp_filters.o \
celp_math.o acelp_filters.o \ acelp_filters.o \
acelp_vectors.o \ acelp_vectors.o \
acelp_pitch_delay.o acelp_pitch_delay.o
OBJS-$(CONFIG_AMRNB_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_AMRNB_MEDIACODEC_DECODER) += mediacodecdec.o
@ -392,10 +393,10 @@ OBJS-$(CONFIG_FRWU_DECODER) += frwu.o
OBJS-$(CONFIG_FTR_DECODER) += ftr.o OBJS-$(CONFIG_FTR_DECODER) += ftr.o
OBJS-$(CONFIG_G2M_DECODER) += g2meet.o elsdec.o mjpegdec_common.o OBJS-$(CONFIG_G2M_DECODER) += g2meet.o elsdec.o mjpegdec_common.o
OBJS-$(CONFIG_G723_1_DECODER) += g723_1dec.o g723_1.o \ OBJS-$(CONFIG_G723_1_DECODER) += g723_1dec.o g723_1.o \
acelp_vectors.o celp_filters.o celp_math.o acelp_vectors.o celp_filters.o
OBJS-$(CONFIG_G723_1_ENCODER) += g723_1enc.o g723_1.o \ OBJS-$(CONFIG_G723_1_ENCODER) += g723_1enc.o g723_1.o \
acelp_vectors.o celp_filters.o celp_math.o acelp_vectors.o celp_filters.o
OBJS-$(CONFIG_G729_DECODER) += g729dec.o lsp.o celp_math.o celp_filters.o acelp_filters.o acelp_pitch_delay.o acelp_vectors.o g729postfilter.o OBJS-$(CONFIG_G729_DECODER) += g729dec.o lsp.o celp_filters.o acelp_filters.o acelp_pitch_delay.o acelp_vectors.o g729postfilter.o
OBJS-$(CONFIG_GDV_DECODER) += gdv.o OBJS-$(CONFIG_GDV_DECODER) += gdv.o
OBJS-$(CONFIG_GEM_DECODER) += gemdec.o OBJS-$(CONFIG_GEM_DECODER) += gemdec.o
OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o
@ -686,7 +687,7 @@ OBJS-$(CONFIG_SGIRLE_DECODER) += sgirledec.o
OBJS-$(CONFIG_SHEERVIDEO_DECODER) += sheervideo.o OBJS-$(CONFIG_SHEERVIDEO_DECODER) += sheervideo.o
OBJS-$(CONFIG_SHORTEN_DECODER) += shorten.o OBJS-$(CONFIG_SHORTEN_DECODER) += shorten.o
OBJS-$(CONFIG_SIPR_DECODER) += sipr.o acelp_pitch_delay.o \ OBJS-$(CONFIG_SIPR_DECODER) += sipr.o acelp_pitch_delay.o \
celp_math.o acelp_vectors.o \ acelp_vectors.o \
acelp_filters.o celp_filters.o \ acelp_filters.o celp_filters.o \
sipr16k.o sipr16k.o
OBJS-$(CONFIG_SIREN_DECODER) += siren.o OBJS-$(CONFIG_SIREN_DECODER) += siren.o
@ -1323,7 +1324,6 @@ TESTPROGS = avcodec \
avpacket \ avpacket \
bitstream_be \ bitstream_be \
bitstream_le \ bitstream_le \
celp_math \
codec_desc \ codec_desc \
htmlsubtitles \ htmlsubtitles \
jpeg2000dwt \ jpeg2000dwt \
@ -1332,6 +1332,7 @@ TESTPROGS = avcodec \
TESTPROGS-$(CONFIG_APV_DECODER) += apv TESTPROGS-$(CONFIG_APV_DECODER) += apv
TESTPROGS-$(CONFIG_AV1_VAAPI_ENCODER) += av1_levels TESTPROGS-$(CONFIG_AV1_VAAPI_ENCODER) += av1_levels
TESTPROGS-$(CONFIG_CABAC) += cabac TESTPROGS-$(CONFIG_CABAC) += cabac
TESTPROGS-$(CONFIG_CELP_MATH) += celp_math
TESTPROGS-$(CONFIG_GOLOMB) += golomb TESTPROGS-$(CONFIG_GOLOMB) += golomb
TESTPROGS-$(CONFIG_IDCTDSP) += dct TESTPROGS-$(CONFIG_IDCTDSP) += dct
TESTPROGS-$(CONFIG_DXV_ENCODER) += hashtable TESTPROGS-$(CONFIG_DXV_ENCODER) += hashtable

View File

@ -3,13 +3,12 @@ ARCH_HEADERS = cabac.h compute_antialias_fixed.h \
MIPSFPU-OBJS-$(CONFIG_AMRNB_DECODER) += mips/acelp_filters_mips.o \ MIPSFPU-OBJS-$(CONFIG_AMRNB_DECODER) += mips/acelp_filters_mips.o \
mips/celp_filters_mips.o \ mips/celp_filters_mips.o \
mips/celp_math_mips.o \
mips/acelp_vectors_mips.o mips/acelp_vectors_mips.o
MIPSFPU-OBJS-$(CONFIG_AMRWB_DECODER) += mips/acelp_filters_mips.o \ MIPSFPU-OBJS-$(CONFIG_AMRWB_DECODER) += mips/acelp_filters_mips.o \
mips/celp_filters_mips.o \ mips/celp_filters_mips.o \
mips/amrwbdec_mips.o \ mips/amrwbdec_mips.o \
mips/celp_math_mips.o \
mips/acelp_vectors_mips.o mips/acelp_vectors_mips.o
MIPSFPU-OBJS-$(CONFIG_CELP_MATH) += mips/celp_math_mips.o
MIPSFPU-OBJS-$(CONFIG_MPEGAUDIODSP) += mips/mpegaudiodsp_mips_float.o MIPSFPU-OBJS-$(CONFIG_MPEGAUDIODSP) += mips/mpegaudiodsp_mips_float.o
MIPSDSP-OBJS-$(CONFIG_MPEGAUDIODSP) += mips/mpegaudiodsp_mips_fixed.o MIPSDSP-OBJS-$(CONFIG_MPEGAUDIODSP) += mips/mpegaudiodsp_mips_fixed.o
MIPSFPU-OBJS-$(CONFIG_FMTCONVERT) += mips/fmtconvert_mips.o MIPSFPU-OBJS-$(CONFIG_FMTCONVERT) += mips/fmtconvert_mips.o

View File

@ -28,7 +28,7 @@ fate-cabac: libavcodec/tests/cabac$(EXESUF)
fate-cabac: CMD = run libavcodec/tests/cabac$(EXESUF) fate-cabac: CMD = run libavcodec/tests/cabac$(EXESUF)
fate-cabac: CMP = null fate-cabac: CMP = null
FATE_LIBAVCODEC-yes += fate-celp_math FATE_LIBAVCODEC-$(CONFIG_CELP_MATH) += fate-celp_math
fate-celp_math: libavcodec/tests/celp_math$(EXESUF) fate-celp_math: libavcodec/tests/celp_math$(EXESUF)
fate-celp_math: CMD = run libavcodec/tests/celp_math$(EXESUF) fate-celp_math: CMD = run libavcodec/tests/celp_math$(EXESUF)
fate-celp_math: CMP = null fate-celp_math: CMP = null