ffmpeg | branch: master | Clément Bœsch <clem...@stupeflix.com> | Wed Jun 29 11:03:55 2016 +0200| [dd1b1e32238be7e0abfbc90f546f4c1931915143] | committer: Clément Bœsch
Merge commit 'c3ed259e4fef64a1af4f6537be545fba47491aa9' * commit 'c3ed259e4fef64a1af4f6537be545fba47491aa9': fate: Move Canopus decoder tests to a separate file Merged-by: Clément Bœsch <clem...@stupeflix.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dd1b1e32238be7e0abfbc90f546f4c1931915143 --- tests/Makefile | 1 + tests/fate/canopus.mak | 34 ++++++++++++++++++++++++++++++++++ tests/fate/lossless-video.mak | 12 ------------ tests/fate/video.mak | 21 --------------------- 4 files changed, 35 insertions(+), 33 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index e72b8df..019203c 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -112,6 +112,7 @@ include $(SRC_PATH)/tests/fate/api.mak include $(SRC_PATH)/tests/fate/atrac.mak include $(SRC_PATH)/tests/fate/audio.mak include $(SRC_PATH)/tests/fate/bmp.mak +include $(SRC_PATH)/tests/fate/canopus.mak include $(SRC_PATH)/tests/fate/cdxl.mak include $(SRC_PATH)/tests/fate/checkasm.mak include $(SRC_PATH)/tests/fate/concatdec.mak diff --git a/tests/fate/canopus.mak b/tests/fate/canopus.mak new file mode 100644 index 0000000..d419211 --- /dev/null +++ b/tests/fate/canopus.mak @@ -0,0 +1,34 @@ +#lossless +FATE_CANOPUS_CLLC += fate-canopus-cllc-argb +fate-canopus-cllc-argb: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-argb.avi + +FATE_CANOPUS_CLLC += fate-canopus-cllc-rgb +fate-canopus-cllc-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-rgb.avi + +FATE_CANOPUS_CLLC += fate-canopus-cllc-yuy2-noblock +fate-canopus-cllc-yuy2-noblock: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-yuy2-noblock.avi + +FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, CLLC) += $(FATE_CANOPUS_CLLC) +fate-canopus-cllc: $(FATE_CANOPUS_CLLC) + +#lossy +FATE_CANOPUS_HQ_HQA += fate-canopus-hq_hqa-hq +fate-canopus-hq_hqa-hq: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hq.avi + +FATE_CANOPUS_HQ_HQA += fate-canopus-hq_hqa-hqa +fate-canopus-hq_hqa-hqa: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqa.avi + +FATE_CANOPUS_HQ_HQA += fate-canopus-hq_hqa-inter +fate-canopus-hq_hqa-inter: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hq25i.avi + +FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, HQ_HQA) += $(FATE_CANOPUS_HQ_HQA) +fate-canopus-hq_hqa: $(FATE_CANOPUS_HQ_HQA) + +FATE_CANOPUS_HQX += fate-canopus-hqx422 +fate-canopus-hqx422: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422.avi -pix_fmt yuv422p16be -an + +FATE_CANOPUS_HQX += fate-canopus-hqx422a +fate-canopus-hqx422a: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422a.avi -pix_fmt yuv422p16be -an + +FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, HQX) += $(FATE_CANOPUS_HQX) +fate-canopus-hqx: $(FATE_CANOPUS_HQX) diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak index bfbed83..1e2769c 100644 --- a/tests/fate/lossless-video.mak +++ b/tests/fate/lossless-video.mak @@ -1,15 +1,3 @@ -FATE_CANOPUS_CLLC += fate-canopus-cllc-argb -fate-canopus-cllc-argb: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-argb.avi - -FATE_CANOPUS_CLLC += fate-canopus-cllc-rgb -fate-canopus-cllc-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-rgb.avi - -FATE_CANOPUS_CLLC += fate-canopus-cllc-yuy2-noblock -fate-canopus-cllc-yuy2-noblock: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-yuy2-noblock.avi - -FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, CLLC) += $(FATE_CANOPUS_CLLC) -fate-canopus-cllc: $(FATE_CANOPUS_CLLC) - FATE_LAGARITH += fate-lagarith-rgb24 fate-lagarith-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lag-rgb24.avi diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 2f4ab6d..03a6466 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -63,27 +63,6 @@ FATE_VIDEO-$(call DEMDEC, BINK, BINK) += $(FATE_BINK_VIDEO) FATE_VIDEO-$(call DEMDEC, BMV, BMV_VIDEO) += fate-bmv-video fate-bmv-video: CMD = framecrc -i $(TARGET_SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an -FATE_CANOPUS_HQ_HQA += fate-canopus-hq_hqa-hq -fate-canopus-hq_hqa-hq: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hq.avi - -FATE_CANOPUS_HQ_HQA += fate-canopus-hq_hqa-hqa -fate-canopus-hq_hqa-hqa: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqa.avi - -FATE_CANOPUS_HQ_HQA += fate-canopus-hq_hqa-inter -fate-canopus-hq_hqa-inter: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hq25i.avi - -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, HQ_HQA) += $(FATE_CANOPUS_HQ_HQA) -fate-canopus-hq_hqa: $(FATE_CANOPUS_HQ_HQA) - -FATE_CANOPUS_HQX += fate-canopus-hqx422 -fate-canopus-hqx422: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422.avi -pix_fmt yuv422p16be -an - -FATE_CANOPUS_HQX += fate-canopus-hqx422a -fate-canopus-hqx422a: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422a.avi -pix_fmt yuv422p16be -an - -FATE_VIDEO-$(call DEMDEC, AVI, HQX) += $(FATE_CANOPUS_HQX) -fate-canopus-hqx: $(FATE_CANOPUS_HQX) - FATE_VIDEO-$(call DEMDEC, MPEGPS, CAVS) += fate-cavs fate-cavs: CMD = framecrc -i $(TARGET_SAMPLES)/cavs/cavs.mpg -an ====================================================================== diff --cc tests/Makefile index e72b8df,36a3a72..019203c --- a/tests/Makefile +++ b/tests/Makefile @@@ -112,19 -72,14 +112,20 @@@ include $(SRC_PATH)/tests/fate/api.ma include $(SRC_PATH)/tests/fate/atrac.mak include $(SRC_PATH)/tests/fate/audio.mak include $(SRC_PATH)/tests/fate/bmp.mak + include $(SRC_PATH)/tests/fate/canopus.mak include $(SRC_PATH)/tests/fate/cdxl.mak include $(SRC_PATH)/tests/fate/checkasm.mak +include $(SRC_PATH)/tests/fate/concatdec.mak include $(SRC_PATH)/tests/fate/cover-art.mak +include $(SRC_PATH)/tests/fate/dca.mak include $(SRC_PATH)/tests/fate/demux.mak include $(SRC_PATH)/tests/fate/dfa.mak +include $(SRC_PATH)/tests/fate/dnxhd.mak include $(SRC_PATH)/tests/fate/dpcm.mak include $(SRC_PATH)/tests/fate/ea.mak +include $(SRC_PATH)/tests/fate/exif.mak +include $(SRC_PATH)/tests/fate/ffmpeg.mak +include $(SRC_PATH)/tests/fate/ffprobe.mak include $(SRC_PATH)/tests/fate/fft.mak include $(SRC_PATH)/tests/fate/filter-audio.mak include $(SRC_PATH)/tests/fate/filter-video.mak diff --cc tests/fate/canopus.mak index 0000000,1f24a4c..d419211 mode 000000,100644..100644 --- a/tests/fate/canopus.mak +++ b/tests/fate/canopus.mak @@@ -1,0 -1,34 +1,34 @@@ + #lossless + FATE_CANOPUS_CLLC += fate-canopus-cllc-argb + fate-canopus-cllc-argb: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-argb.avi + + FATE_CANOPUS_CLLC += fate-canopus-cllc-rgb + fate-canopus-cllc-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-rgb.avi + + FATE_CANOPUS_CLLC += fate-canopus-cllc-yuy2-noblock + fate-canopus-cllc-yuy2-noblock: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-yuy2-noblock.avi + -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, CLLC) += $(FATE_CANOPUS_CLLC) ++FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, CLLC) += $(FATE_CANOPUS_CLLC) + fate-canopus-cllc: $(FATE_CANOPUS_CLLC) + + #lossy + FATE_CANOPUS_HQ_HQA += fate-canopus-hq_hqa-hq + fate-canopus-hq_hqa-hq: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hq.avi + + FATE_CANOPUS_HQ_HQA += fate-canopus-hq_hqa-hqa + fate-canopus-hq_hqa-hqa: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqa.avi + + FATE_CANOPUS_HQ_HQA += fate-canopus-hq_hqa-inter + fate-canopus-hq_hqa-inter: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hq25i.avi + -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, HQ_HQA) += $(FATE_CANOPUS_HQ_HQA) ++FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, HQ_HQA) += $(FATE_CANOPUS_HQ_HQA) + fate-canopus-hq_hqa: $(FATE_CANOPUS_HQ_HQA) + + FATE_CANOPUS_HQX += fate-canopus-hqx422 + fate-canopus-hqx422: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422.avi -pix_fmt yuv422p16be -an + + FATE_CANOPUS_HQX += fate-canopus-hqx422a + fate-canopus-hqx422a: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422a.avi -pix_fmt yuv422p16be -an + -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, HQX) += $(FATE_CANOPUS_HQX) ++FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, HQX) += $(FATE_CANOPUS_HQX) + fate-canopus-hqx: $(FATE_CANOPUS_HQX) diff --cc tests/fate/video.mak index 2f4ab6d,df3ce5c..03a6466 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@@ -58,48 -49,25 +58,27 @@@ fate-bink-video-f: CMD = framecrc -i $( FATE_BINK_VIDEO += fate-bink-video-i fate-bink-video-i: CMD = framecrc -i $(TARGET_SAMPLES)/bink/RazOnBull.bik -an -FATE_SAMPLES_AVCONV-$(call DEMDEC, BINK, BINK) += $(FATE_BINK_VIDEO) -fate-bink-video: $(FATE_BINK_VIDEO) +FATE_VIDEO-$(call DEMDEC, BINK, BINK) += $(FATE_BINK_VIDEO) -FATE_SAMPLES_AVCONV-$(call DEMDEC, BMV, BMV_VIDEO) += fate-bmv-video +FATE_VIDEO-$(call DEMDEC, BMV, BMV_VIDEO) += fate-bmv-video fate-bmv-video: CMD = framecrc -i $(TARGET_SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an - FATE_CANOPUS_HQ_HQA += fate-canopus-hq_hqa-hq - fate-canopus-hq_hqa-hq: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hq.avi - - FATE_CANOPUS_HQ_HQA += fate-canopus-hq_hqa-hqa - fate-canopus-hq_hqa-hqa: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqa.avi - - FATE_CANOPUS_HQ_HQA += fate-canopus-hq_hqa-inter - fate-canopus-hq_hqa-inter: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hq25i.avi - - FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, HQ_HQA) += $(FATE_CANOPUS_HQ_HQA) - fate-canopus-hq_hqa: $(FATE_CANOPUS_HQ_HQA) - - FATE_CANOPUS_HQX += fate-canopus-hqx422 - fate-canopus-hqx422: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422.avi -pix_fmt yuv422p16be -an - - FATE_CANOPUS_HQX += fate-canopus-hqx422a - fate-canopus-hqx422a: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422a.avi -pix_fmt yuv422p16be -an - - FATE_VIDEO-$(call DEMDEC, AVI, HQX) += $(FATE_CANOPUS_HQX) - fate-canopus-hqx: $(FATE_CANOPUS_HQX) - -FATE_SAMPLES_AVCONV-$(call DEMDEC, MPEGPS, CAVS) += fate-cavs +FATE_VIDEO-$(call DEMDEC, MPEGPS, CAVS) += fate-cavs fate-cavs: CMD = framecrc -i $(TARGET_SAMPLES)/cavs/cavs.mpg -an -FATE_SAMPLES_AVCONV-$(call DEMDEC, CDG, CDGRAPHICS) += fate-cdgraphics -fate-cdgraphics: CMD = framecrc -i $(TARGET_SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgb24 -t 1 +FATE_VIDEO-$(call DEMDEC, CDG, CDGRAPHICS) += fate-cdgraphics +fate-cdgraphics: CMD = framecrc -i $(TARGET_SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgba -t 1 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, CLJR) += fate-cljr +FATE_VIDEO-$(call DEMDEC, AVI, CLJR) += fate-cljr fate-cljr: CMD = framecrc -i $(TARGET_SAMPLES)/cljr/testcljr-partial.avi -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, PNG) += fate-corepng +FATE_VIDEO-$(call DEMDEC, AVI, PNG) += fate-corepng fate-corepng: CMD = framecrc -i $(TARGET_SAMPLES)/png1/corepng-partial.avi -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVS, AVS) += fate-creatureshock-avs +FATE_VIDEO-$(call DEMDEC, AVI, PNG) += fate-rgbapng-4816 +fate-rgbapng-4816: CMD = framecrc -i $(TARGET_SAMPLES)/png1/55c99e750a5fd6_50314226.png + +FATE_VIDEO-$(call DEMDEC, AVS, AVS) += fate-creatureshock-avs fate-creatureshock-avs: CMD = framecrc -i $(TARGET_SAMPLES)/creatureshock-avs/OUTATIME.AVS -pix_fmt rgb24 FATE_CVID-$(CONFIG_MOV_DEMUXER) += fate-cvid-palette _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog