From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 7A1B34D03E for ; Sun, 15 Jun 2025 01:06:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id AC89668CF6A; Sun, 15 Jun 2025 04:06:19 +0300 (EEST) Received: from mx.sdf.org (mx.sdf.org [205.166.94.24]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id B954B68CBFF for ; Sun, 15 Jun 2025 04:06:12 +0300 (EEST) Received: from e0817f894f8051a778ef1abc87298305 ([1.145.198.154]) (authenticated (0 bits)) by mx.sdf.org (8.18.1/8.14.3) with ESMTPSA id 55F15qnh008123 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Sun, 15 Jun 2025 01:06:03 GMT Date: Sun, 15 Jun 2025 11:05:51 +1000 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: <56d989564c26cff93e8819382e1ef728ff129df8.1749949441.git.pross@xvid.org> References: <304ca8b0474aee1efc65dedfe65f78452d9a3c74.1749506465.git.pross@xvid.org> MIME-Version: 1.0 In-Reply-To: <304ca8b0474aee1efc65dedfe65f78452d9a3c74.1749506465.git.pross@xvid.org> Subject: [FFmpeg-devel] [PATCHv2] configure: add celp_math component X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="===============2724450564294581745==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============2724450564294581745== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="dDL4hyhMNauclG/E" Content-Disposition: inline --dDL4hyhMNauclG/E Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable libavcodec/tests/celp_math depends on libavcodec/celp_math.o This fixes fate when configuring with --disable-everything --- patch v2: also add celp_math component to libavcodec/mips/Makefile configure | 13 ++++++++----- libavcodec/Makefile | 17 +++++++++-------- libavcodec/mips/Makefile | 3 +-- tests/fate/libavcodec.mak | 2 +- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 534b443f7d..2d312e739c 100755 --- a/configure +++ b/configure @@ -2573,6 +2573,7 @@ CONFIG_EXTRA=3D" cbs_mpeg2 cbs_vp8 cbs_vp9 + celp_math d3d12va_encode deflate_wrapper dirac_parse @@ -2922,15 +2923,15 @@ ac3_decoder_select=3D"ac3_parser ac3dsp bswapdsp fm= tconvert" ac3_fixed_decoder_select=3D"ac3_parser ac3dsp bswapdsp" ac3_encoder_select=3D"ac3dsp audiodsp me_cmp" ac3_fixed_encoder_select=3D"ac3dsp audiodsp me_cmp" -acelp_kelvin_decoder_select=3D"audiodsp" +acelp_kelvin_decoder_select=3D"audiodsp celp_math" adpcm_g722_decoder_select=3D"g722dsp" adpcm_g722_encoder_select=3D"g722dsp" agm_decoder_select=3D"idctdsp" aic_decoder_select=3D"golomb idctdsp" alac_encoder_select=3D"lpc" als_decoder_select=3D"bswapdsp mpeg4audio" -amrnb_decoder_select=3D"lsp" -amrwb_decoder_select=3D"lsp" +amrnb_decoder_select=3D"lsp celp_math" +amrwb_decoder_select=3D"lsp celp_math" amv_decoder_select=3D"sp5x_decoder exif" amv_encoder_select=3D"jpegtables mpegvideoenc" ape_decoder_select=3D"bswapdsp llauddsp" @@ -2992,7 +2993,9 @@ fraps_decoder_select=3D"bswapdsp huffman" ftr_decoder_select=3D"adts_header" g2m_decoder_deps=3D"zlib" g2m_decoder_select=3D"blockdsp idctdsp jpegtables" -g729_decoder_select=3D"audiodsp" +g723_1_decoder_select=3D"celp_math" +g723_1_encoder_select=3D"celp_math" +g729_decoder_select=3D"audiodsp celp_math" h261_decoder_select=3D"mpegvideodec" h261_encoder_select=3D"mpegvideoenc" h263_decoder_select=3D"h263_parser h263dsp mpegvideodec qpeldsp" @@ -3100,7 +3103,7 @@ rv40_decoder_select=3D"golomb h264pred h264qpel mpegv= ideodec rv34dsp" rv60_decoder_select=3D"videodsp golomb" screenpresso_decoder_deps=3D"zlib" shorten_decoder_select=3D"bswapdsp" -sipr_decoder_select=3D"lsp" +sipr_decoder_select=3D"lsp celp_math" smvjpeg_decoder_select=3D"mjpeg_decoder" snow_decoder_select=3D"dwt h264qpel rangecoder videodsp" snow_encoder_select=3D"dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder= videodsp" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index cfbec99889..bd4fa511bd 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -92,6 +92,7 @@ OBJS-$(CONFIG_CBS_JPEG) +=3D cbs_jpeg.o OBJS-$(CONFIG_CBS_MPEG2) +=3D cbs_mpeg2.o OBJS-$(CONFIG_CBS_VP8) +=3D cbs_vp8.o vp8data.o OBJS-$(CONFIG_CBS_VP9) +=3D cbs_vp9.o +OBJS-$(CONFIG_CELP_MATH) +=3D celp_math.o OBJS-$(CONFIG_D3D12VA_ENCODE) +=3D d3d12va_encode.o hw_base_encod= e.o OBJS-$(CONFIG_DEFLATE_WRAPPER) +=3D zlib_wrapper.o OBJS-$(CONFIG_DOVI_RPUDEC) +=3D dovi_rpu.o dovi_rpudec.o @@ -212,7 +213,7 @@ OBJS-$(CONFIG_AC3_ENCODER) +=3D ac3enc_floa= t.o ac3enc.o ac3tab.o \ ac3.o kbdwin.o OBJS-$(CONFIG_AC3_FIXED_ENCODER) +=3D ac3enc_fixed.o ac3enc.o ac3tab= =2Eo ac3.o kbdwin.o OBJS-$(CONFIG_AC3_MF_ENCODER) +=3D mfenc.o mf_utils.o -OBJS-$(CONFIG_ACELP_KELVIN_DECODER) +=3D g729dec.o lsp.o celp_math.o ce= lp_filters.o acelp_filters.o acelp_pitch_delay.o acelp_vectors.o g729postfi= lter.o +OBJS-$(CONFIG_ACELP_KELVIN_DECODER) +=3D g729dec.o lsp.o celp_filters.o= acelp_filters.o acelp_pitch_delay.o acelp_vectors.o g729postfilter.o OBJS-$(CONFIG_AGM_DECODER) +=3D agm.o jpegquanttables.o OBJS-$(CONFIG_AIC_DECODER) +=3D aic.o OBJS-$(CONFIG_ALAC_DECODER) +=3D alac.o alac_data.o alacdsp.o @@ -221,11 +222,11 @@ OBJS-$(CONFIG_ALIAS_PIX_DECODER) +=3D aliaspixd= ec.o OBJS-$(CONFIG_ALIAS_PIX_ENCODER) +=3D aliaspixenc.o OBJS-$(CONFIG_ALS_DECODER) +=3D alsdec.o bgmc.o mlz.o OBJS-$(CONFIG_AMRNB_DECODER) +=3D amrnbdec.o celp_filters.o \ - celp_math.o acelp_filters.o \ + acelp_filters.o \ acelp_vectors.o \ acelp_pitch_delay.o OBJS-$(CONFIG_AMRWB_DECODER) +=3D amrwbdec.o celp_filters.o \ - celp_math.o acelp_filters.o \ + acelp_filters.o \ acelp_vectors.o \ acelp_pitch_delay.o OBJS-$(CONFIG_AMRNB_MEDIACODEC_DECODER) +=3D mediacodecdec.o @@ -392,10 +393,10 @@ OBJS-$(CONFIG_FRWU_DECODER) +=3D frwu.o OBJS-$(CONFIG_FTR_DECODER) +=3D ftr.o OBJS-$(CONFIG_G2M_DECODER) +=3D g2meet.o elsdec.o mjpegdec_com= mon.o OBJS-$(CONFIG_G723_1_DECODER) +=3D g723_1dec.o g723_1.o \ - acelp_vectors.o celp_filters.o c= elp_math.o + acelp_vectors.o celp_filters.o OBJS-$(CONFIG_G723_1_ENCODER) +=3D g723_1enc.o g723_1.o \ - acelp_vectors.o celp_filters.o c= elp_math.o -OBJS-$(CONFIG_G729_DECODER) +=3D g729dec.o lsp.o celp_math.o ce= lp_filters.o acelp_filters.o acelp_pitch_delay.o acelp_vectors.o g729postfi= lter.o + acelp_vectors.o celp_filters.o +OBJS-$(CONFIG_G729_DECODER) +=3D g729dec.o lsp.o celp_filters.o= acelp_filters.o acelp_pitch_delay.o acelp_vectors.o g729postfilter.o OBJS-$(CONFIG_GDV_DECODER) +=3D gdv.o OBJS-$(CONFIG_GEM_DECODER) +=3D gemdec.o OBJS-$(CONFIG_GIF_DECODER) +=3D gifdec.o lzw.o @@ -686,7 +687,7 @@ OBJS-$(CONFIG_SGIRLE_DECODER) +=3D sgirledec.o OBJS-$(CONFIG_SHEERVIDEO_DECODER) +=3D sheervideo.o OBJS-$(CONFIG_SHORTEN_DECODER) +=3D shorten.o OBJS-$(CONFIG_SIPR_DECODER) +=3D sipr.o acelp_pitch_delay.o \ - celp_math.o acelp_vectors.o \ + acelp_vectors.o \ acelp_filters.o celp_filters.o \ sipr16k.o OBJS-$(CONFIG_SIREN_DECODER) +=3D siren.o @@ -1323,7 +1324,6 @@ TESTPROGS =3D avcodec = \ avpacket \ bitstream_be \ bitstream_le \ - celp_math \ codec_desc \ htmlsubtitles \ jpeg2000dwt \ @@ -1332,6 +1332,7 @@ TESTPROGS =3D avcodec = \ TESTPROGS-$(CONFIG_APV_DECODER) +=3D apv TESTPROGS-$(CONFIG_AV1_VAAPI_ENCODER) +=3D av1_levels TESTPROGS-$(CONFIG_CABAC) +=3D cabac +TESTPROGS-$(CONFIG_CELP_MATH) +=3D celp_math TESTPROGS-$(CONFIG_GOLOMB) +=3D golomb TESTPROGS-$(CONFIG_IDCTDSP) +=3D dct TESTPROGS-$(CONFIG_DXV_ENCODER) +=3D hashtable diff --git a/libavcodec/mips/Makefile b/libavcodec/mips/Makefile index 569d1db4a3..24411aebf8 100644 --- a/libavcodec/mips/Makefile +++ b/libavcodec/mips/Makefile @@ -3,13 +3,12 @@ ARCH_HEADERS =3D cabac.h co= mpute_antialias_fixed.h \ =20 MIPSFPU-OBJS-$(CONFIG_AMRNB_DECODER) +=3D mips/acelp_filters_mips.o = \ mips/celp_filters_mips.o = \ - mips/celp_math_mips.o = \ mips/acelp_vectors_mips.o MIPSFPU-OBJS-$(CONFIG_AMRWB_DECODER) +=3D mips/acelp_filters_mips.o = \ mips/celp_filters_mips.o = \ mips/amrwbdec_mips.o = \ - mips/celp_math_mips.o = \ mips/acelp_vectors_mips.o +MIPSFPU-OBJS-$(CONFIG_CELP_MATH) +=3D mips/celp_math_mips.o MIPSFPU-OBJS-$(CONFIG_MPEGAUDIODSP) +=3D mips/mpegaudiodsp_mips_floa= t.o MIPSDSP-OBJS-$(CONFIG_MPEGAUDIODSP) +=3D mips/mpegaudiodsp_mips_fixe= d.o MIPSFPU-OBJS-$(CONFIG_FMTCONVERT) +=3D mips/fmtconvert_mips.o diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak index 089ab11fb1..e2d616e307 100644 --- a/tests/fate/libavcodec.mak +++ b/tests/fate/libavcodec.mak @@ -28,7 +28,7 @@ fate-cabac: libavcodec/tests/cabac$(EXESUF) fate-cabac: CMD =3D run libavcodec/tests/cabac$(EXESUF) fate-cabac: CMP =3D null =20 -FATE_LIBAVCODEC-yes +=3D fate-celp_math +FATE_LIBAVCODEC-$(CONFIG_CELP_MATH) +=3D fate-celp_math fate-celp_math: libavcodec/tests/celp_math$(EXESUF) fate-celp_math: CMD =3D run libavcodec/tests/celp_math$(EXESUF) fate-celp_math: CMP =3D null --=20 2.47.2 -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B) --dDL4hyhMNauclG/E Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQSpB+AvpuUM0jTNINJnYHnFrEDdawUCaE4cawAKCRBnYHnFrEDd a0Q6AJ0d1HENNOUDgrARQ+o07jw6Oit/LQCeNLWVQd+zlTzNFfRD9edN+JASEFk= =b4Lp -----END PGP SIGNATURE----- --dDL4hyhMNauclG/E-- --===============2724450564294581745== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --===============2724450564294581745==--