From 01621202aad7e27b2a05c71d9ad7a19dfcbe17ec Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 16 Feb 2016 17:58:50 +0100 Subject: 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. --- tests/Makefile | 3 ++- tests/checkasm/Makefile | 21 ++++++++++--------- tests/fate/image.mak | 48 +++++++++++++++++++++++++++++++++++++++++++- tests/fate/libavresample.mak | 8 ++++---- tests/fate/seek.mak | 16 +++++++-------- 5 files changed, 73 insertions(+), 23 deletions(-) (limited to 'tests') 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 -- cgit v1.2.3