History

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.

Andreas Rheinhardt committed 1 year ago

Commit 7ddcd551 parent 31d568610 files · +46 −46Browse files

Unified · Split

10 files
  1. tests/fate/vcodec.mak +2 −2
  2. tests/ref/seek/vsynth_lena-mjpeg +20 −20
  3. tests/ref/vsynth/vsynth1-mjpeg +2 −2
  4. tests/ref/vsynth/vsynth1-mjpeg-trell +4 −4
  5. tests/ref/vsynth/vsynth2-mjpeg +2 −2
  6. tests/ref/vsynth/vsynth2-mjpeg-trell +4 −4
  7. tests/ref/vsynth/vsynth3-mjpeg +2 −2
  8. tests/ref/vsynth/vsynth3-mjpeg-trell +4 −4
  9. tests/ref/vsynth/vsynth_lena-mjpeg +2 −2
  10. tests/ref/vsynth/vsynth_lena-mjpeg-trell +4 −4
tests/fate/vcodec.mak+2−2
@@ -234,10 +234,10 @@ FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg · 233 unmodified lines
234fate-vsynth%-ljpeg: ENCOPTS = -strict -1234fate-vsynth%-ljpeg: ENCOPTS = -strict -1
235 235
236FATE_VCODEC_SCALE-$(call ENCDEC, MJPEG, AVI) += mjpeg mjpeg-422 mjpeg-444 mjpeg-trell mjpeg-huffman mjpeg-trell-huffman236FATE_VCODEC_SCALE-$(call ENCDEC, MJPEG, AVI) += mjpeg mjpeg-422 mjpeg-444 mjpeg-trell mjpeg-huffman mjpeg-trell-huffman
237fate-vsynth%-mjpeg: ENCOPTS = -qscale 9 -pix_fmt yuvj420p237fate-vsynth%-mjpeg: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -huffman default -threads 5 -thread_type slice
238fate-vsynth%-mjpeg-422: ENCOPTS = -qscale 9 -pix_fmt yuvj422p238fate-vsynth%-mjpeg-422: ENCOPTS = -qscale 9 -pix_fmt yuvj422p
239fate-vsynth%-mjpeg-444: ENCOPTS = -qscale 9 -pix_fmt yuvj444p239fate-vsynth%-mjpeg-444: ENCOPTS = -qscale 9 -pix_fmt yuvj444p
240fate-vsynth%-mjpeg-trell: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -trellis 1240fate-vsynth%-mjpeg-trell: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -trellis 1 -huffman default
241fate-vsynth%-mjpeg-huffman: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -huffman optimal241fate-vsynth%-mjpeg-huffman: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -huffman optimal
242fate-vsynth%-mjpeg-trell-huffman: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -trellis 1 -huffman optimal242fate-vsynth%-mjpeg-trell-huffman: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -trellis 1 -huffman optimal
243 243
tests/ref/seek/vsynth_lena-mjpeg+20−20
@@ -1,46 +1,46 @@
1ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 112241ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 12162
2ret: 0 st:-1 flags:0 ts:-1.0000002ret: 0 st:-1 flags:0 ts:-1.000000
3ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 112243ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 12162
4ret: 0 st:-1 flags:1 ts: 1.8941674ret: 0 st:-1 flags:1 ts: 1.894167
5ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos: 592510 size: 140695ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos: 630752 size: 14882
6ret: 0 st: 0 flags:0 ts: 0.8000006ret: 0 st: 0 flags:0 ts: 0.800000
7ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: 232724 size: 122677ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: 248748 size: 13032
8ret:-1 st: 0 flags:1 ts:-0.3200008ret:-1 st: 0 flags:1 ts:-0.320000
9ret:-1 st:-1 flags:0 ts: 2.5766689ret:-1 st:-1 flags:0 ts: 2.576668
10ret: 0 st:-1 flags:1 ts: 1.47083510ret: 0 st:-1 flags:1 ts: 1.470835
11ret: 0 st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos: 453244 size: 1373211ret: 0 st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos: 483058 size: 14588
12ret: 0 st: 0 flags:0 ts: 0.36000012ret: 0 st: 0 flags:0 ts: 0.360000
13ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 104162 size: 1121113ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 111546 size: 11997
14ret:-1 st: 0 flags:1 ts:-0.76000014ret:-1 st: 0 flags:1 ts:-0.760000
15ret:-1 st:-1 flags:0 ts: 2.15333615ret:-1 st:-1 flags:0 ts: 2.153336
16ret: 0 st:-1 flags:1 ts: 1.04750316ret: 0 st:-1 flags:1 ts: 1.047503
17ret: 0 st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos: 307478 size: 1272517ret: 0 st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos: 328288 size: 13537
18ret: 0 st: 0 flags:0 ts:-0.04000018ret: 0 st: 0 flags:0 ts:-0.040000
19ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 1122419ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 12162
20ret: 0 st: 0 flags:1 ts: 2.84000020ret: 0 st: 0 flags:1 ts: 2.840000
21ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 620688 size: 1414521ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 660542 size: 14951
22ret: 0 st:-1 flags:0 ts: 1.73000422ret: 0 st:-1 flags:0 ts: 1.730004
23ret: 0 st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos: 536394 size: 1396523ret: 0 st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos: 571292 size: 14812
24ret: 0 st:-1 flags:1 ts: 0.62417124ret: 0 st:-1 flags:1 ts: 0.624171
25ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: 184556 size: 1197325ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: 197392 size: 12793
26ret: 0 st: 0 flags:0 ts:-0.48000026ret: 0 st: 0 flags:0 ts:-0.480000
27ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 1122427ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 12162
28ret: 0 st: 0 flags:1 ts: 2.40000028ret: 0 st: 0 flags:1 ts: 2.400000
29ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 620688 size: 1414529ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 660542 size: 14951
30ret: 0 st:-1 flags:0 ts: 1.30667230ret: 0 st:-1 flags:0 ts: 1.306672
31ret: 0 st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos: 399054 size: 1334731ret: 0 st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos: 425512 size: 14182
32ret: 0 st:-1 flags:1 ts: 0.20083932ret: 0 st:-1 flags:1 ts: 0.200839
33ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 59930 size: 1098033ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 64152 size: 11780
34ret: 0 st: 0 flags:0 ts:-0.92000034ret: 0 st: 0 flags:0 ts:-0.920000
35ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 1122435ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 12162
36ret: 0 st: 0 flags:1 ts: 2.00000036ret: 0 st: 0 flags:1 ts: 2.000000
37ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 620688 size: 1414537ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 660542 size: 14951
38ret: 0 st:-1 flags:0 ts: 0.88334038ret: 0 st:-1 flags:0 ts: 0.883340
39ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: 257278 size: 1241539ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: 274872 size: 13185
40ret:-1 st:-1 flags:1 ts:-0.22249340ret:-1 st:-1 flags:1 ts:-0.222493
41ret:-1 st: 0 flags:0 ts: 2.68000041ret:-1 st: 0 flags:0 ts: 2.680000
42ret: 0 st: 0 flags:1 ts: 1.56000042ret: 0 st: 0 flags:1 ts: 1.560000
43ret: 0 st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos: 480846 size: 1384343ret: 0 st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos: 512354 size: 14672
44ret: 0 st:-1 flags:0 ts: 0.46000844ret: 0 st:-1 flags:0 ts: 0.460008
45ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 137982 size: 1145145ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 147710 size: 12225
46ret:-1 st:-1 flags:1 ts:-0.64582546ret:-1 st:-1 flags:1 ts:-0.645825
tests/ref/vsynth/vsynth1-mjpeg+2−2
@@ -1,4 +1,4 @@
1827f4da674de95b4227aadda8dbdaa77 *tests/data/fate/vsynth1-mjpeg.avi1365e4d16bae64737ea1d3d338d2b127d *tests/data/fate/vsynth1-mjpeg.avi
21391436 tests/data/fate/vsynth1-mjpeg.avi21517996 tests/data/fate/vsynth1-mjpeg.avi
3f46e58458ea57495a494650f7153829d *tests/data/fate/vsynth1-mjpeg.out.rawvideo3f46e58458ea57495a494650f7153829d *tests/data/fate/vsynth1-mjpeg.out.rawvideo
4stddev: 7.87 PSNR: 30.21 MAXDIFF: 63 bytes: 7603200/ 76032004stddev: 7.87 PSNR: 30.21 MAXDIFF: 63 bytes: 7603200/ 7603200
tests/ref/vsynth/vsynth1-mjpeg-trell+4−4
@@ -1,4 +1,4 @@
1e097a118dd37b3ab5607278d7b675ea3 *tests/data/fate/vsynth1-mjpeg-trell.avi1fb6d9cbf5bb08daa30c12cd05a1e08c5 *tests/data/fate/vsynth1-mjpeg-trell.avi
21361112 tests/data/fate/vsynth1-mjpeg-trell.avi21454282 tests/data/fate/vsynth1-mjpeg-trell.avi
3548de4f6098cbc3d8b65574bb93faf09 *tests/data/fate/vsynth1-mjpeg-trell.out.rawvideo310cdf1199f1de6b9618e82a36f656860 *tests/data/fate/vsynth1-mjpeg-trell.out.rawvideo
4stddev: 7.67 PSNR: 30.42 MAXDIFF: 62 bytes: 7603200/ 76032004stddev: 7.71 PSNR: 30.39 MAXDIFF: 63 bytes: 7603200/ 7603200
tests/ref/vsynth/vsynth2-mjpeg+2−2
@@ -1,4 +1,4 @@
12a959ad89469d88894d03dc9ce83e8b9 *tests/data/fate/vsynth2-mjpeg.avi15ded62861f470b66fc47bf56299626d3 *tests/data/fate/vsynth2-mjpeg.avi
2792950 tests/data/fate/vsynth2-mjpeg.avi2832994 tests/data/fate/vsynth2-mjpeg.avi
3fe498d9edaa947e435e4f353c194ef3d *tests/data/fate/vsynth2-mjpeg.out.rawvideo3fe498d9edaa947e435e4f353c194ef3d *tests/data/fate/vsynth2-mjpeg.out.rawvideo
4stddev: 4.87 PSNR: 34.37 MAXDIFF: 55 bytes: 7603200/ 76032004stddev: 4.87 PSNR: 34.37 MAXDIFF: 55 bytes: 7603200/ 7603200
tests/ref/vsynth/vsynth2-mjpeg-trell+4−4
@@ -1,4 +1,4 @@
1d6a09ff8a46c297934496d8089cdd2a2 *tests/data/fate/vsynth2-mjpeg-trell.avi18468487344bdb8dc067b9227db788c58 *tests/data/fate/vsynth2-mjpeg-trell.avi
2734896 tests/data/fate/vsynth2-mjpeg-trell.avi2765928 tests/data/fate/vsynth2-mjpeg-trell.avi
38612dfee87e32268f6f533188a097785 *tests/data/fate/vsynth2-mjpeg-trell.out.rawvideo3aae98b3de0ea17d057d8861f91d209ae *tests/data/fate/vsynth2-mjpeg-trell.out.rawvideo
4stddev: 5.03 PSNR: 34.10 MAXDIFF: 67 bytes: 7603200/ 76032004stddev: 5.03 PSNR: 34.09 MAXDIFF: 67 bytes: 7603200/ 7603200
tests/ref/vsynth/vsynth3-mjpeg+2−2
@@ -1,4 +1,4 @@
162a7732fcb9288a7223671b23ce06fa0 *tests/data/fate/vsynth3-mjpeg.avi12d2e163b5c49f32354a54f09226a3b30 *tests/data/fate/vsynth3-mjpeg.avi
248170 tests/data/fate/vsynth3-mjpeg.avi265324 tests/data/fate/vsynth3-mjpeg.avi
3a6daba607898eb6e1a172c2368084a67 *tests/data/fate/vsynth3-mjpeg.out.rawvideo3a6daba607898eb6e1a172c2368084a67 *tests/data/fate/vsynth3-mjpeg.out.rawvideo
4stddev: 8.61 PSNR: 29.43 MAXDIFF: 58 bytes: 86700/ 867004stddev: 8.61 PSNR: 29.43 MAXDIFF: 58 bytes: 86700/ 86700
tests/ref/vsynth/vsynth3-mjpeg-trell+4−4
@@ -1,4 +1,4 @@
17cbc02d85a572b5ea871c014ce27ab4c *tests/data/fate/vsynth3-mjpeg-trell.avi12c68c6bbbb8c78a779c123aaf78f0e23 *tests/data/fate/vsynth3-mjpeg-trell.avi
247834 tests/data/fate/vsynth3-mjpeg-trell.avi263996 tests/data/fate/vsynth3-mjpeg-trell.avi
307822517628b20d54621df666ea79af3 *tests/data/fate/vsynth3-mjpeg-trell.out.rawvideo3dddf01bf0ef33be2492ba0eeb6262dd1 *tests/data/fate/vsynth3-mjpeg-trell.out.rawvideo
4stddev: 8.27 PSNR: 29.78 MAXDIFF: 55 bytes: 86700/ 867004stddev: 8.27 PSNR: 29.77 MAXDIFF: 61 bytes: 86700/ 86700
tests/ref/vsynth/vsynth_lena-mjpeg+2−2
@@ -1,4 +1,4 @@
1d8b968d6ecaa83bb120eb0dd08c3f6df *tests/data/fate/vsynth_lena-mjpeg.avi1230b2e5002e7d2d3b23790fc4e057600 *tests/data/fate/vsynth_lena-mjpeg.avi
2635642 tests/data/fate/vsynth_lena-mjpeg.avi2676302 tests/data/fate/vsynth_lena-mjpeg.avi
3095f88a721813c2a1c34b26303c1139a *tests/data/fate/vsynth_lena-mjpeg.out.rawvideo3095f88a721813c2a1c34b26303c1139a *tests/data/fate/vsynth_lena-mjpeg.out.rawvideo
4stddev: 4.33 PSNR: 35.40 MAXDIFF: 49 bytes: 7603200/ 76032004stddev: 4.33 PSNR: 35.40 MAXDIFF: 49 bytes: 7603200/ 7603200
tests/ref/vsynth/vsynth_lena-mjpeg-trell+4−4
@@ -1,4 +1,4 @@
18217aef7ee16709b2c0591a9a28d9bb8 *tests/data/fate/vsynth_lena-mjpeg-trell.avi147bc34cf66d65e482e326512a7b8e17b *tests/data/fate/vsynth_lena-mjpeg-trell.avi
2582648 tests/data/fate/vsynth_lena-mjpeg-trell.avi2613778 tests/data/fate/vsynth_lena-mjpeg-trell.avi
38c5c05e82a959ccc8b3c4ba8e4123bbe *tests/data/fate/vsynth_lena-mjpeg-trell.out.rawvideo3d3eb3db7e2b74f2a16540c4c438cbb91 *tests/data/fate/vsynth_lena-mjpeg-trell.out.rawvideo
4stddev: 4.51 PSNR: 35.04 MAXDIFF: 60 bytes: 7603200/ 76032004stddev: 4.51 PSNR: 35.03 MAXDIFF: 60 bytes: 7603200/ 7603200

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t