ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@outlook.com> |
Wed Apr 2 15:48:29 2025 +0200| [7ddcd55d51f5698d3c19334557ef88051fcff5b9] |
committer: Andreas Rheinhardt
tests/fate/vcodec: Test "default" Huffman tables, too
Since 45eeb1f785d6c726181568db341bbf80b43e32c0
optimal Huffman tables are the default (without slice-threading).
This made the fate-vsynth*-mjpeg-{trell-,}-huffman tests
identical to their corresponding tests without "-huffman".
This is of course wasteful, so switch the two tests with
"-huffman" counterparts back to the default tables.
Also use one of these tests to test slice threaded encoding.
It has so far been untested.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ddcd55d51f5698d3c19334557ef88051fcff5b9
---
tests/fate/vcodec.mak | 4 ++--
tests/ref/seek/vsynth_lena-mjpeg | 40 ++++++++++++++++----------------
tests/ref/vsynth/vsynth1-mjpeg | 4 ++--
tests/ref/vsynth/vsynth1-mjpeg-trell | 8 +++----
tests/ref/vsynth/vsynth2-mjpeg | 4 ++--
tests/ref/vsynth/vsynth2-mjpeg-trell | 8 +++----
tests/ref/vsynth/vsynth3-mjpeg | 4 ++--
tests/ref/vsynth/vsynth3-mjpeg-trell | 8 +++----
tests/ref/vsynth/vsynth_lena-mjpeg | 4 ++--
tests/ref/vsynth/vsynth_lena-mjpeg-trell | 8 +++----
10 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak
index f433feac69..09e241127c 100644
--- a/tests/fate/vcodec.mak
+++ b/tests/fate/vcodec.mak
@@ -234,10 +234,10 @@ FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg
fate-vsynth%-ljpeg: ENCOPTS = -strict -1
FATE_VCODEC_SCALE-$(call ENCDEC, MJPEG, AVI) += mjpeg mjpeg-422 mjpeg-444
mjpeg-trell mjpeg-huffman mjpeg-trell-huffman
-fate-vsynth%-mjpeg: ENCOPTS = -qscale 9 -pix_fmt yuvj420p
+fate-vsynth%-mjpeg: ENCOPTS = -qscale 9 -pix_fmt yuvj420p
-huffman default -threads 5 -thread_type slice
fate-vsynth%-mjpeg-422: ENCOPTS = -qscale 9 -pix_fmt yuvj422p
fate-vsynth%-mjpeg-444: ENCOPTS = -qscale 9 -pix_fmt yuvj444p
-fate-vsynth%-mjpeg-trell: ENCOPTS = -qscale 9 -pix_fmt yuvj420p
-trellis 1
+fate-vsynth%-mjpeg-trell: ENCOPTS = -qscale 9 -pix_fmt yuvj420p
-trellis 1 -huffman default
fate-vsynth%-mjpeg-huffman: ENCOPTS = -qscale 9 -pix_fmt yuvj420p
-huffman optimal
fate-vsynth%-mjpeg-trell-huffman: ENCOPTS = -qscale 9 -pix_fmt yuvj420p
-trellis 1 -huffman optimal
diff --git a/tests/ref/seek/vsynth_lena-mjpeg b/tests/ref/seek/vsynth_lena-mjpeg
index 41f0c615ea..5fb3ee6ee4 100644
--- a/tests/ref/seek/vsynth_lena-mjpeg
+++ b/tests/ref/seek/vsynth_lena-mjpeg
@@ -1,46 +1,46 @@
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size:
11224
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size:
12162
ret: 0 st:-1 flags:0 ts:-1.000000
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size:
11224
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size:
12162
ret: 0 st:-1 flags:1 ts: 1.894167
-ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos: 592510 size:
14069
+ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos: 630752 size:
14882
ret: 0 st: 0 flags:0 ts: 0.800000
-ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: 232724 size:
12267
+ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: 248748 size:
13032
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.480000 pts: 1.480000 pos: 453244 size:
13732
+ret: 0 st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos: 483058 size:
14588
ret: 0 st: 0 flags:0 ts: 0.360000
-ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 104162 size:
11211
+ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 111546 size:
11997
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: 1.040000 pts: 1.040000 pos: 307478 size:
12725
+ret: 0 st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos: 328288 size:
13537
ret: 0 st: 0 flags:0 ts:-0.040000
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size:
11224
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size:
12162
ret: 0 st: 0 flags:1 ts: 2.840000
-ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 620688 size:
14145
+ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 660542 size:
14951
ret: 0 st:-1 flags:0 ts: 1.730004
-ret: 0 st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos: 536394 size:
13965
+ret: 0 st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos: 571292 size:
14812
ret: 0 st:-1 flags:1 ts: 0.624171
-ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: 184556 size:
11973
+ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: 197392 size:
12793
ret: 0 st: 0 flags:0 ts:-0.480000
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size:
11224
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size:
12162
ret: 0 st: 0 flags:1 ts: 2.400000
-ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 620688 size:
14145
+ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 660542 size:
14951
ret: 0 st:-1 flags:0 ts: 1.306672
-ret: 0 st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos: 399054 size:
13347
+ret: 0 st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos: 425512 size:
14182
ret: 0 st:-1 flags:1 ts: 0.200839
-ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 59930 size:
10980
+ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 64152 size:
11780
ret: 0 st: 0 flags:0 ts:-0.920000
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size:
11224
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size:
12162
ret: 0 st: 0 flags:1 ts: 2.000000
-ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 620688 size:
14145
+ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 660542 size:
14951
ret: 0 st:-1 flags:0 ts: 0.883340
-ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: 257278 size:
12415
+ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: 274872 size:
13185
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.560000 pts: 1.560000 pos: 480846 size:
13843
+ret: 0 st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos: 512354 size:
14672
ret: 0 st:-1 flags:0 ts: 0.460008
-ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 137982 size:
11451
+ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 147710 size:
12225
ret:-1 st:-1 flags:1 ts:-0.645825
diff --git a/tests/ref/vsynth/vsynth1-mjpeg b/tests/ref/vsynth/vsynth1-mjpeg
index 89ed7dd9c0..fe63ca6c79 100644
--- a/tests/ref/vsynth/vsynth1-mjpeg
+++ b/tests/ref/vsynth/vsynth1-mjpeg
@@ -1,4 +1,4 @@
-827f4da674de95b4227aadda8dbdaa77 *tests/data/fate/vsynth1-mjpeg.avi
-1391436 tests/data/fate/vsynth1-mjpeg.avi
+365e4d16bae64737ea1d3d338d2b127d *tests/data/fate/vsynth1-mjpeg.avi
+1517996 tests/data/fate/vsynth1-mjpeg.avi
f46e58458ea57495a494650f7153829d *tests/data/fate/vsynth1-mjpeg.out.rawvideo
stddev: 7.87 PSNR: 30.21 MAXDIFF: 63 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth/vsynth1-mjpeg-trell
b/tests/ref/vsynth/vsynth1-mjpeg-trell
index e978c636de..19a6823864 100644
--- a/tests/ref/vsynth/vsynth1-mjpeg-trell
+++ b/tests/ref/vsynth/vsynth1-mjpeg-trell
@@ -1,4 +1,4 @@
-e097a118dd37b3ab5607278d7b675ea3 *tests/data/fate/vsynth1-mjpeg-trell.avi
-1361112 tests/data/fate/vsynth1-mjpeg-trell.avi
-548de4f6098cbc3d8b65574bb93faf09
*tests/data/fate/vsynth1-mjpeg-trell.out.rawvideo
-stddev: 7.67 PSNR: 30.42 MAXDIFF: 62 bytes: 7603200/ 7603200
+fb6d9cbf5bb08daa30c12cd05a1e08c5 *tests/data/fate/vsynth1-mjpeg-trell.avi
+1454282 tests/data/fate/vsynth1-mjpeg-trell.avi
+10cdf1199f1de6b9618e82a36f656860
*tests/data/fate/vsynth1-mjpeg-trell.out.rawvideo
+stddev: 7.71 PSNR: 30.39 MAXDIFF: 63 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth/vsynth2-mjpeg b/tests/ref/vsynth/vsynth2-mjpeg
index b3954bbb5f..8ba00ef52c 100644
--- a/tests/ref/vsynth/vsynth2-mjpeg
+++ b/tests/ref/vsynth/vsynth2-mjpeg
@@ -1,4 +1,4 @@
-2a959ad89469d88894d03dc9ce83e8b9 *tests/data/fate/vsynth2-mjpeg.avi
-792950 tests/data/fate/vsynth2-mjpeg.avi
+5ded62861f470b66fc47bf56299626d3 *tests/data/fate/vsynth2-mjpeg.avi
+832994 tests/data/fate/vsynth2-mjpeg.avi
fe498d9edaa947e435e4f353c194ef3d *tests/data/fate/vsynth2-mjpeg.out.rawvideo
stddev: 4.87 PSNR: 34.37 MAXDIFF: 55 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth/vsynth2-mjpeg-trell
b/tests/ref/vsynth/vsynth2-mjpeg-trell
index 993aaca60f..757cfb7ae8 100644
--- a/tests/ref/vsynth/vsynth2-mjpeg-trell
+++ b/tests/ref/vsynth/vsynth2-mjpeg-trell
@@ -1,4 +1,4 @@
-d6a09ff8a46c297934496d8089cdd2a2 *tests/data/fate/vsynth2-mjpeg-trell.avi
-734896 tests/data/fate/vsynth2-mjpeg-trell.avi
-8612dfee87e32268f6f533188a097785
*tests/data/fate/vsynth2-mjpeg-trell.out.rawvideo
-stddev: 5.03 PSNR: 34.10 MAXDIFF: 67 bytes: 7603200/ 7603200
+8468487344bdb8dc067b9227db788c58 *tests/data/fate/vsynth2-mjpeg-trell.avi
+765928 tests/data/fate/vsynth2-mjpeg-trell.avi
+aae98b3de0ea17d057d8861f91d209ae
*tests/data/fate/vsynth2-mjpeg-trell.out.rawvideo
+stddev: 5.03 PSNR: 34.09 MAXDIFF: 67 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth/vsynth3-mjpeg b/tests/ref/vsynth/vsynth3-mjpeg
index ebcbc784e5..6c209da39c 100644
--- a/tests/ref/vsynth/vsynth3-mjpeg
+++ b/tests/ref/vsynth/vsynth3-mjpeg
@@ -1,4 +1,4 @@
-62a7732fcb9288a7223671b23ce06fa0 *tests/data/fate/vsynth3-mjpeg.avi
-48170 tests/data/fate/vsynth3-mjpeg.avi
+2d2e163b5c49f32354a54f09226a3b30 *tests/data/fate/vsynth3-mjpeg.avi
+65324 tests/data/fate/vsynth3-mjpeg.avi
a6daba607898eb6e1a172c2368084a67 *tests/data/fate/vsynth3-mjpeg.out.rawvideo
stddev: 8.61 PSNR: 29.43 MAXDIFF: 58 bytes: 86700/ 86700
diff --git a/tests/ref/vsynth/vsynth3-mjpeg-trell
b/tests/ref/vsynth/vsynth3-mjpeg-trell
index 5bfa3e0e12..12fe120ca9 100644
--- a/tests/ref/vsynth/vsynth3-mjpeg-trell
+++ b/tests/ref/vsynth/vsynth3-mjpeg-trell
@@ -1,4 +1,4 @@
-7cbc02d85a572b5ea871c014ce27ab4c *tests/data/fate/vsynth3-mjpeg-trell.avi
-47834 tests/data/fate/vsynth3-mjpeg-trell.avi
-07822517628b20d54621df666ea79af3
*tests/data/fate/vsynth3-mjpeg-trell.out.rawvideo
-stddev: 8.27 PSNR: 29.78 MAXDIFF: 55 bytes: 86700/ 86700
+2c68c6bbbb8c78a779c123aaf78f0e23 *tests/data/fate/vsynth3-mjpeg-trell.avi
+63996 tests/data/fate/vsynth3-mjpeg-trell.avi
+dddf01bf0ef33be2492ba0eeb6262dd1
*tests/data/fate/vsynth3-mjpeg-trell.out.rawvideo
+stddev: 8.27 PSNR: 29.77 MAXDIFF: 61 bytes: 86700/ 86700
diff --git a/tests/ref/vsynth/vsynth_lena-mjpeg
b/tests/ref/vsynth/vsynth_lena-mjpeg
index f56928dd55..84e342d4e7 100644
--- a/tests/ref/vsynth/vsynth_lena-mjpeg
+++ b/tests/ref/vsynth/vsynth_lena-mjpeg
@@ -1,4 +1,4 @@
-d8b968d6ecaa83bb120eb0dd08c3f6df *tests/data/fate/vsynth_lena-mjpeg.avi
-635642 tests/data/fate/vsynth_lena-mjpeg.avi
+230b2e5002e7d2d3b23790fc4e057600 *tests/data/fate/vsynth_lena-mjpeg.avi
+676302 tests/data/fate/vsynth_lena-mjpeg.avi
095f88a721813c2a1c34b26303c1139a
*tests/data/fate/vsynth_lena-mjpeg.out.rawvideo
stddev: 4.33 PSNR: 35.40 MAXDIFF: 49 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mjpeg-trell
b/tests/ref/vsynth/vsynth_lena-mjpeg-trell
index ca7f1b1d03..aee9aa92b9 100644
--- a/tests/ref/vsynth/vsynth_lena-mjpeg-trell
+++ b/tests/ref/vsynth/vsynth_lena-mjpeg-trell
@@ -1,4 +1,4 @@
-8217aef7ee16709b2c0591a9a28d9bb8 *tests/data/fate/vsynth_lena-mjpeg-trell.avi
-582648 tests/data/fate/vsynth_lena-mjpeg-trell.avi
-8c5c05e82a959ccc8b3c4ba8e4123bbe
*tests/data/fate/vsynth_lena-mjpeg-trell.out.rawvideo
-stddev: 4.51 PSNR: 35.04 MAXDIFF: 60 bytes: 7603200/ 7603200
+47bc34cf66d65e482e326512a7b8e17b *tests/data/fate/vsynth_lena-mjpeg-trell.avi
+613778 tests/data/fate/vsynth_lena-mjpeg-trell.avi
+d3eb3db7e2b74f2a16540c4c438cbb91
*tests/data/fate/vsynth_lena-mjpeg-trell.out.rawvideo
+stddev: 4.51 PSNR: 35.03 MAXDIFF: 60 bytes: 7603200/ 7603200
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
