[FFmpeg-devel,v2] fate: add more vc2 encoder tests

Message ID	20180716110353.4481-1-jdarnley@obe.tv
State	Accepted
Commit	088b07427dfe05de998609fe214017ebdb703a63
Headers	show Delivered-To: ffmpegpatchwork@gmail.com Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; From: James Darnley <jdarnley@obe.tv> To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Jul 2018 13:03:53 +0200 Message-Id: <20180716110353.4481-1-jdarnley@obe.tv> In-Reply-To: <20180713180957.28670-1-jdarnley@obe.tv> References: <20180713180957.28670-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH v2] fate: add more vc2 encoder tests Precedence: list Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: James Darnley <james.darnley@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>

Message ID

20180716110353.4481-1-jdarnley@obe.tv

State

Accepted

Commit

088b07427dfe05de998609fe214017ebdb703a63

Headers

Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org
	designates 79.124.17.100 as permitted sender)
	client-ip=79.124.17.100; 
From: James Darnley <jdarnley@obe.tv>
To: ffmpeg-devel@ffmpeg.org
Date: Mon, 16 Jul 2018 13:03:53 +0200
Message-Id: <20180716110353.4481-1-jdarnley@obe.tv>
In-Reply-To: <20180713180957.28670-1-jdarnley@obe.tv>
References: <20180713180957.28670-1-jdarnley@obe.tv>
Subject: [FFmpeg-devel] [PATCH v2] fate: add more vc2 encoder tests
Precedence: list
Reply-To: FFmpeg development discussions and patches
	<ffmpeg-devel@ffmpeg.org>
Cc: James Darnley <james.darnley@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>

Commit Message

James Darnley July 16, 2018, 11:03 a.m. UTC

From: James Darnley <james.darnley@gmail.com>

---
Michael, can you test this for the same failure you saw last time?

 tests/fate/vcodec.mak                  | 24 ++++++++++++++++--------
 tests/ref/vsynth/vsynth1-vc2-t5_3      |  4 ++++
 tests/ref/vsynth/vsynth1-vc2-thaar     |  4 ++++
 tests/ref/vsynth/vsynth2-vc2-t5_3      |  4 ++++
 tests/ref/vsynth/vsynth2-vc2-thaar     |  4 ++++
 tests/ref/vsynth/vsynth_lena-vc2-t5_3  |  4 ++++
 tests/ref/vsynth/vsynth_lena-vc2-thaar |  4 ++++
 7 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 tests/ref/vsynth/vsynth1-vc2-t5_3
 create mode 100644 tests/ref/vsynth/vsynth1-vc2-thaar
 create mode 100644 tests/ref/vsynth/vsynth2-vc2-t5_3
 create mode 100644 tests/ref/vsynth/vsynth2-vc2-thaar
 create mode 100644 tests/ref/vsynth/vsynth_lena-vc2-t5_3
 create mode 100644 tests/ref/vsynth/vsynth_lena-vc2-thaar

Comments

Gyan July 16, 2018, 12:29 p.m. UTC | #1

I'll likely be pushing a change to the MOV demuxer tonight which will 
change a tag, so you'll probably need to re-gen your refs.

Regards,
Gyan

Michael Niedermayer July 18, 2018, 12:24 a.m. UTC | #2

On Mon, Jul 16, 2018 at 01:03:53PM +0200, James Darnley wrote:
> From: James Darnley <james.darnley@gmail.com>
> 
> ---
> Michael, can you test this for the same failure you saw last time?

seems to work in all cases i tested

[...]

James Darnley July 18, 2018, 9:08 a.m. UTC | #3

On 2018-07-18 02:24, Michael Niedermayer wrote:
> On Mon, Jul 16, 2018 at 01:03:53PM +0200, James Darnley wrote:
>> From: James Darnley <james.darnley@gmail.com>
>>
>> ---
>> Michael, can you test this for the same failure you saw last time?
> 
> seems to work in all cases i tested

Good, I didn't confuse make this time.  I will recheck after the mov
changes Gyan pushed, update if nessecary, and push in a few minutes.

diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak
index bbcf25d72a..da6da9e09b 100644
--- a/tests/fate/vcodec.mak
+++ b/tests/fate/vcodec.mak
@@ -38,17 +38,25 @@  FATE_VCODEC-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p                  \
 
 FATE_VCODEC-$(call ENCDEC, VC2 DIRAC, MOV) += vc2-420p vc2-420p10 vc2-420p12 \
                                               vc2-422p vc2-422p10 vc2-422p12 \
-                                              vc2-444p vc2-444p10 vc2-444p12
-fate-vsynth1-vc2-%:              FMT      = mov
-fate-vsynth1-vc2-%:              ENCOPTS = -pix_fmt yuv$(@:fate-vsynth1-vc2-%=%) \
+                                              vc2-444p vc2-444p10 vc2-444p12 \
+                                              vc2-thaar vc2-t5_3
+fate-vsynth1-vc2-4%:             FMT      = mov
+fate-vsynth1-vc2-4%:             ENCOPTS = -pix_fmt yuv$(@:fate-vsynth1-vc2-%=%) \
                                            -c:v vc2 -frames 5 -strict -1
-fate-vsynth2-vc2-%:              FMT      = mov
-fate-vsynth2-vc2-%:              ENCOPTS = -pix_fmt yuv$(@:fate-vsynth2-vc2-%=%) \
+fate-vsynth2-vc2-4%:             FMT      = mov
+fate-vsynth2-vc2-4%:             ENCOPTS = -pix_fmt yuv$(@:fate-vsynth2-vc2-%=%) \
                                            -c:v vc2 -frames 5 -strict -1
-fate-vsynth_lena-vc2-%:          FMT      = mov
-fate-vsynth_lena-vc2-%:          ENCOPTS = -pix_fmt yuv$(@:fate-vsynth_lena-vc2-%=%) \
+fate-vsynth_lena-vc2-4%:         FMT      = mov
+fate-vsynth_lena-vc2-4%:         ENCOPTS = -pix_fmt yuv$(@:fate-vsynth_lena-vc2-%=%) \
                                            -c:v vc2 -frames 5 -strict -1
 
+fate-vsynth1-vc2-t%:             FMT     = mov
+fate-vsynth1-vc2-t%:             ENCOPTS = -pix_fmt yuv422p10 -c:v vc2 -frames 5 -strict -1 -wavelet_type $(@:fate-vsynth1-vc2-t%=%)
+fate-vsynth2-vc2-t%:             FMT     = mov
+fate-vsynth2-vc2-t%:             ENCOPTS = -pix_fmt yuv422p10 -c:v vc2 -frames 5 -strict -1 -wavelet_type $(@:fate-vsynth2-vc2-t%=%)
+fate-vsynth_lena-vc2-t%:         FMT     = mov
+fate-vsynth_lena-vc2-t%:         ENCOPTS = -pix_fmt yuv422p10 -c:v vc2 -frames 5 -strict -1 -wavelet_type $(@:fate-vsynth_lena-vc2-t%=%)
+
 fate-vsynth%-dnxhd-720p:         ENCOPTS = -s hd720 -b 90M              \
                                            -pix_fmt yuv422p -frames 5 -qmax 8
 fate-vsynth%-dnxhd-720p:         FMT     = dnxhd
@@ -434,7 +442,7 @@  FATE_VSYNTH_LENA = $(FATE_VCODEC:%=fate-vsynth_lena-%)
 RESIZE_OFF   = dnxhd-720p dnxhd-720p-rd dnxhd-720p-10bit dnxhd-1080i \
                dv dv-411 dv-50 avui snow snow-hpel snow-ll vc2-420p \
                vc2-420p10 vc2-420p12 vc2-422p vc2-422p10 vc2-422p12 \
-               vc2-444p vc2-444p10 vc2-444p12
+               vc2-444p vc2-444p10 vc2-444p12 vc2-thaar vc2-t5_3
 # Incorrect parameters - usually size or color format restrictions
 INC_PAR_OFF  = cinepak h261 h261-trellis h263 h263p h263-obmc msvideo1 \
                roqvideo rv10 rv20 y41p qtrlegray
diff --git a/tests/ref/vsynth/vsynth1-vc2-t5_3 b/tests/ref/vsynth/vsynth1-vc2-t5_3
new file mode 100644
index 0000000000..543f632c23
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-vc2-t5_3
@@ -0,0 +1,4 @@ 
+a5c80a091e7c3021ab9d5b854b4c653f *tests/data/fate/vsynth1-vc2-t5_3.mov
+1604316 tests/data/fate/vsynth1-vc2-t5_3.mov
+f35dd1c1df4726bb1d75d95e321b0698 *tests/data/fate/vsynth1-vc2-t5_3.out.rawvideo
+stddev:    1.88 PSNR: 42.61 MAXDIFF:   23 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-vc2-thaar b/tests/ref/vsynth/vsynth1-vc2-thaar
new file mode 100644
index 0000000000..4c1f50f40d
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-vc2-thaar
@@ -0,0 +1,4 @@ 
+62bcccb2981c4b79b635a0199a7fafb1 *tests/data/fate/vsynth1-vc2-thaar.mov
+1717724 tests/data/fate/vsynth1-vc2-thaar.mov
+f35dd1c1df4726bb1d75d95e321b0698 *tests/data/fate/vsynth1-vc2-thaar.out.rawvideo
+stddev:    1.88 PSNR: 42.61 MAXDIFF:   23 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-vc2-t5_3 b/tests/ref/vsynth/vsynth2-vc2-t5_3
new file mode 100644
index 0000000000..c4ac50d5a9
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-vc2-t5_3
@@ -0,0 +1,4 @@ 
+654f04ae4f5947f0d354025fee1f37e0 *tests/data/fate/vsynth2-vc2-t5_3.mov
+1335772 tests/data/fate/vsynth2-vc2-t5_3.mov
+8f629e5cea24cc804d6aeadceacf0b2a *tests/data/fate/vsynth2-vc2-t5_3.out.rawvideo
+stddev:    0.37 PSNR: 56.66 MAXDIFF:    7 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-vc2-thaar b/tests/ref/vsynth/vsynth2-vc2-thaar
new file mode 100644
index 0000000000..fe698173b2
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-vc2-thaar
@@ -0,0 +1,4 @@ 
+51b03663f4187f4eea11c5311669a2cc *tests/data/fate/vsynth2-vc2-thaar.mov
+1470300 tests/data/fate/vsynth2-vc2-thaar.mov
+8f629e5cea24cc804d6aeadceacf0b2a *tests/data/fate/vsynth2-vc2-thaar.out.rawvideo
+stddev:    0.37 PSNR: 56.66 MAXDIFF:    7 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-vc2-t5_3 b/tests/ref/vsynth/vsynth_lena-vc2-t5_3
new file mode 100644
index 0000000000..f5f865ea8b
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-vc2-t5_3
@@ -0,0 +1,4 @@ 
+c2ce9a70c523903620794af6bc4ea0d4 *tests/data/fate/vsynth_lena-vc2-t5_3.mov
+1305436 tests/data/fate/vsynth_lena-vc2-t5_3.mov
+e5ea17416bda234ae58f27dea27e8135 *tests/data/fate/vsynth_lena-vc2-t5_3.out.rawvideo
+stddev:    0.30 PSNR: 58.58 MAXDIFF:    5 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-vc2-thaar b/tests/ref/vsynth/vsynth_lena-vc2-thaar
new file mode 100644
index 0000000000..9c16bdfb93
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-vc2-thaar
@@ -0,0 +1,4 @@ 
+5f062ca6c56d14590507c4373ca942ab *tests/data/fate/vsynth_lena-vc2-thaar.mov
+1431772 tests/data/fate/vsynth_lena-vc2-thaar.mov
+e5ea17416bda234ae58f27dea27e8135 *tests/data/fate/vsynth_lena-vc2-thaar.out.rawvideo
+stddev:    0.30 PSNR: 58.58 MAXDIFF:    5 bytes:  7603200/   760320

[FFmpeg-devel,v2] fate: add more vc2 encoder tests

Commit Message

Comments

Patch