From 01621202aad7e27b2a05c71d9ad7a19dfcbe17ec Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 16 Feb 2016 17:58:50 +0100 Subject: [PATCH] build: miscellaneous cosmetics Restore alphabetical order in lists, break overly long lines, do some prettyprinting, add some explanatory section comments, group parts together that belong together logically. --- Makefile | 9 ++++--- libavcodec/Makefile | 26 +++++++++--------- libavcodec/aarch64/Makefile | 17 +++++++++--- libavcodec/arm/Makefile | 8 +++--- libavcodec/ppc/Makefile | 2 +- libavcodec/x86/Makefile | 2 +- libavdevice/Makefile | 4 +-- libavfilter/Makefile | 15 ++++++----- libavformat/Makefile | 26 +++++++++--------- libavresample/aarch64/Makefile | 8 +++--- libavresample/arm/Makefile | 8 +++--- libavutil/Makefile | 8 +++--- libswscale/Makefile | 16 ++++++------ tests/Makefile | 3 ++- tests/checkasm/Makefile | 21 ++++++++------- tests/fate/image.mak | 48 +++++++++++++++++++++++++++++++++- tests/fate/libavresample.mak | 8 +++--- tests/fate/seek.mak | 16 ++++++------ 18 files changed, 153 insertions(+), 92 deletions(-) diff --git a/Makefile b/Makefile index c06d862011..96ad55d8dc 100644 --- a/Makefile +++ b/Makefile @@ -82,11 +82,11 @@ ALLAVPROGS = $(AVBASENAMES:%=%$(EXESUF)) $(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog) += cmdutils.o)) OBJS-avconv += avconv_opt.o avconv_filter.o -OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_vdpau.o -OBJS-avconv-$(HAVE_DXVA2_LIB) += avconv_dxva2.o -OBJS-avconv-$(CONFIG_VDA) += avconv_vda.o OBJS-avconv-$(CONFIG_LIBMFX) += avconv_qsv.o OBJS-avconv-$(CONFIG_VAAPI) += avconv_vaapi.o +OBJS-avconv-$(CONFIG_VDA) += avconv_vda.o +OBJS-avconv-$(HAVE_DXVA2_LIB) += avconv_dxva2.o +OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_vdpau.o TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64 HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options @@ -105,7 +105,8 @@ FFLIBS := avutil DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.avpreset) -SKIPHEADERS = cmdutils_common_opts.h compat/w32pthreads.h +SKIPHEADERS = cmdutils_common_opts.h \ + compat/w32pthreads.h include $(SRC_PATH)/common.mak diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 22279fb2e2..307d7c61f6 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -2,9 +2,9 @@ NAME = avcodec HEADERS = avcodec.h \ avfft.h \ - dv_profile.h \ d3d11va.h \ dirac.h \ + dv_profile.h \ dxva2.h \ qsv.h \ vaapi.h \ @@ -91,8 +91,8 @@ OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \ motion_est.o ratecontrol.o \ mpegvideoencdsp.o OBJS-$(CONFIG_MSS34DSP) += mss34dsp.o +OBJS-$(CONFIG_NVENC) += nvenc.o OBJS-$(CONFIG_PIXBLOCKDSP) += pixblockdsp.o -OBJS-${CONFIG_NVENC} += nvenc.o OBJS-$(CONFIG_QPELDSP) += qpeldsp.o OBJS-$(CONFIG_QSV) += qsv.o OBJS-$(CONFIG_QSVDEC) += qsvdec.o @@ -179,9 +179,9 @@ OBJS-$(CONFIG_CINEPAK_DECODER) += cinepak.o OBJS-$(CONFIG_CLJR_DECODER) += cljrdec.o OBJS-$(CONFIG_CLJR_ENCODER) += cljrenc.o OBJS-$(CONFIG_CLLC_DECODER) += cllc.o canopus.o -OBJS-$(CONFIG_COOK_DECODER) += cook.o OBJS-$(CONFIG_COMFORTNOISE_DECODER) += cngdec.o celp_filters.o OBJS-$(CONFIG_COMFORTNOISE_ENCODER) += cngenc.o +OBJS-$(CONFIG_COOK_DECODER) += cook.o OBJS-$(CONFIG_CSCD_DECODER) += cscd.o OBJS-$(CONFIG_CYUV_DECODER) += cyuv.o OBJS-$(CONFIG_DCA_DECODER) += dcadec.o dca.o dcadsp.o \ @@ -325,18 +325,18 @@ OBJS-$(CONFIG_MPC8_DECODER) += mpc8.o mpc.o OBJS-$(CONFIG_MPEG_XVMC_DECODER) += mpegvideo_xvmc.o OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpeg12.o -OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o -OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpeg12.o OBJS-$(CONFIG_MPEG2_QSV_DECODER) += qsvdec_mpeg2.o OBJS-$(CONFIG_MPEG2_QSV_ENCODER) += qsvenc_mpeg2.o +OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o +OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpeg12.o OBJS-$(CONFIG_MPEG4_DECODER) += xvididct.o +OBJS-$(CONFIG_MSA1_DECODER) += mss3.o OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_MSMPEG4V2_ENCODER) += msmpeg4enc.o msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_MSMPEG4V3_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_MSMPEG4V3_ENCODER) += msmpeg4enc.o msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_MSRLE_DECODER) += msrle.o msrledec.o -OBJS-$(CONFIG_MSA1_DECODER) += mss3.o OBJS-$(CONFIG_MSS1_DECODER) += mss1.o mss12.o OBJS-$(CONFIG_MSS2_DECODER) += mss2.o mss12.o mss2dsp.o wmv2data.o OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o @@ -445,9 +445,9 @@ OBJS-$(CONFIG_UTVIDEO_DECODER) += utvideodec.o utvideo.o OBJS-$(CONFIG_UTVIDEO_ENCODER) += utvideoenc.o utvideo.o OBJS-$(CONFIG_V210_DECODER) += v210dec.o OBJS-$(CONFIG_V210_ENCODER) += v210enc.o +OBJS-$(CONFIG_V210X_DECODER) += v210x.o OBJS-$(CONFIG_V410_DECODER) += v410dec.o OBJS-$(CONFIG_V410_ENCODER) += v410enc.o -OBJS-$(CONFIG_V210X_DECODER) += v210x.o OBJS-$(CONFIG_VB_DECODER) += vb.o OBJS-$(CONFIG_VBLE_DECODER) += vble.o OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1_block.o vc1_loopfilter.o \ @@ -488,8 +488,8 @@ OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o wmv2data.o \ OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o wmv2data.o \ msmpeg4.o msmpeg4enc.o msmpeg4data.o OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o -OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o OBJS-$(CONFIG_WRAPPED_AVFRAME_ENCODER) += wrapped_avframe.o +OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o OBJS-$(CONFIG_XAN_DPCM_DECODER) += dpcm.o OBJS-$(CONFIG_XAN_WC3_DECODER) += xan.o OBJS-$(CONFIG_XAN_WC4_DECODER) += xxan.o @@ -641,9 +641,9 @@ OBJS-$(CONFIG_LATM_MUXER) += mpeg4audio.o OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER) += mpeg4audio.o \ flac.o flacdata.o OBJS-$(CONFIG_MATROSKA_MUXER) += flac.o flacdata.o +OBJS-$(CONFIG_MOV_DEMUXER) += ac3tab.o OBJS-$(CONFIG_MP2_MUXER) += mpegaudiodata.o mpegaudiodecheader.o OBJS-$(CONFIG_MP3_MUXER) += mpegaudiodata.o mpegaudiodecheader.o -OBJS-$(CONFIG_MOV_DEMUXER) += ac3tab.o OBJS-$(CONFIG_MPEGTS_MUXER) += mpeg4audio.o OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o OBJS-$(CONFIG_OGG_DEMUXER) += mpeg12data.o \ @@ -704,9 +704,9 @@ OBJS-$(CONFIG_LIBXAVS_ENCODER) += libxavs.o OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o # parsers +OBJS-$(CONFIG_AAC_LATM_PARSER) += latm_parser.o OBJS-$(CONFIG_AAC_PARSER) += aac_parser.o aac_ac3_parser.o \ aacadtsdec.o mpeg4audio.o -OBJS-$(CONFIG_AAC_LATM_PARSER) += latm_parser.o OBJS-$(CONFIG_AC3_PARSER) += ac3_parser.o ac3tab.o \ aac_ac3_parser.o OBJS-$(CONFIG_ADX_PARSER) += adx_parser.o adx.o @@ -785,9 +785,9 @@ SKIPHEADERS-$(CONFIG_VDA) += vda.h vda_internal.h SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h TESTPROGS-$(CONFIG_FFT) += fft fft-fixed +TESTPROGS-$(CONFIG_GOLOMB) += golomb TESTPROGS-$(CONFIG_IDCTDSP) += dct TESTPROGS-$(CONFIG_IIRFILTER) += iirfilter -TESTPROGS-$(CONFIG_GOLOMB) += golomb TESTPROGS-$(CONFIG_RANGECODER) += rangecoder TESTOBJS = dctref.o @@ -833,10 +833,10 @@ $(SUBDIR)aacdec.o: $(SUBDIR)cbrt_tables.h $(SUBDIR)aacps.o: $(SUBDIR)aacps_tables.h $(SUBDIR)aactab.o: $(SUBDIR)aac_tables.h $(SUBDIR)dvenc.o: $(SUBDIR)dv_tables.h -$(SUBDIR)sinewin.o: $(SUBDIR)sinewin_tables.h +$(SUBDIR)motionpixels.o: $(SUBDIR)motionpixels_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 $(SUBDIR)pcm.o: $(SUBDIR)pcm_tables.h $(SUBDIR)qdm2.o: $(SUBDIR)qdm2_tables.h +$(SUBDIR)sinewin.o: $(SUBDIR)sinewin_tables.h endif diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile index 311cd2c1e1..764bedc927 100644 --- a/libavcodec/aarch64/Makefile +++ b/libavcodec/aarch64/Makefile @@ -1,4 +1,4 @@ -OBJS-$(CONFIG_DCA_DECODER) += aarch64/dcadsp_init.o +# subsystems OBJS-$(CONFIG_FFT) += aarch64/fft_init_aarch64.o OBJS-$(CONFIG_FMTCONVERT) += aarch64/fmtconvert_init.o OBJS-$(CONFIG_H264CHROMA) += aarch64/h264chroma_init_aarch64.o @@ -12,14 +12,20 @@ OBJS-$(CONFIG_MPEGAUDIODSP) += aarch64/mpegaudiodsp_init.o OBJS-$(CONFIG_NEON_CLOBBER_TEST) += aarch64/neontest.o OBJS-$(CONFIG_VIDEODSP) += aarch64/videodsp_init.o +# decoders/encoders +OBJS-$(CONFIG_DCA_DECODER) += aarch64/dcadsp_init.o OBJS-$(CONFIG_RV40_DECODER) += aarch64/rv40dsp_init_aarch64.o OBJS-$(CONFIG_VC1_DECODER) += aarch64/vc1dsp_init_aarch64.o OBJS-$(CONFIG_VORBIS_DECODER) += aarch64/vorbisdsp_init.o +# ARMv8 optimizations + +# subsystems ARMV8-OBJS-$(CONFIG_VIDEODSP) += aarch64/videodsp.o -NEON-OBJS-$(CONFIG_DCA_DECODER) += aarch64/dcadsp_neon.o \ - aarch64/synth_filter_neon.o +# NEON optimizations + +# subsystems NEON-OBJS-$(CONFIG_FFT) += aarch64/fft_neon.o NEON-OBJS-$(CONFIG_FMTCONVERT) += aarch64/fmtconvert_neon.o NEON-OBJS-$(CONFIG_H264CHROMA) += aarch64/h264cmc_neon.o @@ -30,7 +36,10 @@ NEON-OBJS-$(CONFIG_H264QPEL) += aarch64/h264qpel_neon.o \ aarch64/hpeldsp_neon.o NEON-OBJS-$(CONFIG_HPELDSP) += aarch64/hpeldsp_neon.o NEON-OBJS-$(CONFIG_IMDCT15) += aarch64/imdct15_neon.o -NEON-OBJS-$(CONFIG_MPEGAUDIODSP) += aarch64/mpegaudiodsp_neon.o NEON-OBJS-$(CONFIG_MDCT) += aarch64/mdct_neon.o +NEON-OBJS-$(CONFIG_MPEGAUDIODSP) += aarch64/mpegaudiodsp_neon.o +# decoders/encoders +NEON-OBJS-$(CONFIG_DCA_DECODER) += aarch64/dcadsp_neon.o \ + aarch64/synth_filter_neon.o NEON-OBJS-$(CONFIG_VORBIS_DECODER) += aarch64/vorbisdsp_neon.o diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index a684c8bee0..bd4dd4e4ce 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -7,7 +7,10 @@ OBJS-$(CONFIG_AUDIODSP) += arm/audiodsp_init_arm.o OBJS-$(CONFIG_BLOCKDSP) += arm/blockdsp_init_arm.o OBJS-$(CONFIG_FFT) += arm/fft_init_arm.o \ arm/fft_fixed_init_arm.o +OBJS-$(CONFIG_FLACDSP) += arm/flacdsp_init_arm.o \ + arm/flacdsp_arm.o OBJS-$(CONFIG_FMTCONVERT) += arm/fmtconvert_init_arm.o +OBJS-$(CONFIG_G722DSP) += arm/g722dsp_init_arm.o OBJS-$(CONFIG_H264CHROMA) += arm/h264chroma_init_arm.o OBJS-$(CONFIG_H264DSP) += arm/h264dsp_init_arm.o OBJS-$(CONFIG_H264PRED) += arm/h264pred_init_arm.o @@ -18,9 +21,6 @@ OBJS-$(CONFIG_IDCTDSP) += arm/idctdsp_init_arm.o \ arm/idctdsp_arm.o \ arm/jrevdct_arm.o \ arm/simple_idct_arm.o -OBJS-$(CONFIG_FLACDSP) += arm/flacdsp_init_arm.o \ - arm/flacdsp_arm.o -OBJS-$(CONFIG_G722DSP) += arm/g722dsp_init_arm.o OBJS-$(CONFIG_MDCT) += arm/mdct_init_arm.o \ arm/mdct_fixed_init_arm.o OBJS-$(CONFIG_ME_CMP) += arm/me_cmp_init_arm.o @@ -72,13 +72,13 @@ ARMV6-OBJS-$(CONFIG_ME_CMP) += arm/me_cmp_armv6.o ARMV6-OBJS-$(CONFIG_MPEGAUDIODSP) += arm/mpegaudiodsp_fixed_armv6.o ARMV6-OBJS-$(CONFIG_MPEGVIDEOENC) += arm/mpegvideoencdsp_armv6.o ARMV6-OBJS-$(CONFIG_PIXBLOCKDSP) += arm/pixblockdsp_armv6.o +ARMV6-OBJS-$(CONFIG_STARTCODE) += arm/startcode_armv6.o ARMV6-OBJS-$(CONFIG_VP8DSP) += arm/vp8_armv6.o \ arm/vp8dsp_init_armv6.o \ arm/vp8dsp_armv6.o # decoders/encoders ARMV6-OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_armv6.o -ARMV6-OBJS-$(CONFIG_STARTCODE) += arm/startcode_armv6.o # VFP optimizations diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile index 759888bc51..9234e77287 100644 --- a/libavcodec/ppc/Makefile +++ b/libavcodec/ppc/Makefile @@ -3,13 +3,13 @@ OBJS-$(CONFIG_AUDIODSP) += ppc/audiodsp.o OBJS-$(CONFIG_BLOCKDSP) += ppc/blockdsp.o OBJS-$(CONFIG_FFT) += ppc/fft_init.o \ ppc/fft_altivec.o +OBJS-$(CONFIG_FDCTDSP) += ppc/fdctdsp.o OBJS-$(CONFIG_FMTCONVERT) += ppc/fmtconvert_altivec.o OBJS-$(CONFIG_H264CHROMA) += ppc/h264chroma_init.o OBJS-$(CONFIG_H264DSP) += ppc/h264dsp.o OBJS-$(CONFIG_H264QPEL) += ppc/h264qpel.o OBJS-$(CONFIG_HPELDSP) += ppc/hpeldsp_altivec.o OBJS-$(CONFIG_HUFFYUVDSP) += ppc/huffyuvdsp_altivec.o -OBJS-$(CONFIG_FDCTDSP) += ppc/fdctdsp.o OBJS-$(CONFIG_IDCTDSP) += ppc/idctdsp.o OBJS-$(CONFIG_MDCT) += ppc/mdct_init.o OBJS-$(CONFIG_ME_CMP) += ppc/me_cmp.o diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 1a2cfb1d86..cdf7758858 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -58,9 +58,9 @@ OBJS-$(CONFIG_VP9_DECODER) += x86/vp9dsp_init.o # GCC inline assembly optimizations # subsystems MMX-OBJS-$(CONFIG_AUDIODSP) += x86/audiodsp_mmx.o +MMX-OBJS-$(CONFIG_FDCTDSP) += x86/fdct.o MMX-OBJS-$(CONFIG_HPELDSP) += x86/fpel_mmx.o \ x86/hpeldsp_mmx.o -MMX-OBJS-$(CONFIG_FDCTDSP) += x86/fdct.o MMX-OBJS-$(CONFIG_IDCTDSP) += x86/idctdsp_mmx.o \ x86/simple_idct.o MMX-OBJS-$(CONFIG_QPELDSP) += x86/fpel_mmx.o diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 26cae5bbfa..b3b53da8f2 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -6,6 +6,8 @@ HEADERS = avdevice.h \ OBJS = alldevices.o \ avdevice.o \ +OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o + # input/output devices OBJS-$(CONFIG_ALSA_INDEV) += alsa_dec.o alsa.o OBJS-$(CONFIG_ALSA_OUTDEV) += alsa_enc.o alsa.o @@ -28,8 +30,6 @@ OBJS-$(CONFIG_X11GRAB_XCB_INDEV) += xcbgrab.o OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o -OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o - SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa.h SKIPHEADERS-$(HAVE_SNDIO_H) += sndio.h diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 39e167faab..a9bb0a0c11 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -18,6 +18,9 @@ OBJS = allfilters.o \ graphparser.o \ video.o \ +OBJS-$(HAVE_THREADS) += pthread.o + +# audio filters OBJS-$(CONFIG_AFORMAT_FILTER) += af_aformat.o OBJS-$(CONFIG_AMIX_FILTER) += af_amix.o OBJS-$(CONFIG_ANULL_FILTER) += af_anull.o @@ -35,10 +38,10 @@ OBJS-$(CONFIG_JOIN_FILTER) += af_join.o OBJS-$(CONFIG_RESAMPLE_FILTER) += af_resample.o OBJS-$(CONFIG_VOLUME_FILTER) += af_volume.o -OBJS-$(CONFIG_ANULLSRC_FILTER) += asrc_anullsrc.o - OBJS-$(CONFIG_ANULLSINK_FILTER) += asink_anullsink.o +OBJS-$(CONFIG_ANULLSRC_FILTER) += asrc_anullsrc.o +# video filters OBJS-$(CONFIG_BLACKFRAME_FILTER) += vf_blackframe.o OBJS-$(CONFIG_BOXBLUR_FILTER) += vf_boxblur.o OBJS-$(CONFIG_COPY_FILTER) += vf_copy.o @@ -57,8 +60,8 @@ OBJS-$(CONFIG_GRADFUN_FILTER) += vf_gradfun.o OBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o OBJS-$(CONFIG_HQDN3D_FILTER) += vf_hqdn3d.o OBJS-$(CONFIG_HWDOWNLOAD_FILTER) += vf_hwdownload.o -OBJS-$(CONFIG_HWUPLOAD_FILTER) += vf_hwupload.o OBJS-$(CONFIG_HWUPLOAD_CUDA_FILTER) += vf_hwupload_cuda.o +OBJS-$(CONFIG_HWUPLOAD_FILTER) += vf_hwupload.o OBJS-$(CONFIG_INTERLACE_FILTER) += vf_interlace.o OBJS-$(CONFIG_LUT_FILTER) += vf_lut.o OBJS-$(CONFIG_LUTRGB_FILTER) += vf_lut.o @@ -87,6 +90,8 @@ OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o OBJS-$(CONFIG_YADIF_FILTER) += vf_yadif.o +OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o + OBJS-$(CONFIG_COLOR_FILTER) += vsrc_color.o OBJS-$(CONFIG_FREI0R_SRC_FILTER) += vf_frei0r.o OBJS-$(CONFIG_MOVIE_FILTER) += vsrc_movie.o @@ -94,9 +99,5 @@ OBJS-$(CONFIG_NULLSRC_FILTER) += vsrc_nullsrc.o OBJS-$(CONFIG_RGBTESTSRC_FILTER) += vsrc_testsrc.o OBJS-$(CONFIG_TESTSRC_FILTER) += vsrc_testsrc.o -OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o - -OBJS-$(HAVE_THREADS) += pthread.o - TOOLS = graph2dot TESTPROGS = filtfmts diff --git a/libavformat/Makefile b/libavformat/Makefile index c405354711..7f4a0be6ca 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -23,6 +23,8 @@ OBJS = allformats.o \ url.o \ utils.o \ +OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o + # subsystems OBJS-$(CONFIG_ISO_MEDIA) += isom.o OBJS-$(CONFIG_NETWORK) += network.o @@ -63,9 +65,9 @@ OBJS-$(CONFIG_A64_MUXER) += a64.o rawenc.o OBJS-$(CONFIG_AAC_DEMUXER) += aacdec.o rawdec.o OBJS-$(CONFIG_AC3_DEMUXER) += ac3dec.o rawdec.o OBJS-$(CONFIG_AC3_MUXER) += rawenc.o +OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.o OBJS-$(CONFIG_ADX_DEMUXER) += adxdec.o OBJS-$(CONFIG_ADX_MUXER) += rawenc.o -OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.o OBJS-$(CONFIG_AEA_DEMUXER) += aea.o pcm.o OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o pcm.o OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o @@ -134,14 +136,14 @@ OBJS-$(CONFIG_FLV_MUXER) += flvenc.o avc.o OBJS-$(CONFIG_FOURXM_DEMUXER) += 4xm.o OBJS-$(CONFIG_FRAMECRC_MUXER) += framecrcenc.o framehash.o OBJS-$(CONFIG_FRAMEMD5_MUXER) += md5enc.o framehash.o -OBJS-$(CONFIG_GIF_MUXER) += gif.o -OBJS-$(CONFIG_GSM_DEMUXER) += gsmdec.o -OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o -OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o audiointerleave.o OBJS-$(CONFIG_G722_DEMUXER) += g722.o rawdec.o OBJS-$(CONFIG_G722_MUXER) += rawenc.o OBJS-$(CONFIG_G723_1_DEMUXER) += g723_1.o OBJS-$(CONFIG_G723_1_MUXER) += rawenc.o +OBJS-$(CONFIG_GIF_MUXER) += gif.o +OBJS-$(CONFIG_GSM_DEMUXER) += gsmdec.o +OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o +OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o audiointerleave.o OBJS-$(CONFIG_H261_DEMUXER) += h261dec.o rawdec.o OBJS-$(CONFIG_H261_MUXER) += rawenc.o OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o rawdec.o @@ -200,11 +202,11 @@ OBJS-$(CONFIG_MPC_DEMUXER) += mpc.o apetag.o img2.o OBJS-$(CONFIG_MPC8_DEMUXER) += mpc8.o apetag.o img2.o OBJS-$(CONFIG_MPEG1SYSTEM_MUXER) += mpegenc.o OBJS-$(CONFIG_MPEG1VCD_MUXER) += mpegenc.o +OBJS-$(CONFIG_MPEG1VIDEO_MUXER) += rawenc.o OBJS-$(CONFIG_MPEG2DVD_MUXER) += mpegenc.o -OBJS-$(CONFIG_MPEG2VOB_MUXER) += mpegenc.o OBJS-$(CONFIG_MPEG2SVCD_MUXER) += mpegenc.o -OBJS-$(CONFIG_MPEG1VIDEO_MUXER) += rawenc.o OBJS-$(CONFIG_MPEG2VIDEO_MUXER) += rawenc.o +OBJS-$(CONFIG_MPEG2VOB_MUXER) += mpegenc.o OBJS-$(CONFIG_MPEGPS_DEMUXER) += mpeg.o OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpegts.o OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o @@ -294,9 +296,9 @@ OBJS-$(CONFIG_RM_DEMUXER) += rmdec.o rm.o rmsipr.o OBJS-$(CONFIG_RM_MUXER) += rmenc.o rm.o OBJS-$(CONFIG_ROQ_DEMUXER) += idroqdec.o OBJS-$(CONFIG_ROQ_MUXER) += idroqenc.o rawenc.o +OBJS-$(CONFIG_RPL_DEMUXER) += rpl.o OBJS-$(CONFIG_RSO_DEMUXER) += rsodec.o rso.o pcm.o OBJS-$(CONFIG_RSO_MUXER) += rsoenc.o rso.o -OBJS-$(CONFIG_RPL_DEMUXER) += rpl.o OBJS-$(CONFIG_RTP_MPEGTS_MUXER) += rtpenc_mpegts.o OBJS-$(CONFIG_RTP_MUXER) += rtp.o \ rtpenc_aac.o \ @@ -372,8 +374,8 @@ OBJS-$(CONFIG_XA_DEMUXER) += xa.o OBJS-$(CONFIG_XMV_DEMUXER) += xmv.o OBJS-$(CONFIG_XWMA_DEMUXER) += xwma.o OBJS-$(CONFIG_YOP_DEMUXER) += yop.o -OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpegenc.o OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpegdec.o +OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpegenc.o # external libraries OBJS-$(CONFIG_LIBRTMP) += librtmp.o @@ -391,9 +393,9 @@ OBJS-$(CONFIG_HTTP_PROTOCOL) += http.o httpauth.o urldecode.o OBJS-$(CONFIG_HTTPPROXY_PROTOCOL) += http.o httpauth.o urldecode.o OBJS-$(CONFIG_HTTPS_PROTOCOL) += http.o httpauth.o urldecode.o OBJS-$(CONFIG_ICECAST_PROTOCOL) += icecast.o +OBJS-$(CONFIG_MD5_PROTOCOL) += md5proto.o OBJS-$(CONFIG_MMSH_PROTOCOL) += mmsh.o mms.o asf.o OBJS-$(CONFIG_MMST_PROTOCOL) += mmst.o mms.o asf.o -OBJS-$(CONFIG_MD5_PROTOCOL) += md5proto.o OBJS-$(CONFIG_PIPE_PROTOCOL) += file.o OBJS-$(CONFIG_RTMP_PROTOCOL) += rtmpproto.o rtmppkt.o OBJS-$(CONFIG_RTMPE_PROTOCOL) += rtmpproto.o rtmppkt.o @@ -410,17 +412,15 @@ OBJS-$(CONFIG_TLS_OPENSSL_PROTOCOL) += tls_openssl.o tls.o OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o OBJS-$(CONFIG_UNIX_PROTOCOL) += unix.o -OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o - SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h TESTPROGS = seek \ url \ +TESTPROGS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh TESTPROGS-$(CONFIG_MOV_MUXER) += movenc TESTPROGS-$(CONFIG_NETWORK) += noproxy -TESTPROGS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh TESTPROGS-$(CONFIG_SRTP) += srtp TOOLS = aviocat \ diff --git a/libavresample/aarch64/Makefile b/libavresample/aarch64/Makefile index 1d9e5f8ca0..f92699ef1a 100644 --- a/libavresample/aarch64/Makefile +++ b/libavresample/aarch64/Makefile @@ -1,7 +1,7 @@ -OBJS += aarch64/audio_convert_init.o \ - aarch64/resample_init.o \ +OBJS += aarch64/audio_convert_init.o \ + aarch64/resample_init.o \ OBJS-$(CONFIG_NEON_CLOBBER_TEST) += aarch64/neontest.o -NEON-OBJS += aarch64/audio_convert_neon.o \ - aarch64/resample_neon.o \ +NEON-OBJS += aarch64/audio_convert_neon.o \ + aarch64/resample_neon.o \ diff --git a/libavresample/arm/Makefile b/libavresample/arm/Makefile index affc2bfa45..352d1a8c13 100644 --- a/libavresample/arm/Makefile +++ b/libavresample/arm/Makefile @@ -1,7 +1,7 @@ -OBJS += arm/audio_convert_init.o \ - arm/resample_init.o +OBJS += arm/audio_convert_init.o \ + arm/resample_init.o OBJS-$(CONFIG_NEON_CLOBBER_TEST) += arm/neontest.o -NEON-OBJS += arm/audio_convert_neon.o \ - arm/resample_neon.o +NEON-OBJS += arm/audio_convert_neon.o \ + arm/resample_neon.o diff --git a/libavutil/Makefile b/libavutil/Makefile index 0956703ce8..11d91794cb 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -15,6 +15,7 @@ HEADERS = adler32.h \ common.h \ cpu.h \ crc.h \ + dict.h \ display.h \ downmix_info.h \ error.h \ @@ -36,14 +37,13 @@ HEADERS = adler32.h \ mathematics.h \ md5.h \ mem.h \ - dict.h \ opt.h \ parseutils.h \ pixdesc.h \ pixfmt.h \ random_seed.h \ - replaygain.h \ rational.h \ + replaygain.h \ samplefmt.h \ sha.h \ stereo3d.h \ @@ -72,6 +72,7 @@ OBJS = adler32.o \ cpu.o \ crc.o \ des.o \ + dict.o \ display.o \ downmix_info.o \ error.o \ @@ -92,7 +93,6 @@ OBJS = adler32.o \ mathematics.o \ md5.o \ mem.o \ - dict.o \ opt.o \ parseutils.o \ pixdesc.o \ @@ -107,8 +107,8 @@ OBJS = adler32.o \ utils.o \ xtea.o \ -OBJS-$(CONFIG_LZO) += lzo.o OBJS-$(CONFIG_CUDA) += hwcontext_cuda.o +OBJS-$(CONFIG_LZO) += lzo.o OBJS-$(CONFIG_VAAPI) += hwcontext_vaapi.o OBJS-$(CONFIG_VDPAU) += hwcontext_vdpau.o diff --git a/libswscale/Makefile b/libswscale/Makefile index 3e8614da2b..c9b2fc9c46 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -3,14 +3,14 @@ NAME = swscale HEADERS = swscale.h \ version.h \ -OBJS = input.o \ - options.o \ - output.o \ - rgb2rgb.o \ - swscale.o \ - swscale_unscaled.o \ - utils.o \ - yuv2rgb.o \ +OBJS = input.o \ + options.o \ + output.o \ + rgb2rgb.o \ + swscale.o \ + swscale_unscaled.o \ + utils.o \ + yuv2rgb.o \ TESTPROGS = colorspace \ swscale \ diff --git a/tests/Makefile b/tests/Makefile index d7a229cca5..2ff3f834bf 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -58,6 +58,7 @@ PARSERDEMDEC = $(call ALLYES, $(1)_PARSER $(2)_DEMUXER $(3)_DECODER) include $(SRC_PATH)/tests/fate/acodec.mak include $(SRC_PATH)/tests/fate/vcodec.mak + include $(SRC_PATH)/tests/fate/avformat.mak include $(SRC_PATH)/tests/fate/seek.mak @@ -78,10 +79,10 @@ include $(SRC_PATH)/tests/fate/demux.mak include $(SRC_PATH)/tests/fate/dfa.mak include $(SRC_PATH)/tests/fate/dpcm.mak include $(SRC_PATH)/tests/fate/ea.mak +include $(SRC_PATH)/tests/fate/fft.mak include $(SRC_PATH)/tests/fate/filter-audio.mak include $(SRC_PATH)/tests/fate/filter-video.mak include $(SRC_PATH)/tests/fate/flac.mak -include $(SRC_PATH)/tests/fate/fft.mak include $(SRC_PATH)/tests/fate/h264.mak include $(SRC_PATH)/tests/fate/hevc.mak include $(SRC_PATH)/tests/fate/image.mak diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index a66fc73d0e..8a0cee59d8 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -1,13 +1,16 @@ # libavcodec tests -AVCODECOBJS-$(CONFIG_BSWAPDSP) += bswapdsp.o -AVCODECOBJS-$(CONFIG_DCA_DECODER) += dcadsp.o synth_filter.o -AVCODECOBJS-$(CONFIG_FMTCONVERT) += fmtconvert.o -AVCODECOBJS-$(CONFIG_H264PRED) += h264pred.o -AVCODECOBJS-$(CONFIG_H264QPEL) += h264qpel.o -AVCODECOBJS-$(CONFIG_HEVC_DECODER) += hevc_mc.o -AVCODECOBJS-$(CONFIG_V210_ENCODER) += v210enc.o - -CHECKASMOBJS-$(CONFIG_AVCODEC) += $(AVCODECOBJS-yes) +# subsystems +AVCODECOBJS-$(CONFIG_BSWAPDSP) += bswapdsp.o +AVCODECOBJS-$(CONFIG_FMTCONVERT) += fmtconvert.o +AVCODECOBJS-$(CONFIG_H264PRED) += h264pred.o +AVCODECOBJS-$(CONFIG_H264QPEL) += h264qpel.o + +# decoders/encoders +AVCODECOBJS-$(CONFIG_DCA_DECODER) += dcadsp.o synth_filter.o +AVCODECOBJS-$(CONFIG_HEVC_DECODER) += hevc_mc.o +AVCODECOBJS-$(CONFIG_V210_ENCODER) += v210enc.o + +CHECKASMOBJS-$(CONFIG_AVCODEC) += $(AVCODECOBJS-yes) -include $(SRC_PATH)/tests/checkasm/$(ARCH)/Makefile diff --git a/tests/fate/image.mak b/tests/fate/image.mak index aecda9b33d..22e0a33118 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -37,7 +37,53 @@ endef DDS_OPTS_pal = -sws_flags +accurate_rnd+bitexact -pix_fmt rgba DDS_OPTS_pal-ati = -sws_flags +accurate_rnd+bitexact -pix_fmt rgba -DDS_FMT = alpha8 argb argb-aexp dx10-bc1 dx10-bc1a dx10-bc2 dx10-bc3 dx10-bc4 dx10-bc5 dxt1 dxt1a dxt1-normalmap dxt2 dxt3 dxt4 dxt5 dxt5-aexp dxt5-normalmap dxt5-normalmap-ati dxt5-rbxg dxt5-rgxb dxt5-rxbg dxt5-rxgb dxt5-xgbr dxt5-xgxr dxt5-xrbg dxt5-ycocg dxt5-ycocg-scaled pal pal-ati rgb1555 rgb16 rgb24 rgb555 rgba rgtc1s rgtc1u rgtc2s rgtc2u rgtc2u-xy uyvy xbgr xrgb y ya ycocg yuyv +DDS_FMT = alpha8 \ + argb \ + argb-aexp \ + dx10-bc1 \ + dx10-bc1a \ + dx10-bc2 \ + dx10-bc3 \ + dx10-bc4 \ + dx10-bc5 \ + dxt1 \ + dxt1a \ + dxt1-normalmap \ + dxt2 \ + dxt3 \ + dxt4 \ + dxt5 \ + dxt5-aexp \ + dxt5-normalmap \ + dxt5-normalmap-ati \ + dxt5-rbxg \ + dxt5-rgxb \ + dxt5-rxbg \ + dxt5-rxgb \ + dxt5-xgbr \ + dxt5-xgxr \ + dxt5-xrbg \ + dxt5-ycocg \ + dxt5-ycocg-scaled \ + pal \ + pal-ati \ + rgb1555 \ + rgb16 \ + rgb24 \ + rgb555 \ + rgba \ + rgtc1s \ + rgtc1u \ + rgtc2s \ + rgtc2u \ + rgtc2u-xy \ + uyvy \ + xbgr \ + xrgb \ + y \ + ya \ + ycocg \ + yuyv $(foreach FMT,$(DDS_FMT),$(eval $(call FATE_IMGSUITE_DDS,$(FMT)))) FATE_DDS-$(call DEMDEC, IMAGE2, DDS) += $(FATE_DDS) diff --git a/tests/fate/libavresample.mak b/tests/fate/libavresample.mak index 65a0e1e93d..cb61f2a76a 100644 --- a/tests/fate/libavresample.mak +++ b/tests/fate/libavresample.mak @@ -1,7 +1,7 @@ -CROSS_TEST = $(foreach I,$(1), \ - $(foreach J,$(1), \ - $(if $(filter-out $(I),$(J)), \ - $(eval $(call $(2),$(I),$(J),$(3),$(4),$(5))), \ +CROSS_TEST = $(foreach I,$(1), \ + $(foreach J,$(1), \ + $(if $(filter-out $(I),$(J)), \ + $(eval $(call $(2),$(I),$(J),$(3),$(4),$(5))), \ ))) MIX_CHANNELS = 1 2 3 4 5 6 7 8 diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak index be06f0f7b4..88555f7e55 100644 --- a/tests/fate/seek.mak +++ b/tests/fate/seek.mak @@ -69,16 +69,16 @@ FATE_SEEK_VSYNTH2-$(call ENCDEC, JPEGLS, AVI) += jpegls FATE_SEEK_VSYNTH2-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg FATE_SEEK_VSYNTH2-$(call ENCDEC, MJPEG, AVI) += mjpeg -FATE_SEEK_VSYNTH2-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) += \ - mpeg1 \ +FATE_SEEK_VSYNTH2-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) += \ + mpeg1 \ mpeg1b -FATE_SEEK_VSYNTH2-$(call ENCDEC, MPEG2VIDEO, MPEG2VIDEO MPEGVIDEO) += \ - mpeg2-422 \ - mpeg2-idct-int \ - mpeg2-ilace \ - mpeg2-ivlc-qprd \ - mpeg2-thread \ +FATE_SEEK_VSYNTH2-$(call ENCDEC, MPEG2VIDEO, MPEG2VIDEO MPEGVIDEO) += \ + mpeg2-422 \ + mpeg2-idct-int \ + mpeg2-ilace \ + mpeg2-ivlc-qprd \ + mpeg2-thread \ mpeg2-thread-ivlc FATE_SEEK_VSYNTH2-$(call ENCDEC, MPEG4, MP4 MOV) += mpeg4