Merge commit '5be9939b46a6a4d3860a1b1a872aa50897095970'

* commit '5be9939b46a6a4d3860a1b1a872aa50897095970':
  fate: Add cinepak encoder vsynth tests

See d7f62f033c

Merged-by: James Almer <jamrial@gmail.com>

tests/fate/vcodec.mak

@@ -18,9 +18,9 @@ fate-vsynth%-asv1:               ENCOPTS = -qscale 10
 FATE_VCODEC-$(call ENCDEC, ASV2, AVI)   += asv2
 fate-vsynth%-asv2:               ENCOPTS = -qscale 10
 
-FATE_VCODEC-$(call ENCDEC, CINEPAK, MOV) += cinepak
-fate-vsynth%-cinepak:            ENCOPTS  = -c:v cinepak -frames 3
-fate-vsynth%-cinepak:            FMT      = mov
+FATE_VCODEC-$(call ENCDEC, CINEPAK, AVI) += cinepak
+fate-vsynth%-cinepak:            ENCOPTS = -s sqcif -strip_number_adaptivity 1
+fate-vsynth%-cinepak:            DECOPTS = -s sqcif
 
 FATE_VCODEC-$(call ENCDEC, CLJR, AVI)   += cljr
 fate-vsynth%-cljr:               ENCOPTS = -strict -1

tests/ref/vsynth/vsynth1-cinepak

@@ -1,4 +1,4 @@
-546c7c1069f9e418aa787f469b693b94 *tests/data/fate/vsynth1-cinepak.mov
-99465 tests/data/fate/vsynth1-cinepak.mov
-bee091c200262be3427a233a2812388c *tests/data/fate/vsynth1-cinepak.out.rawvideo
-stddev:    8.46 PSNR: 29.58 MAXDIFF:  105 bytes:  7603200/   456192
+cd28e47a6ac396240a3fee69f15625d1 *tests/data/fate/vsynth1-cinepak.avi
+408616 tests/data/fate/vsynth1-cinepak.avi
+e74066a028c708f467272884ecd3f7d3 *tests/data/fate/vsynth1-cinepak.out.rawvideo
+stddev:   61.38 PSNR: 12.37 MAXDIFF:  225 bytes:  7603200/   921600

tests/ref/vsynth/vsynth2-cinepak

@@ -1,4 +1,4 @@
-cc0879f1993cdd6231e2c3b9c2c015a0 *tests/data/fate/vsynth2-cinepak.mov
-88400 tests/data/fate/vsynth2-cinepak.mov
-12c480911ebb89762dc49af003b176c7 *tests/data/fate/vsynth2-cinepak.out.rawvideo
-stddev:    5.07 PSNR: 34.02 MAXDIFF:   59 bytes:  7603200/   456192
+663a2804f421709208c76f6e34e7bea5 *tests/data/fate/vsynth2-cinepak.avi
+400402 tests/data/fate/vsynth2-cinepak.avi
+2c761c3c8cda083eb8f54b2df72b257b *tests/data/fate/vsynth2-cinepak.out.rawvideo
+stddev:   80.96 PSNR:  9.96 MAXDIFF:  227 bytes:  7603200/   921600

tests/ref/vsynth/vsynth_lena-cinepak

@@ -1,4 +1,4 @@
-e3837018f84929f07019ae2eccd303e2 *tests/data/fate/vsynth_lena-cinepak.mov
-88900 tests/data/fate/vsynth_lena-cinepak.mov
-f54ffa70f335ac7b701d7ae34462e001 *tests/data/fate/vsynth_lena-cinepak.out.rawvideo
-stddev:    4.09 PSNR: 35.88 MAXDIFF:   46 bytes:  7603200/   456192
+a9ea19eb0d239a53af8630d5bc4167d0 *tests/data/fate/vsynth_lena-cinepak.avi
+407574 tests/data/fate/vsynth_lena-cinepak.avi
+e32d4103194665d2ea0f46d5cdd0cdf2 *tests/data/fate/vsynth_lena-cinepak.out.rawvideo
+stddev:   58.10 PSNR: 12.85 MAXDIFF:  185 bytes:  7603200/   921600