deblock: replace pp7 with avfilter vf_deblock

Adds deblock presets and tunes.
Old preset values are converted upon preset import.
Old PictureDeblock preset key is now PictureDeblockPreset.

1 files changed, 238 insertions, 159 deletions

diff --git a/libhb/preset_builtin.h b/libhb/preset_builtin.h
index da0fc7c87..7b0de1f6f 100644
--- a/libhb/preset_builtin.h
+++ b/libhb/preset_builtin.h
@@ -44,8 +44,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"fast\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -149,8 +150,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"fast\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -254,8 +256,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"fast\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -359,8 +362,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"fast\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -464,8 +468,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -569,8 +574,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -674,8 +680,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -779,8 +786,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -898,8 +906,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -1017,8 +1026,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -1136,8 +1146,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -1255,8 +1266,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -1374,8 +1386,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -1493,8 +1506,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -1612,8 +1626,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -1731,8 +1746,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -1843,8 +1859,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -1948,8 +1965,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -2053,8 +2071,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -2158,8 +2177,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -2263,8 +2283,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -2368,8 +2389,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -2473,8 +2495,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -2578,8 +2601,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -2690,8 +2714,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -2795,8 +2820,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -2900,8 +2926,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -3005,8 +3032,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -3124,8 +3152,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -3243,8 +3272,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -3362,8 +3392,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -3481,8 +3512,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -3600,8 +3632,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -3705,8 +3738,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -3824,8 +3858,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -3943,8 +3978,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -4062,8 +4098,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -4181,8 +4218,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -4300,8 +4338,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -4405,8 +4444,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -4524,8 +4564,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -4629,8 +4670,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -4734,8 +4776,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -4856,8 +4899,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -4975,8 +5019,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -5094,8 +5139,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -5199,8 +5245,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -5304,8 +5351,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -5409,8 +5457,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -5514,8 +5563,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -5619,8 +5669,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -5724,8 +5775,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -5843,8 +5895,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -5962,8 +6015,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -6074,8 +6128,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -6179,8 +6234,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -6284,8 +6340,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -6389,8 +6446,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -6494,8 +6552,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -6599,8 +6658,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -6704,8 +6764,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -6809,8 +6870,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -6914,8 +6976,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -7019,8 +7082,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -7122,8 +7186,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -7225,8 +7290,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -7328,8 +7394,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -7431,8 +7498,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -7534,8 +7602,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -7637,8 +7706,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -7740,8 +7810,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -7843,8 +7914,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -7946,8 +8018,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -8058,8 +8131,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"off\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"off\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -8163,8 +8237,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"off\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"off\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -8268,8 +8343,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"off\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"off\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -8373,8 +8449,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"off\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"off\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -8492,8 +8569,9 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"off\", \n"
 "                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblock\": 0, \n"
-"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
 "                    \"PictureDeinterlaceCustom\": \"\", \n"
 "                    \"PictureDeinterlaceFilter\": \"off\", \n"
 "                    \"PictureDeinterlacePreset\": \"default\", \n"
@@ -8613,8 +8691,9 @@ const char hb_builtin_presets_json[] =
 "            \"PictureCombDetectCustom\": \"\", \n"
 "            \"PictureCombDetectPreset\": \"off\", \n"
 "            \"PictureDARWidth\": 0, \n"
-"            \"PictureDeblock\": 0, \n"
-"            \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"            \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"            \"PictureDeblockPreset\": \"off\", \n"
+"            \"PictureDeblockTune\": \"medium\", \n"
 "            \"PictureDeinterlaceCustom\": \"\", \n"
 "            \"PictureDeinterlaceFilter\": \"off\", \n"
 "            \"PictureDeinterlacePreset\": \"default\", \n"
@@ -8677,7 +8756,7 @@ const char hb_builtin_presets_json[] =
 "            \"x264Option\": \"\", \n"
 "            \"x264UseAdvancedOptions\": false\n"
 "        }, \n"
-"        \"VersionMajor\": 35, \n"
+"        \"VersionMajor\": 36, \n"
 "        \"VersionMicro\": 0, \n"
 "        \"VersionMinor\": 0\n"
 "    }\n"