From abaeeb3ce08d49af4127fb14d63ae3ffb11073d8 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 7 Aug 2017 01:20:56 +0200 Subject: [PATCH] avcodec/dvenc: Change quantizer dead zone default to 7 This improves the quality and reduces the "blocking" in flat areas Signed-off-by: Michael Niedermayer --- libavcodec/dvenc.c | 2 +- tests/ref/lavf/dv_fmt | 12 ++++++------ tests/ref/vsynth/vsynth1-dv | 4 ++-- tests/ref/vsynth/vsynth1-dv-411 | 6 +++--- tests/ref/vsynth/vsynth1-dv-50 | 6 +++--- tests/ref/vsynth/vsynth2-dv | 6 +++--- tests/ref/vsynth/vsynth2-dv-411 | 6 +++--- tests/ref/vsynth/vsynth2-dv-50 | 6 +++--- tests/ref/vsynth/vsynth_lena-dv | 6 +++--- tests/ref/vsynth/vsynth_lena-dv-411 | 6 +++--- tests/ref/vsynth/vsynth_lena-dv-50 | 6 +++--- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index 8474498ee6..ce2fc75daa 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -756,7 +756,7 @@ FF_ENABLE_DEPRECATION_WARNINGS #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM #define OFFSET(x) offsetof(DVVideoContext, x) static const AVOption dv_options[] = { - { "quant_deadzone", "Quantizer dead zone", OFFSET(quant_deadzone), AV_OPT_TYPE_INT, { .i64 = 15 }, 0, 1024, VE }, + { "quant_deadzone", "Quantizer dead zone", OFFSET(quant_deadzone), AV_OPT_TYPE_INT, { .i64 = 7 }, 0, 1024, VE }, { NULL }, }; diff --git a/tests/ref/lavf/dv_fmt b/tests/ref/lavf/dv_fmt index dac43b68a1..0263202c8e 100644 --- a/tests/ref/lavf/dv_fmt +++ b/tests/ref/lavf/dv_fmt @@ -1,9 +1,9 @@ -5a622e1ae4fd16bec59cd514380d7882 *./tests/data/lavf/lavf.dv +7830f9c6716ceb6011f865f1e521b951 *./tests/data/lavf/lavf.dv 3600000 ./tests/data/lavf/lavf.dv -./tests/data/lavf/lavf.dv CRC=0x0a6edbd8 -155e8fd4ea1196edd56ae9ff09edcf85 *./tests/data/lavf/lavf.dv +./tests/data/lavf/lavf.dv CRC=0xd428d3ee +5569626370c7c72d40de2c4559e32856 *./tests/data/lavf/lavf.dv 3480000 ./tests/data/lavf/lavf.dv -./tests/data/lavf/lavf.dv CRC=0x3e5583fa -87d3b20f656235671383a7eaa2f66330 *./tests/data/lavf/lavf.dv +./tests/data/lavf/lavf.dv CRC=0xa0088163 +2fb332aab8f2ba9c33b1b2368194392a *./tests/data/lavf/lavf.dv 3600000 ./tests/data/lavf/lavf.dv -./tests/data/lavf/lavf.dv CRC=0xf3e6873c +./tests/data/lavf/lavf.dv CRC=0xbdaf7f52 diff --git a/tests/ref/vsynth/vsynth1-dv b/tests/ref/vsynth/vsynth1-dv index 6237b078c5..ea357b7723 100644 --- a/tests/ref/vsynth/vsynth1-dv +++ b/tests/ref/vsynth/vsynth1-dv @@ -1,4 +1,4 @@ -4d572f758b55a1756adf9f54132f3b9e *tests/data/fate/vsynth1-dv.dv +4246668d61439617101d051d7a995108 *tests/data/fate/vsynth1-dv.dv 7200000 tests/data/fate/vsynth1-dv.dv -1cda5a62c3a2f17cc7d5b4cddccf2524 *tests/data/fate/vsynth1-dv.out.rawvideo +d52e7a9eac459ade9561d0b89bba58e7 *tests/data/fate/vsynth1-dv.out.rawvideo stddev: 6.90 PSNR: 31.34 MAXDIFF: 76 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-dv-411 b/tests/ref/vsynth/vsynth1-dv-411 index 48e01a1403..ec88d67ece 100644 --- a/tests/ref/vsynth/vsynth1-dv-411 +++ b/tests/ref/vsynth/vsynth1-dv-411 @@ -1,4 +1,4 @@ -f179899efba432c6f01149c36c709092 *tests/data/fate/vsynth1-dv-411.dv +df067afe65f1712d9e8efa7117aab6ea *tests/data/fate/vsynth1-dv-411.dv 7200000 tests/data/fate/vsynth1-dv-411.dv -48904744fabbbc3421a762f615ef6456 *tests/data/fate/vsynth1-dv-411.out.rawvideo -stddev: 9.44 PSNR: 28.62 MAXDIFF: 84 bytes: 7603200/ 7603200 +ed493bad827dc903188fce8d3b597fcb *tests/data/fate/vsynth1-dv-411.out.rawvideo +stddev: 9.45 PSNR: 28.62 MAXDIFF: 84 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-dv-50 b/tests/ref/vsynth/vsynth1-dv-50 index d5da88d78c..4a2ff00110 100644 --- a/tests/ref/vsynth/vsynth1-dv-50 +++ b/tests/ref/vsynth/vsynth1-dv-50 @@ -1,4 +1,4 @@ -a193c5f92bf6e74c604e759d5f4f0f94 *tests/data/fate/vsynth1-dv-50.dv +adb1df1a65cecab225677003a5de9f28 *tests/data/fate/vsynth1-dv-50.dv 14400000 tests/data/fate/vsynth1-dv-50.dv -41c4df5f2d876fcd5245643b9ded6711 *tests/data/fate/vsynth1-dv-50.out.rawvideo -stddev: 1.72 PSNR: 43.38 MAXDIFF: 29 bytes: 7603200/ 7603200 +4ab1f5b7aad15fab9e3c1ea5b96da39b *tests/data/fate/vsynth1-dv-50.out.rawvideo +stddev: 1.72 PSNR: 43.37 MAXDIFF: 29 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-dv b/tests/ref/vsynth/vsynth2-dv index bb0602a70f..3127b56288 100644 --- a/tests/ref/vsynth/vsynth2-dv +++ b/tests/ref/vsynth/vsynth2-dv @@ -1,4 +1,4 @@ -9002a5769a7744a4b8d24b01787abc3b *tests/data/fate/vsynth2-dv.dv +6a059698f1f619312dd91504697cca98 *tests/data/fate/vsynth2-dv.dv 7200000 tests/data/fate/vsynth2-dv.dv -22a62dc9108c4a8b1a3c708e5d383748 *tests/data/fate/vsynth2-dv.out.rawvideo -stddev: 1.99 PSNR: 42.12 MAXDIFF: 38 bytes: 7603200/ 7603200 +528fd407b6d19f5fe3b3446a3080d148 *tests/data/fate/vsynth2-dv.out.rawvideo +stddev: 1.99 PSNR: 42.13 MAXDIFF: 38 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-dv-411 b/tests/ref/vsynth/vsynth2-dv-411 index bdda6367bc..3cee4de303 100644 --- a/tests/ref/vsynth/vsynth2-dv-411 +++ b/tests/ref/vsynth/vsynth2-dv-411 @@ -1,4 +1,4 @@ -701dac8c1d3fe69957eab7ba8d5ecb25 *tests/data/fate/vsynth2-dv-411.dv +a4afd3c595b4242fb5f1329c82a0b0c2 *tests/data/fate/vsynth2-dv-411.dv 7200000 tests/data/fate/vsynth2-dv-411.dv -bf821931bb81f4e92dc38f86d8187300 *tests/data/fate/vsynth2-dv-411.out.rawvideo -stddev: 3.48 PSNR: 37.28 MAXDIFF: 56 bytes: 7603200/ 7603200 +1ef9bd89b72a942c02571f32af03bb04 *tests/data/fate/vsynth2-dv-411.out.rawvideo +stddev: 3.48 PSNR: 37.29 MAXDIFF: 56 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-dv-50 b/tests/ref/vsynth/vsynth2-dv-50 index c21c525df4..707fd5c734 100644 --- a/tests/ref/vsynth/vsynth2-dv-50 +++ b/tests/ref/vsynth/vsynth2-dv-50 @@ -1,4 +1,4 @@ -9b9ebdf35911dad62203dfdf1f56754e *tests/data/fate/vsynth2-dv-50.dv +8774632954e780697c472d945c597daf *tests/data/fate/vsynth2-dv-50.dv 14400000 tests/data/fate/vsynth2-dv-50.dv -b4d324b2095bc919ad16891891d40b36 *tests/data/fate/vsynth2-dv-50.out.rawvideo -stddev: 0.88 PSNR: 49.20 MAXDIFF: 17 bytes: 7603200/ 7603200 +11167de05c205f974d462f91f56eb837 *tests/data/fate/vsynth2-dv-50.out.rawvideo +stddev: 0.86 PSNR: 49.43 MAXDIFF: 17 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-dv b/tests/ref/vsynth/vsynth_lena-dv index ad0549f6e6..a8041f36a5 100644 --- a/tests/ref/vsynth/vsynth_lena-dv +++ b/tests/ref/vsynth/vsynth_lena-dv @@ -1,4 +1,4 @@ -85b8d55b0b68bb3fc2e90babb580f9b7 *tests/data/fate/vsynth_lena-dv.dv +ab03241e988dcd5bd36a76b25372343f *tests/data/fate/vsynth_lena-dv.dv 7200000 tests/data/fate/vsynth_lena-dv.dv -7dac420637360b031ccae7c5a69c5e0c *tests/data/fate/vsynth_lena-dv.out.rawvideo -stddev: 1.70 PSNR: 43.47 MAXDIFF: 33 bytes: 7603200/ 7603200 +6e4b90be39ad408ddc1c0dc4ced40bf0 *tests/data/fate/vsynth_lena-dv.out.rawvideo +stddev: 1.69 PSNR: 43.54 MAXDIFF: 33 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-dv-411 b/tests/ref/vsynth/vsynth_lena-dv-411 index 736a35da56..164dd359b2 100644 --- a/tests/ref/vsynth/vsynth_lena-dv-411 +++ b/tests/ref/vsynth/vsynth_lena-dv-411 @@ -1,4 +1,4 @@ -e428508f400327aeb96969c08fb9e1b5 *tests/data/fate/vsynth_lena-dv-411.dv +1a7f091993eb6fe5b6f9d927ba60387d *tests/data/fate/vsynth_lena-dv-411.dv 7200000 tests/data/fate/vsynth_lena-dv-411.dv -713ed907fde448c603d6e9aee5efedd1 *tests/data/fate/vsynth_lena-dv-411.out.rawvideo -stddev: 2.89 PSNR: 38.91 MAXDIFF: 45 bytes: 7603200/ 7603200 +e5624f3d4de96e514ac9b96c2b4b447c *tests/data/fate/vsynth_lena-dv-411.out.rawvideo +stddev: 2.87 PSNR: 38.97 MAXDIFF: 45 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-dv-50 b/tests/ref/vsynth/vsynth_lena-dv-50 index adee628b67..2149fd553c 100644 --- a/tests/ref/vsynth/vsynth_lena-dv-50 +++ b/tests/ref/vsynth/vsynth_lena-dv-50 @@ -1,4 +1,4 @@ -0032a07167199e6f49e07fa7ed4d5f62 *tests/data/fate/vsynth_lena-dv-50.dv +c678b291e58a277725aa4557387efc58 *tests/data/fate/vsynth_lena-dv-50.dv 14400000 tests/data/fate/vsynth_lena-dv-50.dv -56c77e537291536b242857d1056de30c *tests/data/fate/vsynth_lena-dv-50.out.rawvideo -stddev: 0.82 PSNR: 49.82 MAXDIFF: 12 bytes: 7603200/ 7603200 +bda4f98f387f82986e521b78a9bc1eef *tests/data/fate/vsynth_lena-dv-50.out.rawvideo +stddev: 0.78 PSNR: 50.28 MAXDIFF: 12 bytes: 7603200/ 7603200