preset: Use Main profile for Android 1080p30 and use fast combing detection for Very...

diff --git a/libhb/preset_builtin.h b/libhb/preset_builtin.h
index 3a097a227bf539743ca1564a675c51e7df1c51c0..3d2d864fcc5ca965c885e2ef3b386d47b462815a 100644 (file)
--- a/libhb/preset_builtin.h
+++ b/libhb/preset_builtin.h
@@ -37,7 +37,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureAutoCrop\": true, \n"
 "                    \"PictureBottomCrop\": 0, \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
-"                    \"PictureCombDetectPreset\": \"default\", \n"
+"                    \"PictureCombDetectPreset\": \"fast\", \n"
 "                    \"PictureDARWidth\": 0, \n"
 "                    \"PictureDeblock\": 0, \n"
 "                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
@@ -133,7 +133,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureAutoCrop\": true, \n"
 "                    \"PictureBottomCrop\": 0, \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
-"                    \"PictureCombDetectPreset\": \"default\", \n"
+"                    \"PictureCombDetectPreset\": \"fast\", \n"
 "                    \"PictureDARWidth\": 0, \n"
 "                    \"PictureDeblock\": 0, \n"
 "                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
@@ -229,7 +229,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureAutoCrop\": true, \n"
 "                    \"PictureBottomCrop\": 0, \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
-"                    \"PictureCombDetectPreset\": \"default\", \n"
+"                    \"PictureCombDetectPreset\": \"fast\", \n"
 "                    \"PictureDARWidth\": 0, \n"
 "                    \"PictureDeblock\": 0, \n"
 "                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
@@ -325,7 +325,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureAutoCrop\": true, \n"
 "                    \"PictureBottomCrop\": 0, \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
-"                    \"PictureCombDetectPreset\": \"default\", \n"
+"                    \"PictureCombDetectPreset\": \"fast\", \n"
 "                    \"PictureDARWidth\": 0, \n"
 "                    \"PictureDeblock\": 0, \n"
 "                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
@@ -1742,7 +1742,7 @@ const char hb_builtin_presets_json[] =
 "                    \"VideoLevel\": \"4.0\", \n"
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
-"                    \"VideoProfile\": \"high\", \n"
+"                    \"VideoProfile\": \"main\", \n"
 "                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 22.0, \n"
@@ -6831,7 +6831,7 @@ const char hb_builtin_presets_json[] =
 "            \"x264Option\": \"\", \n"
 "            \"x264UseAdvancedOptions\": false\n"
 "        }, \n"
-"        \"VersionMajor\": 18, \n"
+"        \"VersionMajor\": 19, \n"
 "        \"VersionMicro\": 0, \n"
 "        \"VersionMinor\": 0\n"
 "    }\n"

diff --git a/preset/preset_builtin.json b/preset/preset_builtin.json
index e3fc40ced727ae81929c8743e49bb7e00584eb8e..0feb9c1958c5d84778f860f38efd3dca13a9bd4e 100644 (file)
--- a/preset/preset_builtin.json
+++ b/preset/preset_builtin.json
@@ -43,7 +43,7 @@
                     "PictureDeblock": 0,
                     "PictureDeblockCustom": "qp=0:mode=2",
                     "PictureCombDetectCustom": "",
-                    "PictureCombDetectPreset": "default",
+                    "PictureCombDetectPreset": "fast",
                     "PictureDeinterlaceCustom": "",
                     "PictureDeinterlaceFilter": "decomb",
                     "PictureDeinterlacePreset": "default",
@@ -142,7 +142,7 @@
                     "PictureDeblock": 0,
                     "PictureDeblockCustom": "qp=0:mode=2",
                     "PictureCombDetectCustom": "",
-                    "PictureCombDetectPreset": "default",
+                    "PictureCombDetectPreset": "fast",
                     "PictureDeinterlaceCustom": "",
                     "PictureDeinterlaceFilter": "decomb",
                     "PictureDeinterlacePreset": "default",
@@ -241,7 +241,7 @@
                     "PictureDeblock": 0,
                     "PictureDeblockCustom": "qp=0:mode=2",
                     "PictureCombDetectCustom": "",
-                    "PictureCombDetectPreset": "default",
+                    "PictureCombDetectPreset": "fast",
                     "PictureDeinterlaceCustom": "",
                     "PictureDeinterlaceFilter": "decomb",
                     "PictureDeinterlacePreset": "default",
@@ -340,7 +340,7 @@
                     "PictureDeblock": 0,
                     "PictureDeblockCustom": "qp=0:mode=2",
                     "PictureCombDetectCustom": "",
-                    "PictureCombDetectPreset": "default",
+                    "PictureCombDetectPreset": "fast",
                     "PictureDeinterlaceCustom": "",
                     "PictureDeinterlaceFilter": "decomb",
                     "PictureDeinterlacePreset": "default",
@@ -1791,7 +1791,7 @@
                     "VideoScaler": "swscale",
                     "VideoPreset": "medium",
                     "VideoTune": "",
-                    "VideoProfile": "high",
+                    "VideoProfile": "main",
                     "VideoLevel": "4.0",
                     "VideoOptionExtra": "",
                     "VideoQualityType": 2,

diff --git a/preset/preset_builtin.list b/preset/preset_builtin.list
index b26b7aef58aed36820725106ec4f50560a858059..566cc383e17ebbb3bd48e0ade4b100251fe462d8 100644 (file)
--- a/preset/preset_builtin.list
+++ b/preset/preset_builtin.list
@@ -1,6 +1,6 @@
 <resources>
     <section name="PresetTemplate">
-        <integer name="VersionMajor" value="18" />
+        <integer name="VersionMajor" value="19" />
         <integer name="VersionMinor" value="0" />
         <integer name="VersionMicro" value="0" />
         <json name="Preset" file="preset_template.json" />