From 0b77b3add30533034972e5c94daff819aebcef0d Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Tue, 2 Jul 2024 19:26:20 +0200 Subject: [PATCH 07/30] tests/fate/vcodec: Test using mpeg2-quantizers for MPEG-4 Signed-off-by: Andreas Rheinhardt --- tests/fate/vcodec.mak | 2 +- tests/ref/seek/vsynth_lena-mpeg4-rc | 40 +++++++++++++-------------- tests/ref/vsynth/vsynth1-mpeg4-rc | 8 +++--- tests/ref/vsynth/vsynth2-mpeg4-rc | 8 +++--- tests/ref/vsynth/vsynth3-mpeg4-rc | 8 +++--- tests/ref/vsynth/vsynth_lena-mpeg4-rc | 8 +++--- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index a91c0ec3e3..f009cc68c8 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -330,7 +330,7 @@ fate-vsynth%-mpeg4-qprd: ENCOPTS = -b 450k -bf 2 -trellis 1 \ -flags +mv4 -mpv_flags +qp_rd+mv0 \ -cmp 2 -subcmp 2 -mbd rd -fate-vsynth%-mpeg4-rc: ENCOPTS = -b 400k -bf 2 +fate-vsynth%-mpeg4-rc: ENCOPTS = -b 400k -bf 2 -mpeg_quant 1 fate-vsynth%-mpeg4-thread: ENCOPTS = -b 500k -flags +mv4+aic \ -data_partitioning 1 -trellis 1 \ diff --git a/tests/ref/seek/vsynth_lena-mpeg4-rc b/tests/ref/seek/vsynth_lena-mpeg4-rc index e1994af948..a10a3ca07c 100644 --- a/tests/ref/seek/vsynth_lena-mpeg4-rc +++ b/tests/ref/seek/vsynth_lena-mpeg4-rc @@ -1,46 +1,46 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5652 size: 15766 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5652 size: 15471 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5652 size: 15766 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5652 size: 15471 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 207954 size: 13826 +ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 200880 size: 15568 ret: 0 st: 0 flags:0 ts: 0.800000 -ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 153788 size: 13377 +ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 140756 size: 15473 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.360000 pts: NOPTS pos: 180950 size: 13326 +ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 171606 size: 15125 ret: 0 st: 0 flags:0 ts: 0.360000 -ret: 0 st: 0 flags:1 dts: 0.400000 pts: NOPTS pos: 94578 size: 32807 +ret: 0 st: 0 flags:1 dts: 0.400000 pts: NOPTS pos: 84442 size: 30467 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.880000 pts: NOPTS pos: 153788 size: 13377 +ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 140756 size: 15473 ret: 0 st: 0 flags:0 ts:-0.040000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5652 size: 15766 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5652 size: 15471 ret: 0 st: 0 flags:1 ts: 2.840000 -ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 207954 size: 13826 +ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 200880 size: 15568 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 207954 size: 13826 +ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 200880 size: 15568 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.400000 pts: NOPTS pos: 94578 size: 32807 +ret: 0 st: 0 flags:1 dts: 0.400000 pts: NOPTS pos: 84442 size: 30467 ret: 0 st: 0 flags:0 ts:-0.480000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5652 size: 15766 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5652 size: 15471 ret: 0 st: 0 flags:1 ts: 2.400000 -ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 207954 size: 13826 +ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 200880 size: 15568 ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 180950 size: 13326 +ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 171606 size: 15125 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5652 size: 15766 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5652 size: 15471 ret: 0 st: 0 flags:0 ts:-0.920000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5652 size: 15766 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 5652 size: 15471 ret: 0 st: 0 flags:1 ts: 2.000000 -ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 207954 size: 13826 +ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 200880 size: 15568 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 153788 size: 13377 +ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 140756 size: 15473 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.360000 pts: NOPTS pos: 180950 size: 13326 +ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 171606 size: 15125 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 153788 size: 13377 +ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 140756 size: 15473 ret:-1 st:-1 flags:1 ts:-0.645825 diff --git a/tests/ref/vsynth/vsynth1-mpeg4-rc b/tests/ref/vsynth/vsynth1-mpeg4-rc index 5b1d7ff1e3..6ffe5a6154 100644 --- a/tests/ref/vsynth/vsynth1-mpeg4-rc +++ b/tests/ref/vsynth/vsynth1-mpeg4-rc @@ -1,4 +1,4 @@ -91c127f2acc04f51e0e62bcf0752e064 *tests/data/fate/vsynth1-mpeg4-rc.avi -830498 tests/data/fate/vsynth1-mpeg4-rc.avi -9dcd9d022ae14fe1e4a53aa4865464c6 *tests/data/fate/vsynth1-mpeg4-rc.out.rawvideo -stddev: 10.24 PSNR: 27.92 MAXDIFF: 196 bytes: 7603200/ 7603200 +b245cb5212495d4a6148761cbf825a19 *tests/data/fate/vsynth1-mpeg4-rc.avi +709952 tests/data/fate/vsynth1-mpeg4-rc.avi +1a1c88d902d0a0a885150b0501d92fea *tests/data/fate/vsynth1-mpeg4-rc.out.rawvideo +stddev: 10.86 PSNR: 27.41 MAXDIFF: 180 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-mpeg4-rc b/tests/ref/vsynth/vsynth2-mpeg4-rc index ec7d7ba031..04af8ec633 100644 --- a/tests/ref/vsynth/vsynth2-mpeg4-rc +++ b/tests/ref/vsynth/vsynth2-mpeg4-rc @@ -1,4 +1,4 @@ -0cf3a444622becc5d56e9034b226cfe2 *tests/data/fate/vsynth2-mpeg4-rc.avi -254738 tests/data/fate/vsynth2-mpeg4-rc.avi -53ef615a87c8ae49c379242385315f61 *tests/data/fate/vsynth2-mpeg4-rc.out.rawvideo -stddev: 5.57 PSNR: 33.20 MAXDIFF: 116 bytes: 7603200/ 7603200 +e860da1c3a49ecd038b03cbfdd56a122 *tests/data/fate/vsynth2-mpeg4-rc.avi +242930 tests/data/fate/vsynth2-mpeg4-rc.avi +b73f3a93ae66bdc6b5e6222c3eb82a43 *tests/data/fate/vsynth2-mpeg4-rc.out.rawvideo +stddev: 5.37 PSNR: 33.52 MAXDIFF: 118 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth3-mpeg4-rc b/tests/ref/vsynth/vsynth3-mpeg4-rc index fae06773d4..5c7a9a8ebd 100644 --- a/tests/ref/vsynth/vsynth3-mpeg4-rc +++ b/tests/ref/vsynth/vsynth3-mpeg4-rc @@ -1,4 +1,4 @@ -5b51e8f91fecd621cd3aa5d687659fbc *tests/data/fate/vsynth3-mpeg4-rc.avi -81092 tests/data/fate/vsynth3-mpeg4-rc.avi -07ba5baf141a24561f7dba43645a3400 *tests/data/fate/vsynth3-mpeg4-rc.out.rawvideo -stddev: 2.62 PSNR: 39.74 MAXDIFF: 23 bytes: 86700/ 86700 +aea5b225d5f861c0cf48d21c58d78ec8 *tests/data/fate/vsynth3-mpeg4-rc.avi +71278 tests/data/fate/vsynth3-mpeg4-rc.avi +0c0726ce29ce31bf5184832ef352cf20 *tests/data/fate/vsynth3-mpeg4-rc.out.rawvideo +stddev: 3.07 PSNR: 38.37 MAXDIFF: 23 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth_lena-mpeg4-rc b/tests/ref/vsynth/vsynth_lena-mpeg4-rc index a21ddc87e3..236a0c38d3 100644 --- a/tests/ref/vsynth/vsynth_lena-mpeg4-rc +++ b/tests/ref/vsynth/vsynth_lena-mpeg4-rc @@ -1,4 +1,4 @@ -3ae5a2590bdd0e80a95bf374b06c553f *tests/data/fate/vsynth_lena-mpeg4-rc.avi -226314 tests/data/fate/vsynth_lena-mpeg4-rc.avi -27c8771df4154f2be317465a3d3cbd56 *tests/data/fate/vsynth_lena-mpeg4-rc.out.rawvideo -stddev: 4.23 PSNR: 35.60 MAXDIFF: 85 bytes: 7603200/ 7603200 +38a0ac3b7148feb92faf7cb7c2b5efcb *tests/data/fate/vsynth_lena-mpeg4-rc.avi +221168 tests/data/fate/vsynth_lena-mpeg4-rc.avi +3af47cc4a9cc11e9a2e7035b26fa967d *tests/data/fate/vsynth_lena-mpeg4-rc.out.rawvideo +stddev: 4.03 PSNR: 36.02 MAXDIFF: 71 bytes: 7603200/ 7603200 -- 2.45.2