preset: Replace Vorbis with Opus for VP9 MKV presets.

diff --git a/libhb/preset_builtin.h b/libhb/preset_builtin.h
index 864906134840b74c224bbb18e6f800e6fd836c38..0c7f79227af5626f7ead8bcc2f8f2fb85448137e 100644 (file)
--- a/libhb/preset_builtin.h
+++ b/libhb/preset_builtin.h
@@ -5495,14 +5495,14 @@ const char hb_builtin_presets_json[] =
 "                }, \n"
 "                {\n"
 "                    \"AudioCopyMask\": [], \n"
-"                    \"AudioEncoderFallback\": \"vorbis\", \n"
+"                    \"AudioEncoderFallback\": \"opus\", \n"
 "                    \"AudioLanguageList\": [], \n"
 "                    \"AudioList\": [\n"
 "                        {\n"
 "                            \"AudioBitrate\": 160, \n"
 "                            \"AudioCompressionLevel\": -1.0, \n"
 "                            \"AudioDitherMethod\": \"auto\", \n"
-"                            \"AudioEncoder\": \"vorbis\", \n"
+"                            \"AudioEncoder\": \"opus\", \n"
 "                            \"AudioMixdown\": \"dpl2\", \n"
 "                            \"AudioNormalizeMixLevel\": false, \n"
 "                            \"AudioSamplerate\": \"auto\", \n"
@@ -5553,7 +5553,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureRotate\": \"angle=0:hflip=0\", \n"
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
-"                    \"PresetDescription\": \"VP9 video (up to 1080p30) and Vorbis stereo audio, in an MKV container.\", \n"
+"                    \"PresetDescription\": \"VP9 video (up to 1080p30) and Opus stereo audio, in an MKV container.\", \n"
 "                    \"PresetName\": \"VP9 MKV 1080p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
@@ -5589,14 +5589,14 @@ const char hb_builtin_presets_json[] =
 "                }, \n"
 "                {\n"
 "                    \"AudioCopyMask\": [], \n"
-"                    \"AudioEncoderFallback\": \"vorbis\", \n"
+"                    \"AudioEncoderFallback\": \"opus\", \n"
 "                    \"AudioLanguageList\": [], \n"
 "                    \"AudioList\": [\n"
 "                        {\n"
 "                            \"AudioBitrate\": 160, \n"
 "                            \"AudioCompressionLevel\": -1.0, \n"
 "                            \"AudioDitherMethod\": \"auto\", \n"
-"                            \"AudioEncoder\": \"vorbis\", \n"
+"                            \"AudioEncoder\": \"opus\", \n"
 "                            \"AudioMixdown\": \"dpl2\", \n"
 "                            \"AudioNormalizeMixLevel\": false, \n"
 "                            \"AudioSamplerate\": \"auto\", \n"
@@ -5647,7 +5647,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureRotate\": \"angle=0:hflip=0\", \n"
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1280, \n"
-"                    \"PresetDescription\": \"VP9 video (up to 720p30) and Vorbis stereo audio, in an MKV container.\", \n"
+"                    \"PresetDescription\": \"VP9 video (up to 720p30) and Opus stereo audio, in an MKV container.\", \n"
 "                    \"PresetName\": \"VP9 MKV 720p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
@@ -5683,14 +5683,14 @@ const char hb_builtin_presets_json[] =
 "                }, \n"
 "                {\n"
 "                    \"AudioCopyMask\": [], \n"
-"                    \"AudioEncoderFallback\": \"vorbis\", \n"
+"                    \"AudioEncoderFallback\": \"opus\", \n"
 "                    \"AudioLanguageList\": [], \n"
 "                    \"AudioList\": [\n"
 "                        {\n"
 "                            \"AudioBitrate\": 160, \n"
 "                            \"AudioCompressionLevel\": -1.0, \n"
 "                            \"AudioDitherMethod\": \"auto\", \n"
-"                            \"AudioEncoder\": \"vorbis\", \n"
+"                            \"AudioEncoder\": \"opus\", \n"
 "                            \"AudioMixdown\": \"dpl2\", \n"
 "                            \"AudioNormalizeMixLevel\": false, \n"
 "                            \"AudioSamplerate\": \"auto\", \n"
@@ -5741,7 +5741,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureRotate\": \"angle=0:hflip=0\", \n"
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
-"                    \"PresetDescription\": \"VP9 video (up to 576p25) and Vorbis stereo audio, in an MKV container.\", \n"
+"                    \"PresetDescription\": \"VP9 video (up to 576p25) and Opus stereo audio, in an MKV container.\", \n"
 "                    \"PresetName\": \"VP9 MKV 576p25\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
@@ -5777,14 +5777,14 @@ const char hb_builtin_presets_json[] =
 "                }, \n"
 "                {\n"
 "                    \"AudioCopyMask\": [], \n"
-"                    \"AudioEncoderFallback\": \"vorbis\", \n"
+"                    \"AudioEncoderFallback\": \"opus\", \n"
 "                    \"AudioLanguageList\": [], \n"
 "                    \"AudioList\": [\n"
 "                        {\n"
 "                            \"AudioBitrate\": 160, \n"
 "                            \"AudioCompressionLevel\": -1.0, \n"
 "                            \"AudioDitherMethod\": \"auto\", \n"
-"                            \"AudioEncoder\": \"vorbis\", \n"
+"                            \"AudioEncoder\": \"opus\", \n"
 "                            \"AudioMixdown\": \"dpl2\", \n"
 "                            \"AudioNormalizeMixLevel\": false, \n"
 "                            \"AudioSamplerate\": \"auto\", \n"
@@ -5835,7 +5835,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureRotate\": \"angle=0:hflip=0\", \n"
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 720, \n"
-"                    \"PresetDescription\": \"VP9 video (up to 480p30) and Vorbis stereo audio, in an MKV container.\", \n"
+"                    \"PresetDescription\": \"VP9 video (up to 480p30) and Opus stereo audio, in an MKV container.\", \n"
 "                    \"PresetName\": \"VP9 MKV 480p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
@@ -6838,7 +6838,7 @@ const char hb_builtin_presets_json[] =
 "            \"x264Option\": \"\", \n"
 "            \"x264UseAdvancedOptions\": false\n"
 "        }, \n"
-"        \"VersionMajor\": 19, \n"
+"        \"VersionMajor\": 20, \n"
 "        \"VersionMicro\": 0, \n"
 "        \"VersionMinor\": 0\n"
 "    }\n"

diff --git a/preset/preset_builtin.json b/preset/preset_builtin.json
index 0feb9c1958c5d84778f860f38efd3dca13a9bd4e..2a29b4fd715cd92f379ba118681aeae5bc1361fb 100644 (file)
--- a/preset/preset_builtin.json
+++ b/preset/preset_builtin.json
@@ -5660,7 +5660,7 @@
                 {
                     "AudioCopyMask": [
                     ],
-                    "AudioEncoderFallback": "vorbis",
+                    "AudioEncoderFallback": "opus",
                     "AudioLanguageList": [
                     ],
                     "AudioList": [
@@ -5668,7 +5668,7 @@
                             "AudioBitrate": 160,
                             "AudioCompressionLevel": -1.0,
                             "AudioDitherMethod": "auto",
-                            "AudioEncoder": "vorbis",
+                            "AudioEncoder": "opus",
                             "AudioMixdown": "dpl2",
                             "AudioNormalizeMixLevel": false,
                             "AudioSamplerate": "auto",
@@ -5720,7 +5720,7 @@
                     "PictureHeight": 1080,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "VP9 video (up to 1080p30) and Vorbis stereo audio, in an MKV container.",
+                    "PresetDescription": "VP9 video (up to 1080p30) and Opus stereo audio, in an MKV container.",
                     "PresetName": "VP9 MKV 1080p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
@@ -5758,7 +5758,7 @@
                 {
                     "AudioCopyMask": [
                     ],
-                    "AudioEncoderFallback": "vorbis",
+                    "AudioEncoderFallback": "opus",
                     "AudioLanguageList": [
                     ],
                     "AudioList": [
@@ -5766,7 +5766,7 @@
                             "AudioBitrate": 160,
                             "AudioCompressionLevel": -1.0,
                             "AudioDitherMethod": "auto",
-                            "AudioEncoder": "vorbis",
+                            "AudioEncoder": "opus",
                             "AudioMixdown": "dpl2",
                             "AudioNormalizeMixLevel": false,
                             "AudioSamplerate": "auto",
@@ -5818,7 +5818,7 @@
                     "PictureHeight": 720,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "VP9 video (up to 720p30) and Vorbis stereo audio, in an MKV container.",
+                    "PresetDescription": "VP9 video (up to 720p30) and Opus stereo audio, in an MKV container.",
                     "PresetName": "VP9 MKV 720p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
@@ -5856,7 +5856,7 @@
                 {
                     "AudioCopyMask": [
                     ],
-                    "AudioEncoderFallback": "vorbis",
+                    "AudioEncoderFallback": "opus",
                     "AudioLanguageList": [
                     ],
                     "AudioList": [
@@ -5864,7 +5864,7 @@
                             "AudioBitrate": 160,
                             "AudioCompressionLevel": -1.0,
                             "AudioDitherMethod": "auto",
-                            "AudioEncoder": "vorbis",
+                            "AudioEncoder": "opus",
                             "AudioMixdown": "dpl2",
                             "AudioNormalizeMixLevel": false,
                             "AudioSamplerate": "auto",
@@ -5916,7 +5916,7 @@
                     "PictureHeight": 576,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "VP9 video (up to 576p25) and Vorbis stereo audio, in an MKV container.",
+                    "PresetDescription": "VP9 video (up to 576p25) and Opus stereo audio, in an MKV container.",
                     "PresetName": "VP9 MKV 576p25",
                     "Type": 0,
                     "UsesPictureFilters": true,
@@ -5954,7 +5954,7 @@
                 {
                     "AudioCopyMask": [
                     ],
-                    "AudioEncoderFallback": "vorbis",
+                    "AudioEncoderFallback": "opus",
                     "AudioLanguageList": [
                     ],
                     "AudioList": [
@@ -5962,7 +5962,7 @@
                             "AudioBitrate": 160,
                             "AudioCompressionLevel": -1.0,
                             "AudioDitherMethod": "auto",
-                            "AudioEncoder": "vorbis",
+                            "AudioEncoder": "opus",
                             "AudioMixdown": "dpl2",
                             "AudioNormalizeMixLevel": false,
                             "AudioSamplerate": "auto",
@@ -6014,7 +6014,7 @@
                     "PictureHeight": 480,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "VP9 video (up to 480p30) and Vorbis stereo audio, in an MKV container.",
+                    "PresetDescription": "VP9 video (up to 480p30) and Opus stereo audio, in an MKV container.",
                     "PresetName": "VP9 MKV 480p30",
                     "Type": 0,
                     "UsesPictureFilters": true,

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