Merge commit '5be9939b46a6a4d3860a1b1a872aa50897095970'
authorJames Almer <jamrial@gmail.com>
Tue, 7 Nov 2017 21:35:34 +0000 (18:35 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 7 Nov 2017 21:35:34 +0000 (18:35 -0300)
* commit '5be9939b46a6a4d3860a1b1a872aa50897095970':
  fate: Add cinepak encoder vsynth tests

See d7f62f033c214f3863acfd8e0672407b0bf91a3b

Merged-by: James Almer <jamrial@gmail.com>
1  2 
tests/fate/vcodec.mak
tests/ref/vsynth/vsynth1-cinepak
tests/ref/vsynth/vsynth2-cinepak
tests/ref/vsynth/vsynth_lena-cinepak

index c0344550f9de8822e61fca8cf1e343b90c1eeea7,490da5551171989ab722fdd4bb83046273fe1643..bbcf25d72a0b417b8719203d7e413d3f80ab9fd1
@@@ -18,12 -12,11 +18,12 @@@ fate-vsynth%-asv1:               ENCOPT
  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
  
  FATE_VCODEC-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p                  \
                                              dnxhd-720p-rd               \
index f1dfcd81db6adb2797f93268affc06fd85c1117c,09ba81aef30398371630848442035cdca4bfb572..e47ae26b6da8e6121565c307db5135d683bf7d3c
@@@ -1,4 -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
 -c2198279f3ccf18eb029875c98231073 *tests/data/fate/vsynth1-cinepak.avi
 -408612 tests/data/fate/vsynth1-cinepak.avi
 -fdcc7e515ff0bea5203d1ed9bfa7514c *tests/data/fate/vsynth1-cinepak.out.rawvideo
 -stddev:   64.04 PSNR: 12.00 MAXDIFF:  238 bytes:  7603200/   921600
++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
index 18eb1d59a84db0f6aed8bf85f660ffef2e62c429,c1ff48d10900d199c8fab21fa760f8fbbef6ee2d..835de78d16135dfeb3c636492aee3955ccf2586e
@@@ -1,4 -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
 -722bab34b13b33e46dbbdd47985049f3 *tests/data/fate/vsynth2-cinepak.avi
 -400398 tests/data/fate/vsynth2-cinepak.avi
 -c59f0419068f0071476d037abd2ccde2 *tests/data/fate/vsynth2-cinepak.out.rawvideo
 -stddev:   87.20 PSNR:  9.32 MAXDIFF:  247 bytes:  7603200/   921600
++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
index 39b1d68268b03457b4439366564904c27cd5304d,0000000000000000000000000000000000000000..6b021673a03a692e88d1c6b78a1bcea7864eb75b
mode 100644,000000..100644
--- /dev/null
@@@ -1,4 -1,0 +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