ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Tue Nov 7 18:35:34 2017 -0300| [0ff8f0b7b4d72476c4859f0d42cfef442c23937c] | committer: James Almer
Merge commit '5be9939b46a6a4d3860a1b1a872aa50897095970' * commit '5be9939b46a6a4d3860a1b1a872aa50897095970': fate: Add cinepak encoder vsynth tests See d7f62f033c214f3863acfd8e0672407b0bf91a3b Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ff8f0b7b4d72476c4859f0d42cfef442c23937c --- tests/fate/vcodec.mak | 6 +++--- tests/ref/vsynth/vsynth1-cinepak | 8 ++++---- tests/ref/vsynth/vsynth2-cinepak | 8 ++++---- tests/ref/vsynth/vsynth_lena-cinepak | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index c0344550f9..bbcf25d72a 100644 --- a/tests/fate/vcodec.mak +++ b/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 diff --git a/tests/ref/vsynth/vsynth1-cinepak b/tests/ref/vsynth/vsynth1-cinepak index f1dfcd81db..e47ae26b6d 100644 --- a/tests/ref/vsynth/vsynth1-cinepak +++ b/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 diff --git a/tests/ref/vsynth/vsynth2-cinepak b/tests/ref/vsynth/vsynth2-cinepak index 18eb1d59a8..835de78d16 100644 --- a/tests/ref/vsynth/vsynth2-cinepak +++ b/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 diff --git a/tests/ref/vsynth/vsynth_lena-cinepak b/tests/ref/vsynth/vsynth_lena-cinepak index 39b1d68268..6b021673a0 100644 --- a/tests/ref/vsynth/vsynth_lena-cinepak +++ b/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 ====================================================================== diff --cc tests/fate/vcodec.mak index c0344550f9,490da55511..bbcf25d72a --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@@ -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 \ diff --cc tests/ref/vsynth/vsynth1-cinepak index f1dfcd81db,09ba81aef3..e47ae26b6d --- a/tests/ref/vsynth/vsynth1-cinepak +++ b/tests/ref/vsynth/vsynth1-cinepak @@@ -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 diff --cc tests/ref/vsynth/vsynth2-cinepak index 18eb1d59a8,c1ff48d109..835de78d16 --- a/tests/ref/vsynth/vsynth2-cinepak +++ b/tests/ref/vsynth/vsynth2-cinepak @@@ -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 diff --cc tests/ref/vsynth/vsynth_lena-cinepak index 39b1d68268,0000000000..6b021673a0 mode 100644,000000..100644 --- a/tests/ref/vsynth/vsynth_lena-cinepak +++ b/tests/ref/vsynth/vsynth_lena-cinepak @@@ -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 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
