[FFmpeg-cvslog] Merge commit 'cc58656aca95b5ab517989a9524b9a2b1c5653cf'

Clément Bœsch git at videolan.org
Thu Jul 14 19:00:02 CEST 2016 

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Thu Jul 14 18:57:37 2016 +0200| [cd02df52567d417e3efeda8fbaa36a2753a0e0cf] | committer: Clément Bœsch

Merge commit 'cc58656aca95b5ab517989a9524b9a2b1c5653cf'

* commit 'cc58656aca95b5ab517989a9524b9a2b1c5653cf':
  fate: Add tests for MagicYUV

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd02df52567d417e3efeda8fbaa36a2753a0e0cf
---

 tests/fate/video.mak           |   19 +++++++++++++++++++
 tests/ref/fate/magicyuv-rgb    |    6 ++++++
 tests/ref/fate/magicyuv-rgba   |    6 ++++++
 tests/ref/fate/magicyuv-y400i  |    6 ++++++
 tests/ref/fate/magicyuv-y420   |    6 ++++++
 tests/ref/fate/magicyuv-y422i  |    6 ++++++
 tests/ref/fate/magicyuv-y444   |    6 ++++++
 tests/ref/fate/magicyuv-y4444i |    6 ++++++
 8 files changed, 61 insertions(+)

diff --git a/tests/fate/video.mak b/tests/fate/video.mak
index 03a6466..3d29b44 100644
--- a/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@ -213,6 +213,25 @@ fate-kgv1: CMD = framecrc -i $(TARGET_SAMPLES)/kega/kgv1.avi -pix_fmt rgb555le -
 FATE_VIDEO-$(call DEMDEC, AVI, KMVC) += fate-kmvc
 fate-kmvc: CMD = framecrc -i $(TARGET_SAMPLES)/KMVC/LOGO1.AVI -an -t 3 -pix_fmt rgb24
 
+FATE_MAGICYUV += fate-magicyuv-y4444i \
+                 fate-magicyuv-y400i  \
+                 fate-magicyuv-y420   \
+                 fate-magicyuv-y422i  \
+                 fate-magicyuv-y444   \
+                 fate-magicyuv-rgba   \
+                 fate-magicyuv-rgb
+
+FATE_VIDEO-$(call DEMDEC, AVI, MAGICYUV) += $(FATE_MAGICYUV)
+fate-magicyuv: $(FATE_MAGICYUV)
+
+fate-magicyuv-rgb:    CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_rgb_median.avi
+fate-magicyuv-rgba:   CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_rgba_gradient.avi
+fate-magicyuv-y400i:  CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv400_gradient_interlaced.avi
+fate-magicyuv-y420:   CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv420_median.avi
+fate-magicyuv-y422i:  CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv422_median_interlaced.avi
+fate-magicyuv-y4444i: CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv4444_left_interlaced.avi
+fate-magicyuv-y444:   CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv444_left.avi
+
 FATE_VIDEO-$(call DEMDEC, EA, MDEC) += fate-mdec
 fate-mdec: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/ea-dct/NFS2Esprit-partial.dct -an
 
diff --git a/tests/ref/fate/magicyuv-rgb b/tests/ref/fate/magicyuv-rgb
new file mode 100644
index 0000000..9fd483b
--- /dev/null
+++ b/tests/ref/fate/magicyuv-rgb
@@ -0,0 +1,6 @@
+#tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x232
+#sar 0: 0/1
+0,          0,          0,        1,   144768, 0x497c8ce1
diff --git a/tests/ref/fate/magicyuv-rgba b/tests/ref/fate/magicyuv-rgba
new file mode 100644
index 0000000..d2ccb69
--- /dev/null
+++ b/tests/ref/fate/magicyuv-rgba
@@ -0,0 +1,6 @@
+#tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x232
+#sar 0: 0/1
+0,          0,          0,        1,   193024, 0x7e1b7233
diff --git a/tests/ref/fate/magicyuv-y400i b/tests/ref/fate/magicyuv-y400i
new file mode 100644
index 0000000..bf87b62
--- /dev/null
+++ b/tests/ref/fate/magicyuv-y400i
@@ -0,0 +1,6 @@
+#tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x232
+#sar 0: 0/1
+0,          0,          0,        1,    48256, 0x368b93f2
diff --git a/tests/ref/fate/magicyuv-y420 b/tests/ref/fate/magicyuv-y420
new file mode 100644
index 0000000..25fffc0
--- /dev/null
+++ b/tests/ref/fate/magicyuv-y420
@@ -0,0 +1,6 @@
+#tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x232
+#sar 0: 0/1
+0,          0,          0,        1,    72384, 0x59a87842
diff --git a/tests/ref/fate/magicyuv-y422i b/tests/ref/fate/magicyuv-y422i
new file mode 100644
index 0000000..4bb73f5
--- /dev/null
+++ b/tests/ref/fate/magicyuv-y422i
@@ -0,0 +1,6 @@
+#tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x232
+#sar 0: 0/1
+0,          0,          0,        1,    96512, 0xe84751be
diff --git a/tests/ref/fate/magicyuv-y444 b/tests/ref/fate/magicyuv-y444
new file mode 100644
index 0000000..372d49c
--- /dev/null
+++ b/tests/ref/fate/magicyuv-y444
@@ -0,0 +1,6 @@
+#tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x232
+#sar 0: 0/1
+0,          0,          0,        1,   144768, 0xef48043f
diff --git a/tests/ref/fate/magicyuv-y4444i b/tests/ref/fate/magicyuv-y4444i
new file mode 100644
index 0000000..c5ab70e
--- /dev/null
+++ b/tests/ref/fate/magicyuv-y4444i
@@ -0,0 +1,6 @@
+#tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x232
+#sar 0: 0/1
+0,          0,          0,        1,   193024, 0x5292ecec


======================================================================

diff --cc tests/fate/video.mak
index 03a6466,40f74ea..3d29b44
--- a/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@@ -192,57 -178,73 +192,76 @@@ fate-iff-fibonacci: CMD = md5 -i $(TARG
  FATE_IFF-$(CONFIG_IFF_ILBM_DECODER) += fate-iff-ilbm
  fate-iff-ilbm: CMD = framecrc -i $(TARGET_SAMPLES)/iff/lms-matriks.ilbm -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV-$(CONFIG_IFF_DEMUXER)  += $(FATE_IFF-yes)
 +FATE_VIDEO-$(CONFIG_IFF_DEMUXER)  += $(FATE_IFF-yes)
  fate-iff: $(FATE_IFF-yes)
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-8bit
 +FATE_VIDEO-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-8bit
  fate-interplay-mve-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/interplay-mve/interplay-logo-2MB.mve -pix_fmt rgb24 -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-16bit
 +FATE_VIDEO-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-16bit
  fate-interplay-mve-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24 -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MXF, JPEG2000) += fate-jpeg2000-dcinema
 -fate-jpeg2000-dcinema: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/chiens_dcinema2K.mxf -pix_fmt xyz12le
 +FATE_VIDEO-$(call DEMDEC, MXF, JPEG2000) += fate-jpeg2000-dcinema
 +fate-jpeg2000-dcinema: CMD = framecrc -flags +bitexact -vcodec jpeg2000 -i $(TARGET_SAMPLES)/jpeg2000/chiens_dcinema2K.mxf -pix_fmt xyz12le
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, JV, JV) += fate-jv
 +FATE_VIDEO-$(call DEMDEC, JV, JV) += fate-jv
  fate-jv: CMD = framecrc -i $(TARGET_SAMPLES)/jv/intro.jv -an -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, KGV1) += fate-kgv1
 +FATE_VIDEO-$(call DEMDEC, AVI, KGV1) += fate-kgv1
  fate-kgv1: CMD = framecrc -i $(TARGET_SAMPLES)/kega/kgv1.avi -pix_fmt rgb555le -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, KMVC) += fate-kmvc
 +FATE_VIDEO-$(call DEMDEC, AVI, KMVC) += fate-kmvc
  fate-kmvc: CMD = framecrc -i $(TARGET_SAMPLES)/KMVC/LOGO1.AVI -an -t 3 -pix_fmt rgb24
  
+ FATE_MAGICYUV += fate-magicyuv-y4444i \
+                  fate-magicyuv-y400i  \
+                  fate-magicyuv-y420   \
+                  fate-magicyuv-y422i  \
+                  fate-magicyuv-y444   \
+                  fate-magicyuv-rgba   \
+                  fate-magicyuv-rgb
+ 
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, MAGICYUV) += $(FATE_MAGICYUV)
++FATE_VIDEO-$(call DEMDEC, AVI, MAGICYUV) += $(FATE_MAGICYUV)
+ fate-magicyuv: $(FATE_MAGICYUV)
+ 
+ fate-magicyuv-rgb:    CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_rgb_median.avi
+ fate-magicyuv-rgba:   CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_rgba_gradient.avi
+ fate-magicyuv-y400i:  CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv400_gradient_interlaced.avi
+ fate-magicyuv-y420:   CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv420_median.avi
+ fate-magicyuv-y422i:  CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv422_median_interlaced.avi
+ fate-magicyuv-y4444i: CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv4444_left_interlaced.avi
+ fate-magicyuv-y444:   CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv444_left.avi
+ 
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, EA, MDEC) += fate-mdec
 +FATE_VIDEO-$(call DEMDEC, EA, MDEC) += fate-mdec
  fate-mdec: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/ea-dct/NFS2Esprit-partial.dct -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, STR, MDEC) += fate-mdec-v3
 +FATE_VIDEO-$(call DEMDEC, STR, MDEC) += fate-mdec-v3
  fate-mdec-v3: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/psx-str/abc000_cut.str -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MSNWC_TCP, MIMIC) += fate-mimic
 +FATE_VIDEO-$(call DEMDEC, MSNWC_TCP, MIMIC) += fate-mimic
  fate-mimic: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/mimic/mimic2-womanloveffmpeg.cam
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, MJPEGB) += fate-mjpegb
 +FATE_VIDEO-$(call DEMDEC, MOV, MJPEGB) += fate-mjpegb
  fate-mjpegb: CMD = framecrc -idct simple -fflags +bitexact -i $(TARGET_SAMPLES)/mjpegb/mjpegb_part.mov -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MVI, MOTIONPIXELS) += fate-motionpixels
 +FATE_VIDEO-$(call DEMDEC, MVI, MOTIONPIXELS) += fate-motionpixels
  fate-motionpixels: CMD = framecrc -i $(TARGET_SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -vframes 111
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc
 +FATE_VIDEO-$(call DEMDEC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc
  fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an -vframes 30
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MV, MVC1) += fate-mv-mvc1
 +FATE_VIDEO-$(call DEMDEC, MV, MVC1) += fate-mv-mvc1
  fate-mv-mvc1: CMD = framecrc -i $(TARGET_SAMPLES)/mv/posture.mv -an -frames 25 -pix_fmt rgb555le
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MV, MVC2) += fate-mv-mvc2
 +FATE_VIDEO-$(call DEMDEC, MV, MVC2) += fate-mv-mvc2
  fate-mv-mvc2: CMD = framecrc -i $(TARGET_SAMPLES)/mv/12345.mv -an -frames 30 -pix_fmt bgra
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MV, SGIRLE) += fate-mv-sgirle
 +FATE_VIDEO-$(call DEMDEC, MV, SGIRLE) += fate-mv-sgirle
  fate-mv-sgirle: CMD = framecrc -i $(TARGET_SAMPLES)/mv/pet-rle.movie -an
  
 +FATE_VIDEO-$(call DEMDEC, MXG, MXPEG) += fate-mxpeg
 +fate-mxpeg: CMD = framecrc -idct simple -flags +bitexact -i $(TARGET_SAMPLES)/mxpeg/m1.mxg -an
 +
  # FIXME dropped frames in this test because of coarse timebase
  FATE_NUV += fate-nuv-rtjpeg
  fate-nuv-rtjpeg: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/nuv/Today.nuv -an
diff --cc tests/ref/fate/magicyuv-rgb
index 0000000,a52574a..9fd483b
mode 000000,100644..100644
--- a/tests/ref/fate/magicyuv-rgb
+++ b/tests/ref/fate/magicyuv-rgb
@@@ -1,0 -1,2 +1,6 @@@
+ #tb 0: 100/2397
++#media_type 0: video
++#codec_id 0: rawvideo
++#dimensions 0: 208x232
++#sar 0: 0/1
+ 0,          0,          0,        1,   144768, 0x497c8ce1
diff --cc tests/ref/fate/magicyuv-rgba
index 0000000,6cad8e0..d2ccb69
mode 000000,100644..100644
--- a/tests/ref/fate/magicyuv-rgba
+++ b/tests/ref/fate/magicyuv-rgba
@@@ -1,0 -1,2 +1,6 @@@
+ #tb 0: 100/2397
++#media_type 0: video
++#codec_id 0: rawvideo
++#dimensions 0: 208x232
++#sar 0: 0/1
+ 0,          0,          0,        1,   193024, 0x7e1b7233
diff --cc tests/ref/fate/magicyuv-y400i
index 0000000,4c8fe7e..bf87b62
mode 000000,100644..100644
--- a/tests/ref/fate/magicyuv-y400i
+++ b/tests/ref/fate/magicyuv-y400i
@@@ -1,0 -1,2 +1,6 @@@
+ #tb 0: 100/2397
++#media_type 0: video
++#codec_id 0: rawvideo
++#dimensions 0: 208x232
++#sar 0: 0/1
+ 0,          0,          0,        1,    48256, 0x368b93f2
diff --cc tests/ref/fate/magicyuv-y420
index 0000000,3145e8a..25fffc0
mode 000000,100644..100644
--- a/tests/ref/fate/magicyuv-y420
+++ b/tests/ref/fate/magicyuv-y420
@@@ -1,0 -1,2 +1,6 @@@
+ #tb 0: 100/2397
++#media_type 0: video
++#codec_id 0: rawvideo
++#dimensions 0: 208x232
++#sar 0: 0/1
+ 0,          0,          0,        1,    72384, 0x59a87842
diff --cc tests/ref/fate/magicyuv-y422i
index 0000000,2a7af47..4bb73f5
mode 000000,100644..100644
--- a/tests/ref/fate/magicyuv-y422i
+++ b/tests/ref/fate/magicyuv-y422i
@@@ -1,0 -1,2 +1,6 @@@
+ #tb 0: 100/2397
++#media_type 0: video
++#codec_id 0: rawvideo
++#dimensions 0: 208x232
++#sar 0: 0/1
+ 0,          0,          0,        1,    96512, 0xe84751be
diff --cc tests/ref/fate/magicyuv-y444
index 0000000,ee836c2..372d49c
mode 000000,100644..100644
--- a/tests/ref/fate/magicyuv-y444
+++ b/tests/ref/fate/magicyuv-y444
@@@ -1,0 -1,2 +1,6 @@@
+ #tb 0: 100/2397
++#media_type 0: video
++#codec_id 0: rawvideo
++#dimensions 0: 208x232
++#sar 0: 0/1
+ 0,          0,          0,        1,   144768, 0xef48043f
diff --cc tests/ref/fate/magicyuv-y4444i
index 0000000,bc3c702..c5ab70e
mode 000000,100644..100644
--- a/tests/ref/fate/magicyuv-y4444i
+++ b/tests/ref/fate/magicyuv-y4444i
@@@ -1,0 -1,2 +1,6 @@@
+ #tb 0: 100/2397
++#media_type 0: video
++#codec_id 0: rawvideo
++#dimensions 0: 208x232
++#sar 0: 0/1
+ 0,          0,          0,        1,   193024, 0x5292ecec

More information about the ffmpeg-cvslog mailing list