Message ID | GV1P250MB07375159DB6AEC93CE0E3D298F589@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
---|---|
State | Accepted |
Commit | 406c7fceeb9b0cfb82e6a8fd7e12c3e7aeb4bdeb |
Headers | show |
Series | [FFmpeg-devel,1/6] fate/vcodec: Add speedhq tests | expand |
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
Andreas Rheinhardt: > The vsynth3 tests are disabled, because the encoder produces garbage. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > tests/fate/vcodec.mak | 9 ++++++++- > tests/ref/vsynth/vsynth1-speedhq-420p | 4 ++++ > tests/ref/vsynth/vsynth1-speedhq-422p | 4 ++++ > tests/ref/vsynth/vsynth1-speedhq-444p | 4 ++++ > tests/ref/vsynth/vsynth2-speedhq-420p | 4 ++++ > tests/ref/vsynth/vsynth2-speedhq-422p | 4 ++++ > tests/ref/vsynth/vsynth2-speedhq-444p | 4 ++++ > tests/ref/vsynth/vsynth_lena-speedhq-420p | 4 ++++ > tests/ref/vsynth/vsynth_lena-speedhq-422p | 4 ++++ > tests/ref/vsynth/vsynth_lena-speedhq-444p | 4 ++++ > 10 files changed, 44 insertions(+), 1 deletion(-) > create mode 100644 tests/ref/vsynth/vsynth1-speedhq-420p > create mode 100644 tests/ref/vsynth/vsynth1-speedhq-422p > create mode 100644 tests/ref/vsynth/vsynth1-speedhq-444p > create mode 100644 tests/ref/vsynth/vsynth2-speedhq-420p > create mode 100644 tests/ref/vsynth/vsynth2-speedhq-422p > create mode 100644 tests/ref/vsynth/vsynth2-speedhq-444p > create mode 100644 tests/ref/vsynth/vsynth_lena-speedhq-420p > create mode 100644 tests/ref/vsynth/vsynth_lena-speedhq-422p > create mode 100644 tests/ref/vsynth/vsynth_lena-speedhq-444p > > diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak > index 8ca17950ea..1a47fc8bf6 100644 > --- a/tests/fate/vcodec.mak > +++ b/tests/fate/vcodec.mak > @@ -413,6 +413,12 @@ FATE_VCODEC-$(call ENCDEC, SNOW, AVI) += snow-ll > fate-vsynth%-snow-ll: ENCOPTS = -qscale .001 -pred 1 \ > -flags +mv4+qpel > > +FATE_VCODEC-$(call ENCDEC, SPEEDHQ, AVI) += speedhq-420p > +FATE_VCODEC_SCALE-$(call ENCDEC, SPEEDHQ, AVI) += speedhq-422p speedhq-444p > +fate-vsynth%-speedhq-420p: ENCOPTS = -pix_fmt yuv420p -b 600k > +fate-vsynth%-speedhq-422p: ENCOPTS = -pix_fmt yuv422p -noise_reduction 1000 > +fate-vsynth%-speedhq-444p: ENCOPTS = -pix_fmt yuv444p > + > FATE_VCODEC_SCALE-$(call ENCDEC, SVQ1, MOV) += svq1 > fate-vsynth%-svq1: ENCOPTS = -qscale 3 -pix_fmt yuv410p > fate-vsynth%-svq1: FMT = mov > @@ -466,7 +472,8 @@ RESIZE_OFF = dnxhd-720p dnxhd-720p-rd dnxhd-720p-10bit dnxhd-1080i \ > 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 > + roqvideo rv10 rv20 speedhq-420p speedhq-422p speedhq-444p \ > + y41p qtrlegray > VSYNTH3_OFF = $(RESIZE_OFF) $(INC_PAR_OFF) > > FATE_VCODEC3 = $(filter-out $(VSYNTH3_OFF),$(FATE_VCODEC)) > diff --git a/tests/ref/vsynth/vsynth1-speedhq-420p b/tests/ref/vsynth/vsynth1-speedhq-420p > new file mode 100644 > index 0000000000..cd44ef662b > --- /dev/null > +++ b/tests/ref/vsynth/vsynth1-speedhq-420p > @@ -0,0 +1,4 @@ > +f905e05eabc8be20438d416722c34ed7 *tests/data/fate/vsynth1-speedhq-420p.avi > +919156 tests/data/fate/vsynth1-speedhq-420p.avi > +31e9b07d5e8ce0c8b7749e53fba05b1c *tests/data/fate/vsynth1-speedhq-420p.out.rawvideo > +stddev: 14.06 PSNR: 25.17 MAXDIFF: 145 bytes: 7603200/ 7603200 > diff --git a/tests/ref/vsynth/vsynth1-speedhq-422p b/tests/ref/vsynth/vsynth1-speedhq-422p > new file mode 100644 > index 0000000000..adb7aa389f > --- /dev/null > +++ b/tests/ref/vsynth/vsynth1-speedhq-422p > @@ -0,0 +1,4 @@ > +8f094b75b93b641c214bfaf743e584ad *tests/data/fate/vsynth1-speedhq-422p.avi > +1028244 tests/data/fate/vsynth1-speedhq-422p.avi > +967315914486c7ea979e4ce9ada04a6c *tests/data/fate/vsynth1-speedhq-422p.out.rawvideo > +stddev: 13.86 PSNR: 25.29 MAXDIFF: 148 bytes: 7603200/ 7603200 > diff --git a/tests/ref/vsynth/vsynth1-speedhq-444p b/tests/ref/vsynth/vsynth1-speedhq-444p > new file mode 100644 > index 0000000000..8c7abca7f2 > --- /dev/null > +++ b/tests/ref/vsynth/vsynth1-speedhq-444p > @@ -0,0 +1,4 @@ > +5008149f0dd3d05d05f8f0f9100d39ec *tests/data/fate/vsynth1-speedhq-444p.avi > +1347864 tests/data/fate/vsynth1-speedhq-444p.avi > +23c5db6ca2bdbc52e402cd72ad2fff27 *tests/data/fate/vsynth1-speedhq-444p.out.rawvideo > +stddev: 12.84 PSNR: 25.95 MAXDIFF: 145 bytes: 7603200/ 7603200 > diff --git a/tests/ref/vsynth/vsynth2-speedhq-420p b/tests/ref/vsynth/vsynth2-speedhq-420p > new file mode 100644 > index 0000000000..6f7d4a2a2e > --- /dev/null > +++ b/tests/ref/vsynth/vsynth2-speedhq-420p > @@ -0,0 +1,4 @@ > +41795a070c6a13727cd1de7c65abd121 *tests/data/fate/vsynth2-speedhq-420p.avi > +570618 tests/data/fate/vsynth2-speedhq-420p.avi > +9f76f7f523a1b1efa99e55ebc874b58d *tests/data/fate/vsynth2-speedhq-420p.out.rawvideo > +stddev: 8.67 PSNR: 29.37 MAXDIFF: 142 bytes: 7603200/ 7603200 > diff --git a/tests/ref/vsynth/vsynth2-speedhq-422p b/tests/ref/vsynth/vsynth2-speedhq-422p > new file mode 100644 > index 0000000000..551047b6ba > --- /dev/null > +++ b/tests/ref/vsynth/vsynth2-speedhq-422p > @@ -0,0 +1,4 @@ > +36bfdfdaecbf2938358137a598841377 *tests/data/fate/vsynth2-speedhq-422p.avi > +622790 tests/data/fate/vsynth2-speedhq-422p.avi > +3858c3c1524385150b2cff31cdb72e09 *tests/data/fate/vsynth2-speedhq-422p.out.rawvideo > +stddev: 8.62 PSNR: 29.42 MAXDIFF: 142 bytes: 7603200/ 7603200 > diff --git a/tests/ref/vsynth/vsynth2-speedhq-444p b/tests/ref/vsynth/vsynth2-speedhq-444p > new file mode 100644 > index 0000000000..0730ee93db > --- /dev/null > +++ b/tests/ref/vsynth/vsynth2-speedhq-444p > @@ -0,0 +1,4 @@ > +62e4caac219e2d79d0c7a8b34b66d4ae *tests/data/fate/vsynth2-speedhq-444p.avi > +813586 tests/data/fate/vsynth2-speedhq-444p.avi > +c3fe2a70c17979dbf08100aba9c05934 *tests/data/fate/vsynth2-speedhq-444p.out.rawvideo > +stddev: 8.35 PSNR: 29.69 MAXDIFF: 142 bytes: 7603200/ 7603200 > diff --git a/tests/ref/vsynth/vsynth_lena-speedhq-420p b/tests/ref/vsynth/vsynth_lena-speedhq-420p > new file mode 100644 > index 0000000000..c00b091b28 > --- /dev/null > +++ b/tests/ref/vsynth/vsynth_lena-speedhq-420p > @@ -0,0 +1,4 @@ > +0669a27deca78e92b998aa5b616f87f2 *tests/data/fate/vsynth_lena-speedhq-420p.avi > +487888 tests/data/fate/vsynth_lena-speedhq-420p.avi > +4dc98e7ffb7c1ade85cf6bed75ee9a68 *tests/data/fate/vsynth_lena-speedhq-420p.out.rawvideo > +stddev: 7.48 PSNR: 30.64 MAXDIFF: 125 bytes: 7603200/ 7603200 > diff --git a/tests/ref/vsynth/vsynth_lena-speedhq-422p b/tests/ref/vsynth/vsynth_lena-speedhq-422p > new file mode 100644 > index 0000000000..5ea8b40011 > --- /dev/null > +++ b/tests/ref/vsynth/vsynth_lena-speedhq-422p > @@ -0,0 +1,4 @@ > +40a9b249daf3cf5ab3fc99a874907c20 *tests/data/fate/vsynth_lena-speedhq-422p.avi > +536206 tests/data/fate/vsynth_lena-speedhq-422p.avi > +d48a61d173005609e5e06b0027c98a0e *tests/data/fate/vsynth_lena-speedhq-422p.out.rawvideo > +stddev: 7.48 PSNR: 30.65 MAXDIFF: 138 bytes: 7603200/ 7603200 > diff --git a/tests/ref/vsynth/vsynth_lena-speedhq-444p b/tests/ref/vsynth/vsynth_lena-speedhq-444p > new file mode 100644 > index 0000000000..0772d0982f > --- /dev/null > +++ b/tests/ref/vsynth/vsynth_lena-speedhq-444p > @@ -0,0 +1,4 @@ > +ce099dfae05cd224ef94c89476176a1c *tests/data/fate/vsynth_lena-speedhq-444p.avi > +702980 tests/data/fate/vsynth_lena-speedhq-444p.avi > +e2661cb41d9f59cd1a62b49b3a058e74 *tests/data/fate/vsynth_lena-speedhq-444p.out.rawvideo > +stddev: 7.23 PSNR: 30.94 MAXDIFF: 125 bytes: 7603200/ 7603200 Will apply this patchset tomorrow unless there are objections. - Andreas
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 8ca17950ea..1a47fc8bf6 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -413,6 +413,12 @@ FATE_VCODEC-$(call ENCDEC, SNOW, AVI) += snow-ll fate-vsynth%-snow-ll: ENCOPTS = -qscale .001 -pred 1 \ -flags +mv4+qpel +FATE_VCODEC-$(call ENCDEC, SPEEDHQ, AVI) += speedhq-420p +FATE_VCODEC_SCALE-$(call ENCDEC, SPEEDHQ, AVI) += speedhq-422p speedhq-444p +fate-vsynth%-speedhq-420p: ENCOPTS = -pix_fmt yuv420p -b 600k +fate-vsynth%-speedhq-422p: ENCOPTS = -pix_fmt yuv422p -noise_reduction 1000 +fate-vsynth%-speedhq-444p: ENCOPTS = -pix_fmt yuv444p + FATE_VCODEC_SCALE-$(call ENCDEC, SVQ1, MOV) += svq1 fate-vsynth%-svq1: ENCOPTS = -qscale 3 -pix_fmt yuv410p fate-vsynth%-svq1: FMT = mov @@ -466,7 +472,8 @@ RESIZE_OFF = dnxhd-720p dnxhd-720p-rd dnxhd-720p-10bit dnxhd-1080i \ 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 + roqvideo rv10 rv20 speedhq-420p speedhq-422p speedhq-444p \ + y41p qtrlegray VSYNTH3_OFF = $(RESIZE_OFF) $(INC_PAR_OFF) FATE_VCODEC3 = $(filter-out $(VSYNTH3_OFF),$(FATE_VCODEC)) diff --git a/tests/ref/vsynth/vsynth1-speedhq-420p b/tests/ref/vsynth/vsynth1-speedhq-420p new file mode 100644 index 0000000000..cd44ef662b --- /dev/null +++ b/tests/ref/vsynth/vsynth1-speedhq-420p @@ -0,0 +1,4 @@ +f905e05eabc8be20438d416722c34ed7 *tests/data/fate/vsynth1-speedhq-420p.avi +919156 tests/data/fate/vsynth1-speedhq-420p.avi +31e9b07d5e8ce0c8b7749e53fba05b1c *tests/data/fate/vsynth1-speedhq-420p.out.rawvideo +stddev: 14.06 PSNR: 25.17 MAXDIFF: 145 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-speedhq-422p b/tests/ref/vsynth/vsynth1-speedhq-422p new file mode 100644 index 0000000000..adb7aa389f --- /dev/null +++ b/tests/ref/vsynth/vsynth1-speedhq-422p @@ -0,0 +1,4 @@ +8f094b75b93b641c214bfaf743e584ad *tests/data/fate/vsynth1-speedhq-422p.avi +1028244 tests/data/fate/vsynth1-speedhq-422p.avi +967315914486c7ea979e4ce9ada04a6c *tests/data/fate/vsynth1-speedhq-422p.out.rawvideo +stddev: 13.86 PSNR: 25.29 MAXDIFF: 148 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-speedhq-444p b/tests/ref/vsynth/vsynth1-speedhq-444p new file mode 100644 index 0000000000..8c7abca7f2 --- /dev/null +++ b/tests/ref/vsynth/vsynth1-speedhq-444p @@ -0,0 +1,4 @@ +5008149f0dd3d05d05f8f0f9100d39ec *tests/data/fate/vsynth1-speedhq-444p.avi +1347864 tests/data/fate/vsynth1-speedhq-444p.avi +23c5db6ca2bdbc52e402cd72ad2fff27 *tests/data/fate/vsynth1-speedhq-444p.out.rawvideo +stddev: 12.84 PSNR: 25.95 MAXDIFF: 145 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-speedhq-420p b/tests/ref/vsynth/vsynth2-speedhq-420p new file mode 100644 index 0000000000..6f7d4a2a2e --- /dev/null +++ b/tests/ref/vsynth/vsynth2-speedhq-420p @@ -0,0 +1,4 @@ +41795a070c6a13727cd1de7c65abd121 *tests/data/fate/vsynth2-speedhq-420p.avi +570618 tests/data/fate/vsynth2-speedhq-420p.avi +9f76f7f523a1b1efa99e55ebc874b58d *tests/data/fate/vsynth2-speedhq-420p.out.rawvideo +stddev: 8.67 PSNR: 29.37 MAXDIFF: 142 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-speedhq-422p b/tests/ref/vsynth/vsynth2-speedhq-422p new file mode 100644 index 0000000000..551047b6ba --- /dev/null +++ b/tests/ref/vsynth/vsynth2-speedhq-422p @@ -0,0 +1,4 @@ +36bfdfdaecbf2938358137a598841377 *tests/data/fate/vsynth2-speedhq-422p.avi +622790 tests/data/fate/vsynth2-speedhq-422p.avi +3858c3c1524385150b2cff31cdb72e09 *tests/data/fate/vsynth2-speedhq-422p.out.rawvideo +stddev: 8.62 PSNR: 29.42 MAXDIFF: 142 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-speedhq-444p b/tests/ref/vsynth/vsynth2-speedhq-444p new file mode 100644 index 0000000000..0730ee93db --- /dev/null +++ b/tests/ref/vsynth/vsynth2-speedhq-444p @@ -0,0 +1,4 @@ +62e4caac219e2d79d0c7a8b34b66d4ae *tests/data/fate/vsynth2-speedhq-444p.avi +813586 tests/data/fate/vsynth2-speedhq-444p.avi +c3fe2a70c17979dbf08100aba9c05934 *tests/data/fate/vsynth2-speedhq-444p.out.rawvideo +stddev: 8.35 PSNR: 29.69 MAXDIFF: 142 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-speedhq-420p b/tests/ref/vsynth/vsynth_lena-speedhq-420p new file mode 100644 index 0000000000..c00b091b28 --- /dev/null +++ b/tests/ref/vsynth/vsynth_lena-speedhq-420p @@ -0,0 +1,4 @@ +0669a27deca78e92b998aa5b616f87f2 *tests/data/fate/vsynth_lena-speedhq-420p.avi +487888 tests/data/fate/vsynth_lena-speedhq-420p.avi +4dc98e7ffb7c1ade85cf6bed75ee9a68 *tests/data/fate/vsynth_lena-speedhq-420p.out.rawvideo +stddev: 7.48 PSNR: 30.64 MAXDIFF: 125 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-speedhq-422p b/tests/ref/vsynth/vsynth_lena-speedhq-422p new file mode 100644 index 0000000000..5ea8b40011 --- /dev/null +++ b/tests/ref/vsynth/vsynth_lena-speedhq-422p @@ -0,0 +1,4 @@ +40a9b249daf3cf5ab3fc99a874907c20 *tests/data/fate/vsynth_lena-speedhq-422p.avi +536206 tests/data/fate/vsynth_lena-speedhq-422p.avi +d48a61d173005609e5e06b0027c98a0e *tests/data/fate/vsynth_lena-speedhq-422p.out.rawvideo +stddev: 7.48 PSNR: 30.65 MAXDIFF: 138 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-speedhq-444p b/tests/ref/vsynth/vsynth_lena-speedhq-444p new file mode 100644 index 0000000000..0772d0982f --- /dev/null +++ b/tests/ref/vsynth/vsynth_lena-speedhq-444p @@ -0,0 +1,4 @@ +ce099dfae05cd224ef94c89476176a1c *tests/data/fate/vsynth_lena-speedhq-444p.avi +702980 tests/data/fate/vsynth_lena-speedhq-444p.avi +e2661cb41d9f59cd1a62b49b3a058e74 *tests/data/fate/vsynth_lena-speedhq-444p.out.rawvideo +stddev: 7.23 PSNR: 30.94 MAXDIFF: 125 bytes: 7603200/ 7603200
The vsynth3 tests are disabled, because the encoder produces garbage. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- tests/fate/vcodec.mak | 9 ++++++++- tests/ref/vsynth/vsynth1-speedhq-420p | 4 ++++ tests/ref/vsynth/vsynth1-speedhq-422p | 4 ++++ tests/ref/vsynth/vsynth1-speedhq-444p | 4 ++++ tests/ref/vsynth/vsynth2-speedhq-420p | 4 ++++ tests/ref/vsynth/vsynth2-speedhq-422p | 4 ++++ tests/ref/vsynth/vsynth2-speedhq-444p | 4 ++++ tests/ref/vsynth/vsynth_lena-speedhq-420p | 4 ++++ tests/ref/vsynth/vsynth_lena-speedhq-422p | 4 ++++ tests/ref/vsynth/vsynth_lena-speedhq-444p | 4 ++++ 10 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 tests/ref/vsynth/vsynth1-speedhq-420p create mode 100644 tests/ref/vsynth/vsynth1-speedhq-422p create mode 100644 tests/ref/vsynth/vsynth1-speedhq-444p create mode 100644 tests/ref/vsynth/vsynth2-speedhq-420p create mode 100644 tests/ref/vsynth/vsynth2-speedhq-422p create mode 100644 tests/ref/vsynth/vsynth2-speedhq-444p create mode 100644 tests/ref/vsynth/vsynth_lena-speedhq-420p create mode 100644 tests/ref/vsynth/vsynth_lena-speedhq-422p create mode 100644 tests/ref/vsynth/vsynth_lena-speedhq-444p