ffmpeg | branch: master | James Almer <[email protected]> | Wed Oct 18 11:05:56 2017 -0300| [7293248239c452ca7befc6dd33d603f524fa2a35] | committer: James Almer
Merge commit 'b57a95d0147beae746db1c1223d100447f42dced' * commit 'b57a95d0147beae746db1c1223d100447f42dced': cfhd: Add FATE tests Merged-by: James Almer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7293248239c452ca7befc6dd33d603f524fa2a35 --- tests/fate/video.mak | 12 ++++++++++++ tests/ref/fate/cfhd-1 | 15 +++++++++++++++ tests/ref/fate/cfhd-2 | 15 +++++++++++++++ tests/ref/fate/cfhd-3 | 15 +++++++++++++++ 4 files changed, 57 insertions(+) diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 930eece2ca..6f76365165 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -69,6 +69,18 @@ fate-cavs: CMD = framecrc -i $(TARGET_SAMPLES)/cavs/cavs.mpg -an FATE_VIDEO-$(call DEMDEC, CDG, CDGRAPHICS) += fate-cdgraphics fate-cdgraphics: CMD = framecrc -i $(TARGET_SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgba -t 1 +FATE_CFHD-$(CONFIG_AVI_DEMUXER) += fate-cfhd-1 +fate-cfhd-1: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_422.avi -pix_fmt yuv422p10le + +FATE_CFHD-$(CONFIG_AVI_DEMUXER) += fate-cfhd-2 +fate-cfhd-2: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_444.avi -pix_fmt gbrp12le + +FATE_CFHD-$(CONFIG_MOV_DEMUXER) += fate-cfhd-3 +fate-cfhd-3: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_odd.mov -pix_fmt yuv422p10le + +FATE_VIDEO-$(CONFIG_CFHD_DECODER) += $(FATE_CFHD-yes) +fate-cfhd: $(FATE_CFHD-yes) + FATE_VIDEO-$(call DEMDEC, AVI, CLJR) += fate-cljr fate-cljr: CMD = framecrc -i $(TARGET_SAMPLES)/cljr/testcljr-partial.avi diff --git a/tests/ref/fate/cfhd-1 b/tests/ref/fate/cfhd-1 new file mode 100644 index 0000000000..0280d66df1 --- /dev/null +++ b/tests/ref/fate/cfhd-1 @@ -0,0 +1,15 @@ +#tb 0: 1001/30000 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 720x480 +#sar 0: 0/1 +0, 0, 0, 1, 1382400, 0xa3e49817 +0, 1, 1, 1, 1382400, 0x544fdfac +0, 2, 2, 1, 1382400, 0x84964e11 +0, 3, 3, 1, 1382400, 0xc608c8d1 +0, 4, 4, 1, 1382400, 0xf2f1404f +0, 5, 5, 1, 1382400, 0x5a3100ba +0, 6, 6, 1, 1382400, 0x3727baa9 +0, 7, 7, 1, 1382400, 0x894f07db +0, 8, 8, 1, 1382400, 0x3ef27d46 +0, 9, 9, 1, 1382400, 0x1f90880d diff --git a/tests/ref/fate/cfhd-2 b/tests/ref/fate/cfhd-2 new file mode 100644 index 0000000000..77db54c265 --- /dev/null +++ b/tests/ref/fate/cfhd-2 @@ -0,0 +1,15 @@ +#tb 0: 1001/30000 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 720x480 +#sar 0: 0/1 +0, 0, 0, 1, 2073600, 0x53fab433 +0, 1, 1, 1, 2073600, 0x0d2b3f64 +0, 2, 2, 1, 2073600, 0x857d1d48 +0, 3, 3, 1, 2073600, 0xe1a7df32 +0, 4, 4, 1, 2073600, 0x615861c1 +0, 5, 5, 1, 2073600, 0xf6cdb0a9 +0, 6, 6, 1, 2073600, 0x55dd9f16 +0, 7, 7, 1, 2073600, 0x7c126a32 +0, 8, 8, 1, 2073600, 0x53fdd4c5 +0, 9, 9, 1, 2073600, 0x6062a4b3 diff --git a/tests/ref/fate/cfhd-3 b/tests/ref/fate/cfhd-3 new file mode 100644 index 0000000000..60e13c64a7 --- /dev/null +++ b/tests/ref/fate/cfhd-3 @@ -0,0 +1,15 @@ +#tb 0: 1000/14587 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 496x241 +#sar 0: 0/1 +0, 0, 0, 1, 478144, 0x6ed01dcd +0, 1, 1, 1, 478144, 0x6ed01dcd +0, 2, 2, 1, 478144, 0x6ed01dcd +0, 3, 3, 1, 478144, 0xb1b4a74b +0, 4, 4, 1, 478144, 0x94c345c3 +0, 5, 5, 1, 478144, 0x05e0388d +0, 6, 6, 1, 478144, 0xe747476a +0, 7, 7, 1, 478144, 0x8c1561f1 +0, 8, 8, 1, 478144, 0x8c1561f1 +0, 9, 9, 1, 478144, 0x8c1561f1 ====================================================================== diff --cc tests/fate/video.mak index 930eece2ca,379eb2b0b3..6f76365165 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@@ -58,27 -49,37 +58,39 @@@ 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_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_CFHD-$(CONFIG_AVI_DEMUXER) += fate-cfhd-1 + fate-cfhd-1: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_422.avi -pix_fmt yuv422p10le + + FATE_CFHD-$(CONFIG_AVI_DEMUXER) += fate-cfhd-2 -fate-cfhd-2: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_444.avi -pix_fmt yuv422p10le ++fate-cfhd-2: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_444.avi -pix_fmt gbrp12le + + FATE_CFHD-$(CONFIG_MOV_DEMUXER) += fate-cfhd-3 + fate-cfhd-3: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_odd.mov -pix_fmt yuv422p10le + -FATE_SAMPLES_AVCONV-$(CONFIG_CFHD_DECODER) += $(FATE_CFHD-yes) ++FATE_VIDEO-$(CONFIG_CFHD_DECODER) += $(FATE_CFHD-yes) + fate-cfhd: $(FATE_CFHD-yes) + -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 diff --cc tests/ref/fate/cfhd-1 index 0000000000,cccfc8b860..0280d66df1 mode 000000,100644..100644 --- a/tests/ref/fate/cfhd-1 +++ b/tests/ref/fate/cfhd-1 @@@ -1,0 -1,11 +1,15 @@@ + #tb 0: 1001/30000 ++#media_type 0: video ++#codec_id 0: rawvideo ++#dimensions 0: 720x480 ++#sar 0: 0/1 + 0, 0, 0, 1, 1382400, 0xa3e49817 + 0, 1, 1, 1, 1382400, 0x544fdfac + 0, 2, 2, 1, 1382400, 0x84964e11 + 0, 3, 3, 1, 1382400, 0xc608c8d1 + 0, 4, 4, 1, 1382400, 0xf2f1404f + 0, 5, 5, 1, 1382400, 0x5a3100ba + 0, 6, 6, 1, 1382400, 0x3727baa9 + 0, 7, 7, 1, 1382400, 0x894f07db + 0, 8, 8, 1, 1382400, 0x3ef27d46 + 0, 9, 9, 1, 1382400, 0x1f90880d diff --cc tests/ref/fate/cfhd-2 index 0000000000,1af92d0668..77db54c265 mode 000000,100644..100644 --- a/tests/ref/fate/cfhd-2 +++ b/tests/ref/fate/cfhd-2 @@@ -1,0 -1,11 +1,15 @@@ + #tb 0: 1001/30000 -0, 0, 0, 1, 1382400, 0xe1c2201d -0, 1, 1, 1, 1382400, 0x13e5bc81 -0, 2, 2, 1, 1382400, 0x3062ca82 -0, 3, 3, 1, 1382400, 0x1c71624f -0, 4, 4, 1, 1382400, 0xf286c080 -0, 5, 5, 1, 1382400, 0xd517d824 -0, 6, 6, 1, 1382400, 0xe571ffd5 -0, 7, 7, 1, 1382400, 0x94a523ff -0, 8, 8, 1, 1382400, 0x85c58fca -0, 9, 9, 1, 1382400, 0x6b3278b0 ++#media_type 0: video ++#codec_id 0: rawvideo ++#dimensions 0: 720x480 ++#sar 0: 0/1 ++0, 0, 0, 1, 2073600, 0x53fab433 ++0, 1, 1, 1, 2073600, 0x0d2b3f64 ++0, 2, 2, 1, 2073600, 0x857d1d48 ++0, 3, 3, 1, 2073600, 0xe1a7df32 ++0, 4, 4, 1, 2073600, 0x615861c1 ++0, 5, 5, 1, 2073600, 0xf6cdb0a9 ++0, 6, 6, 1, 2073600, 0x55dd9f16 ++0, 7, 7, 1, 2073600, 0x7c126a32 ++0, 8, 8, 1, 2073600, 0x53fdd4c5 ++0, 9, 9, 1, 2073600, 0x6062a4b3 diff --cc tests/ref/fate/cfhd-3 index 0000000000,61698482fd..60e13c64a7 mode 000000,100644..100644 --- a/tests/ref/fate/cfhd-3 +++ b/tests/ref/fate/cfhd-3 @@@ -1,0 -1,11 +1,15 @@@ -#tb 0: 1/14587 -0, 0, 0, 0, 478144, 0x6ed01dcd -0, 1000, 1000, 0, 478144, 0x6ed01dcd -0, 2000, 2000, 0, 478144, 0x6ed01dcd -0, 3000, 3000, 0, 478144, 0xb1b4a74b -0, 4000, 4000, 0, 478144, 0x94c345c3 -0, 5000, 5000, 0, 478144, 0x05e0388d -0, 6000, 6000, 0, 478144, 0xe747476a -0, 7000, 7000, 0, 478144, 0x8c1561f1 -0, 8000, 8000, 0, 478144, 0x8c1561f1 -0, 9000, 9000, 0, 478144, 0x8c1561f1 ++#tb 0: 1000/14587 ++#media_type 0: video ++#codec_id 0: rawvideo ++#dimensions 0: 496x241 ++#sar 0: 0/1 ++0, 0, 0, 1, 478144, 0x6ed01dcd ++0, 1, 1, 1, 478144, 0x6ed01dcd ++0, 2, 2, 1, 478144, 0x6ed01dcd ++0, 3, 3, 1, 478144, 0xb1b4a74b ++0, 4, 4, 1, 478144, 0x94c345c3 ++0, 5, 5, 1, 478144, 0x05e0388d ++0, 6, 6, 1, 478144, 0xe747476a ++0, 7, 7, 1, 478144, 0x8c1561f1 ++0, 8, 8, 1, 478144, 0x8c1561f1 ++0, 9, 9, 1, 478144, 0x8c1561f1 _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
