From bfb488234525e17a84e84d6a0b6c00771caab7c2 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 29 May 2014 20:56:02 -0700 Subject: [PATCH] tests: Add MPEG4 nsse test Signed-off-by: Timothy Gu Signed-off-by: Michael Niedermayer --- tests/fate/seek.mak | 1 + tests/fate/vcodec.mak | 7 ++++- tests/ref/seek/vsynth2-mpeg4-nsse | 46 +++++++++++++++++++++++++++++ tests/ref/vsynth/vsynth1-mpeg4-nsse | 4 +++ tests/ref/vsynth/vsynth2-mpeg4-nsse | 4 +++ 5 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 tests/ref/seek/vsynth2-mpeg4-nsse create mode 100644 tests/ref/vsynth/vsynth1-mpeg4-nsse create mode 100644 tests/ref/vsynth/vsynth2-mpeg4-nsse diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak index fe8d3ab910..aa9f36d43d 100644 --- a/tests/fate/seek.mak +++ b/tests/fate/seek.mak @@ -127,6 +127,7 @@ fate-seek-vsynth2-mpeg4-adap: SRC = fate/vsynth2-mpeg4-adap.avi fate-seek-vsynth2-mpeg4-adv: SRC = fate/vsynth2-mpeg4-adv.avi fate-seek-vsynth2-mpeg4-error: SRC = fate/vsynth2-mpeg4-error.avi fate-seek-vsynth2-mpeg4-nr: SRC = fate/vsynth2-mpeg4-nr.avi +fate-seek-vsynth2-mpeg4-nsse: SRC = fate/vsynth2-mpeg4-nsse.avi fate-seek-vsynth2-mpeg4-qpel: SRC = fate/vsynth2-mpeg4-qpel.avi fate-seek-vsynth2-mpeg4-qprd: SRC = fate/vsynth2-mpeg4-qprd.avi fate-seek-vsynth2-mpeg4-rc: SRC = fate/vsynth2-mpeg4-rc.avi diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index af809371b4..541cba1bf2 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -163,7 +163,8 @@ FATE_MPEG4_AVI = mpeg4-rc \ mpeg4-qpel \ mpeg4-thread \ mpeg4-error \ - mpeg4-nr + mpeg4-nr \ + mpeg4-nsse FATE_VCODEC-$(call ENCDEC, MPEG4, MP4 MOV) += $(FATE_MPEG4_MP4) FATE_VCODEC-$(call ENCDEC, MPEG4, AVI) += $(FATE_MPEG4_AVI) @@ -185,6 +186,10 @@ fate-vsynth%-mpeg4-error: ENCOPTS = -qscale 7 -flags +mv4+aic \ fate-vsynth%-mpeg4-nr: ENCOPTS = -qscale 8 -flags +mv4 -mbd rd -nr 200 +fate-vsynth%-mpeg4-nsse: ENCOPTS = -qscale 7 -cmp nsse -subcmp nsse \ + -mbcmp nsse -precmp nsse \ + -skipcmp nsse + fate-vsynth%-mpeg4-qpel: ENCOPTS = -qscale 7 -flags +mv4+qpel -mbd 2 \ -bf 2 -cmp 1 -subcmp 2 diff --git a/tests/ref/seek/vsynth2-mpeg4-nsse b/tests/ref/seek/vsynth2-mpeg4-nsse new file mode 100644 index 0000000000..8e2a95f275 --- /dev/null +++ b/tests/ref/seek/vsynth2-mpeg4-nsse @@ -0,0 +1,46 @@ +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 11937 +ret: 0 st:-1 flags:0 ts:-1.000000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 11937 +ret: 0 st:-1 flags:1 ts: 1.894167 +ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 127872 size: 15054 +ret: 0 st: 0 flags:0 ts: 0.800000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 81652 size: 13376 +ret:-1 st: 0 flags:1 ts:-0.320000 +ret:-1 st:-1 flags:0 ts: 2.576668 +ret: 0 st:-1 flags:1 ts: 1.470835 +ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 127872 size: 15054 +ret: 0 st: 0 flags:0 ts: 0.360000 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 42638 size: 11805 +ret:-1 st: 0 flags:1 ts:-0.760000 +ret:-1 st:-1 flags:0 ts: 2.153336 +ret: 0 st:-1 flags:1 ts: 1.047503 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 81652 size: 13376 +ret: 0 st: 0 flags:0 ts:-0.040000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 11937 +ret: 0 st: 0 flags:1 ts: 2.840000 +ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 179512 size: 15553 +ret: 0 st:-1 flags:0 ts: 1.730004 +ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 179512 size: 15553 +ret: 0 st:-1 flags:1 ts: 0.624171 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 42638 size: 11805 +ret: 0 st: 0 flags:0 ts:-0.480000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 11937 +ret: 0 st: 0 flags:1 ts: 2.400000 +ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 179512 size: 15553 +ret: 0 st:-1 flags:0 ts: 1.306672 +ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 127872 size: 15054 +ret: 0 st:-1 flags:1 ts: 0.200839 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 11937 +ret: 0 st: 0 flags:0 ts:-0.920000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 11937 +ret: 0 st: 0 flags:1 ts: 2.000000 +ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 179512 size: 15553 +ret: 0 st:-1 flags:0 ts: 0.883340 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 81652 size: 13376 +ret:-1 st:-1 flags:1 ts:-0.222493 +ret:-1 st: 0 flags:0 ts: 2.680000 +ret: 0 st: 0 flags:1 ts: 1.560000 +ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 127872 size: 15054 +ret: 0 st:-1 flags:0 ts: 0.460008 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 42638 size: 11805 +ret:-1 st:-1 flags:1 ts:-0.645825 diff --git a/tests/ref/vsynth/vsynth1-mpeg4-nsse b/tests/ref/vsynth/vsynth1-mpeg4-nsse new file mode 100644 index 0000000000..a6065f92fb --- /dev/null +++ b/tests/ref/vsynth/vsynth1-mpeg4-nsse @@ -0,0 +1,4 @@ +10fa4b9d835349220908b5ebde9a0e70 *tests/data/fate/vsynth1-mpeg4-nsse.avi +886842 tests/data/fate/vsynth1-mpeg4-nsse.avi +a987cb2e49284ea83174e3a2c6527173 *tests/data/fate/vsynth1-mpeg4-nsse.out.rawvideo +stddev: 6.00 PSNR: 32.57 MAXDIFF: 73 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-mpeg4-nsse b/tests/ref/vsynth/vsynth2-mpeg4-nsse new file mode 100644 index 0000000000..083351903a --- /dev/null +++ b/tests/ref/vsynth/vsynth2-mpeg4-nsse @@ -0,0 +1,4 @@ +b60bb3d8b942795272f0f0d89cd6351e *tests/data/fate/vsynth2-mpeg4-nsse.avi +198434 tests/data/fate/vsynth2-mpeg4-nsse.avi +59864a1050e641eaed8b0ee077bc780b *tests/data/fate/vsynth2-mpeg4-nsse.out.rawvideo +stddev: 4.32 PSNR: 35.40 MAXDIFF: 60 bytes: 7603200/ 7603200