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.
Unified · Split
| @@ -234,10 +234,10 @@ FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg · 233 unmodified lines | ||
| 234 | 234 | fate-vsynth%-ljpeg: ENCOPTS = -strict -1 |
| 235 | 235 | |
| 236 | 236 | FATE_VCODEC_SCALE-$(call ENCDEC, MJPEG, AVI) += mjpeg mjpeg-422 mjpeg-444 mjpeg-trell mjpeg-huffman mjpeg-trell-huffman |
| 237 | −fate-vsynth%-mjpeg: ENCOPTS = -qscale 9 -pix_fmt yuvj420p | |
| 237 | +fate-vsynth%-mjpeg: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -huffman default -threads 5 -thread_type slice | |
| 238 | 238 | fate-vsynth%-mjpeg-422: ENCOPTS = -qscale 9 -pix_fmt yuvj422p |
| 239 | 239 | fate-vsynth%-mjpeg-444: ENCOPTS = -qscale 9 -pix_fmt yuvj444p |
| 240 | −fate-vsynth%-mjpeg-trell: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -trellis 1 | |
| 240 | +fate-vsynth%-mjpeg-trell: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -trellis 1 -huffman default | |
| 241 | 241 | fate-vsynth%-mjpeg-huffman: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -huffman optimal |
| 242 | 242 | fate-vsynth%-mjpeg-trell-huffman: ENCOPTS = -qscale 9 -pix_fmt yuvj420p -trellis 1 -huffman optimal |
| 243 | 243 | |
| @@ -1,46 +1,46 @@ | ||
| 1 | −ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 11224 | |
| 1 | +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 12162 | |
| 2 | 2 | ret: 0 st:-1 flags:0 ts:-1.000000 |
| 3 | −ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 11224 | |
| 3 | +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 12162 | |
| 4 | 4 | ret: 0 st:-1 flags:1 ts: 1.894167 |
| 5 | −ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos: 592510 size: 14069 | |
| 5 | +ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos: 630752 size: 14882 | |
| 6 | 6 | ret: 0 st: 0 flags:0 ts: 0.800000 |
| 7 | −ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: 232724 size: 12267 | |
| 7 | +ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: 248748 size: 13032 | |
| 8 | 8 | ret:-1 st: 0 flags:1 ts:-0.320000 |
| 9 | 9 | ret:-1 st:-1 flags:0 ts: 2.576668 |
| 10 | 10 | ret: 0 st:-1 flags:1 ts: 1.470835 |
| 11 | −ret: 0 st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos: 453244 size: 13732 | |
| 11 | +ret: 0 st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos: 483058 size: 14588 | |
| 12 | 12 | ret: 0 st: 0 flags:0 ts: 0.360000 |
| 13 | −ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 104162 size: 11211 | |
| 13 | +ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 111546 size: 11997 | |
| 14 | 14 | ret:-1 st: 0 flags:1 ts:-0.760000 |
| 15 | 15 | ret:-1 st:-1 flags:0 ts: 2.153336 |
| 16 | 16 | ret: 0 st:-1 flags:1 ts: 1.047503 |
| 17 | −ret: 0 st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos: 307478 size: 12725 | |
| 17 | +ret: 0 st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos: 328288 size: 13537 | |
| 18 | 18 | ret: 0 st: 0 flags:0 ts:-0.040000 |
| 19 | −ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 11224 | |
| 19 | +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 12162 | |
| 20 | 20 | ret: 0 st: 0 flags:1 ts: 2.840000 |
| 21 | −ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 620688 size: 14145 | |
| 21 | +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 660542 size: 14951 | |
| 22 | 22 | ret: 0 st:-1 flags:0 ts: 1.730004 |
| 23 | −ret: 0 st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos: 536394 size: 13965 | |
| 23 | +ret: 0 st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos: 571292 size: 14812 | |
| 24 | 24 | ret: 0 st:-1 flags:1 ts: 0.624171 |
| 25 | −ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: 184556 size: 11973 | |
| 25 | +ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: 197392 size: 12793 | |
| 26 | 26 | ret: 0 st: 0 flags:0 ts:-0.480000 |
| 27 | −ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 11224 | |
| 27 | +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 12162 | |
| 28 | 28 | ret: 0 st: 0 flags:1 ts: 2.400000 |
| 29 | −ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 620688 size: 14145 | |
| 29 | +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 660542 size: 14951 | |
| 30 | 30 | ret: 0 st:-1 flags:0 ts: 1.306672 |
| 31 | −ret: 0 st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos: 399054 size: 13347 | |
| 31 | +ret: 0 st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos: 425512 size: 14182 | |
| 32 | 32 | ret: 0 st:-1 flags:1 ts: 0.200839 |
| 33 | −ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 59930 size: 10980 | |
| 33 | +ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 64152 size: 11780 | |
| 34 | 34 | ret: 0 st: 0 flags:0 ts:-0.920000 |
| 35 | −ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 11224 | |
| 35 | +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5652 size: 12162 | |
| 36 | 36 | ret: 0 st: 0 flags:1 ts: 2.000000 |
| 37 | −ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 620688 size: 14145 | |
| 37 | +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 660542 size: 14951 | |
| 38 | 38 | ret: 0 st:-1 flags:0 ts: 0.883340 |
| 39 | −ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: 257278 size: 12415 | |
| 39 | +ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: 274872 size: 13185 | |
| 40 | 40 | ret:-1 st:-1 flags:1 ts:-0.222493 |
| 41 | 41 | ret:-1 st: 0 flags:0 ts: 2.680000 |
| 42 | 42 | ret: 0 st: 0 flags:1 ts: 1.560000 |
| 43 | −ret: 0 st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos: 480846 size: 13843 | |
| 43 | +ret: 0 st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos: 512354 size: 14672 | |
| 44 | 44 | ret: 0 st:-1 flags:0 ts: 0.460008 |
| 45 | −ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 137982 size: 11451 | |
| 45 | +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 147710 size: 12225 | |
| 46 | 46 | ret:-1 st:-1 flags:1 ts:-0.645825 |
| @@ -1,4 +1,4 @@ | ||
| 1 | −827f4da674de95b4227aadda8dbdaa77 *tests/data/fate/vsynth1-mjpeg.avi | |
| 2 | −1391436 tests/data/fate/vsynth1-mjpeg.avi | |
| 1 | +365e4d16bae64737ea1d3d338d2b127d *tests/data/fate/vsynth1-mjpeg.avi | |
| 2 | +1517996 tests/data/fate/vsynth1-mjpeg.avi | |
| 3 | 3 | f46e58458ea57495a494650f7153829d *tests/data/fate/vsynth1-mjpeg.out.rawvideo |
| 4 | 4 | stddev: 7.87 PSNR: 30.21 MAXDIFF: 63 bytes: 7603200/ 7603200 |
| @@ -1,4 +1,4 @@ | ||
| 1 | −e097a118dd37b3ab5607278d7b675ea3 *tests/data/fate/vsynth1-mjpeg-trell.avi | |
| 2 | −1361112 tests/data/fate/vsynth1-mjpeg-trell.avi | |
| 3 | −548de4f6098cbc3d8b65574bb93faf09 *tests/data/fate/vsynth1-mjpeg-trell.out.rawvideo | |
| 4 | −stddev: 7.67 PSNR: 30.42 MAXDIFF: 62 bytes: 7603200/ 7603200 | |
| 1 | +fb6d9cbf5bb08daa30c12cd05a1e08c5 *tests/data/fate/vsynth1-mjpeg-trell.avi | |
| 2 | +1454282 tests/data/fate/vsynth1-mjpeg-trell.avi | |
| 3 | +10cdf1199f1de6b9618e82a36f656860 *tests/data/fate/vsynth1-mjpeg-trell.out.rawvideo | |
| 4 | +stddev: 7.71 PSNR: 30.39 MAXDIFF: 63 bytes: 7603200/ 7603200 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −2a959ad89469d88894d03dc9ce83e8b9 *tests/data/fate/vsynth2-mjpeg.avi | |
| 2 | −792950 tests/data/fate/vsynth2-mjpeg.avi | |
| 1 | +5ded62861f470b66fc47bf56299626d3 *tests/data/fate/vsynth2-mjpeg.avi | |
| 2 | +832994 tests/data/fate/vsynth2-mjpeg.avi | |
| 3 | 3 | fe498d9edaa947e435e4f353c194ef3d *tests/data/fate/vsynth2-mjpeg.out.rawvideo |
| 4 | 4 | stddev: 4.87 PSNR: 34.37 MAXDIFF: 55 bytes: 7603200/ 7603200 |
| @@ -1,4 +1,4 @@ | ||
| 1 | −d6a09ff8a46c297934496d8089cdd2a2 *tests/data/fate/vsynth2-mjpeg-trell.avi | |
| 2 | −734896 tests/data/fate/vsynth2-mjpeg-trell.avi | |
| 3 | −8612dfee87e32268f6f533188a097785 *tests/data/fate/vsynth2-mjpeg-trell.out.rawvideo | |
| 4 | −stddev: 5.03 PSNR: 34.10 MAXDIFF: 67 bytes: 7603200/ 7603200 | |
| 1 | +8468487344bdb8dc067b9227db788c58 *tests/data/fate/vsynth2-mjpeg-trell.avi | |
| 2 | +765928 tests/data/fate/vsynth2-mjpeg-trell.avi | |
| 3 | +aae98b3de0ea17d057d8861f91d209ae *tests/data/fate/vsynth2-mjpeg-trell.out.rawvideo | |
| 4 | +stddev: 5.03 PSNR: 34.09 MAXDIFF: 67 bytes: 7603200/ 7603200 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −62a7732fcb9288a7223671b23ce06fa0 *tests/data/fate/vsynth3-mjpeg.avi | |
| 2 | −48170 tests/data/fate/vsynth3-mjpeg.avi | |
| 1 | +2d2e163b5c49f32354a54f09226a3b30 *tests/data/fate/vsynth3-mjpeg.avi | |
| 2 | +65324 tests/data/fate/vsynth3-mjpeg.avi | |
| 3 | 3 | a6daba607898eb6e1a172c2368084a67 *tests/data/fate/vsynth3-mjpeg.out.rawvideo |
| 4 | 4 | stddev: 8.61 PSNR: 29.43 MAXDIFF: 58 bytes: 86700/ 86700 |
| @@ -1,4 +1,4 @@ | ||
| 1 | −7cbc02d85a572b5ea871c014ce27ab4c *tests/data/fate/vsynth3-mjpeg-trell.avi | |
| 2 | −47834 tests/data/fate/vsynth3-mjpeg-trell.avi | |
| 3 | −07822517628b20d54621df666ea79af3 *tests/data/fate/vsynth3-mjpeg-trell.out.rawvideo | |
| 4 | −stddev: 8.27 PSNR: 29.78 MAXDIFF: 55 bytes: 86700/ 86700 | |
| 1 | +2c68c6bbbb8c78a779c123aaf78f0e23 *tests/data/fate/vsynth3-mjpeg-trell.avi | |
| 2 | +63996 tests/data/fate/vsynth3-mjpeg-trell.avi | |
| 3 | +dddf01bf0ef33be2492ba0eeb6262dd1 *tests/data/fate/vsynth3-mjpeg-trell.out.rawvideo | |
| 4 | +stddev: 8.27 PSNR: 29.77 MAXDIFF: 61 bytes: 86700/ 86700 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −d8b968d6ecaa83bb120eb0dd08c3f6df *tests/data/fate/vsynth_lena-mjpeg.avi | |
| 2 | −635642 tests/data/fate/vsynth_lena-mjpeg.avi | |
| 1 | +230b2e5002e7d2d3b23790fc4e057600 *tests/data/fate/vsynth_lena-mjpeg.avi | |
| 2 | +676302 tests/data/fate/vsynth_lena-mjpeg.avi | |
| 3 | 3 | 095f88a721813c2a1c34b26303c1139a *tests/data/fate/vsynth_lena-mjpeg.out.rawvideo |
| 4 | 4 | stddev: 4.33 PSNR: 35.40 MAXDIFF: 49 bytes: 7603200/ 7603200 |
| @@ -1,4 +1,4 @@ | ||
| 1 | −8217aef7ee16709b2c0591a9a28d9bb8 *tests/data/fate/vsynth_lena-mjpeg-trell.avi | |
| 2 | −582648 tests/data/fate/vsynth_lena-mjpeg-trell.avi | |
| 3 | −8c5c05e82a959ccc8b3c4ba8e4123bbe *tests/data/fate/vsynth_lena-mjpeg-trell.out.rawvideo | |
| 4 | −stddev: 4.51 PSNR: 35.04 MAXDIFF: 60 bytes: 7603200/ 7603200 | |
| 1 | +47bc34cf66d65e482e326512a7b8e17b *tests/data/fate/vsynth_lena-mjpeg-trell.avi | |
| 2 | +613778 tests/data/fate/vsynth_lena-mjpeg-trell.avi | |
| 3 | +d3eb3db7e2b74f2a16540c4c438cbb91 *tests/data/fate/vsynth_lena-mjpeg-trell.out.rawvideo | |
| 4 | +stddev: 4.51 PSNR: 35.03 MAXDIFF: 60 bytes: 7603200/ 7603200 | |