preset: Add Chromecast 1080p60 Surround preset and update some descriptions.

New Chromecast 3rd Generation supports 60 fps.

diff --git a/libhb/preset_builtin.h b/libhb/preset_builtin.h
index 0dee1f70ef416764734fd23dea782e593cc437ad..3c2d8ce887203b90a942f90feff82716fce26477 100644 (file)
--- a/libhb/preset_builtin.h
+++ b/libhb/preset_builtin.h
@@ -3183,7 +3183,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPad 5th and 6th Generation; iPad mini 2, 3, and 4; iPad Air 1st Generation and Air 2; iPad Pro 1st and 2nd Generation; Apple TV 4th Generation and later.\", \n"
+"                    \"PresetDescription\": \"H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPad 5th and 6th Generation; iPad mini 2, 3, and 4; iPad Air 1st Generation and Air 2; iPad Pro 1st, 2nd, and 3rd Generation; Apple TV 4th Generation and later.\", \n"
 "                    \"PresetName\": \"Apple 1080p60 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
@@ -3865,7 +3865,123 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast.\", \n"
+"                    \"PresetDescription\": \"H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast 3rd Generation.\", \n"
+"                    \"PresetName\": \"Chromecast 1080p60 Surround\", \n"
+"                    \"SubtitleAddCC\": false, \n"
+"                    \"SubtitleAddForeignAudioSearch\": true, \n"
+"                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
+"                    \"SubtitleBurnBDSub\": true, \n"
+"                    \"SubtitleBurnBehavior\": \"foreign\", \n"
+"                    \"SubtitleBurnDVDSub\": true, \n"
+"                    \"SubtitleLanguageList\": [], \n"
+"                    \"SubtitleTrackSelectionBehavior\": \"none\", \n"
+"                    \"Type\": 0, \n"
+"                    \"UsesPictureFilters\": true, \n"
+"                    \"UsesPictureSettings\": 1, \n"
+"                    \"VideoAvgBitrate\": 6000, \n"
+"                    \"VideoColorMatrixCode\": 0, \n"
+"                    \"VideoEncoder\": \"x264\", \n"
+"                    \"VideoFramerate\": \"60\", \n"
+"                    \"VideoFramerateMode\": \"pfr\", \n"
+"                    \"VideoGrayScale\": false, \n"
+"                    \"VideoLevel\": \"4.2\", \n"
+"                    \"VideoOptionExtra\": \"\", \n"
+"                    \"VideoPreset\": \"medium\", \n"
+"                    \"VideoProfile\": \"high\", \n"
+"                    \"VideoQSVAsyncDepth\": 4, \n"
+"                    \"VideoQSVDecode\": false, \n"
+"                    \"VideoQualitySlider\": 22.0, \n"
+"                    \"VideoQualityType\": 2, \n"
+"                    \"VideoScaler\": \"swscale\", \n"
+"                    \"VideoTune\": \"\", \n"
+"                    \"VideoTurboTwoPass\": false, \n"
+"                    \"VideoTwoPass\": true, \n"
+"                    \"x264Option\": \"\", \n"
+"                    \"x264UseAdvancedOptions\": false\n"
+"                }, \n"
+"                {\n"
+"                    \"AlignAVStart\": false, \n"
+"                    \"AudioCopyMask\": [\n"
+"                        \"copy:aac\", \n"
+"                        \"copy:ac3\"\n"
+"                    ], \n"
+"                    \"AudioEncoderFallback\": \"aac\", \n"
+"                    \"AudioLanguageList\": [], \n"
+"                    \"AudioList\": [\n"
+"                        {\n"
+"                            \"AudioBitrate\": 160, \n"
+"                            \"AudioCompressionLevel\": -1.0, \n"
+"                            \"AudioDitherMethod\": \"auto\", \n"
+"                            \"AudioEncoder\": \"aac\", \n"
+"                            \"AudioMixdown\": \"stereo\", \n"
+"                            \"AudioNormalizeMixLevel\": false, \n"
+"                            \"AudioSamplerate\": \"auto\", \n"
+"                            \"AudioTrackDRCSlider\": 0.0, \n"
+"                            \"AudioTrackGainSlider\": 0.0, \n"
+"                            \"AudioTrackQuality\": -1.0, \n"
+"                            \"AudioTrackQualityEnable\": false\n"
+"                        }, \n"
+"                        {\n"
+"                            \"AudioBitrate\": 640, \n"
+"                            \"AudioCompressionLevel\": -1.0, \n"
+"                            \"AudioDitherMethod\": \"auto\", \n"
+"                            \"AudioEncoder\": \"copy:ac3\", \n"
+"                            \"AudioMixdown\": \"none\", \n"
+"                            \"AudioNormalizeMixLevel\": false, \n"
+"                            \"AudioSamplerate\": \"auto\", \n"
+"                            \"AudioTrackDRCSlider\": 0.0, \n"
+"                            \"AudioTrackGainSlider\": 0.0, \n"
+"                            \"AudioTrackQuality\": -1.0, \n"
+"                            \"AudioTrackQualityEnable\": false\n"
+"                        }\n"
+"                    ], \n"
+"                    \"AudioSecondaryEncoderMode\": true, \n"
+"                    \"AudioTrackSelectionBehavior\": \"first\", \n"
+"                    \"ChapterMarkers\": true, \n"
+"                    \"ChildrenArray\": [], \n"
+"                    \"Default\": false, \n"
+"                    \"FileFormat\": \"mp4\", \n"
+"                    \"Folder\": false, \n"
+"                    \"FolderOpen\": false, \n"
+"                    \"InlineParameterSets\": false, \n"
+"                    \"Mp4HttpOptimize\": true, \n"
+"                    \"Mp4iPodCompatible\": false, \n"
+"                    \"PictureAutoCrop\": true, \n"
+"                    \"PictureBottomCrop\": 0, \n"
+"                    \"PictureCombDetectCustom\": \"\", \n"
+"                    \"PictureCombDetectPreset\": \"default\", \n"
+"                    \"PictureDARWidth\": 0, \n"
+"                    \"PictureDeblock\": 0, \n"
+"                    \"PictureDeblockCustom\": \"qp=0:mode=2\", \n"
+"                    \"PictureDeinterlaceCustom\": \"\", \n"
+"                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
+"                    \"PictureDeinterlacePreset\": \"default\", \n"
+"                    \"PictureDenoiseCustom\": \"\", \n"
+"                    \"PictureDenoiseFilter\": \"off\", \n"
+"                    \"PictureDenoisePreset\": \"light\", \n"
+"                    \"PictureDenoiseTune\": \"none\", \n"
+"                    \"PictureDetelecine\": \"off\", \n"
+"                    \"PictureDetelecineCustom\": \"\", \n"
+"                    \"PictureForceHeight\": 0, \n"
+"                    \"PictureForceWidth\": 0, \n"
+"                    \"PictureHeight\": 1080, \n"
+"                    \"PictureItuPAR\": false, \n"
+"                    \"PictureKeepRatio\": true, \n"
+"                    \"PictureLeftCrop\": 0, \n"
+"                    \"PictureLooseCrop\": false, \n"
+"                    \"PictureModulus\": 2, \n"
+"                    \"PicturePAR\": \"auto\", \n"
+"                    \"PicturePARHeight\": 720, \n"
+"                    \"PicturePARWidth\": 853, \n"
+"                    \"PictureRightCrop\": 0, \n"
+"                    \"PictureRotate\": \"angle=0:hflip=0\", \n"
+"                    \"PictureSharpenCustom\": \"\", \n"
+"                    \"PictureSharpenFilter\": \"off\", \n"
+"                    \"PictureSharpenPreset\": \"medium\", \n"
+"                    \"PictureSharpenTune\": \"none\", \n"
+"                    \"PictureTopCrop\": 0, \n"
+"                    \"PictureWidth\": 1920, \n"
+"                    \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast 1st, 2nd Generation and later.\", \n"
 "                    \"PresetName\": \"Chromecast 1080p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
@@ -3981,7 +4097,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 3840, \n"
-"                    \"PresetDescription\": \"H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) audio, in an MP4 container. Compatible with Amazon Fire TV 2nd Generation and later; Fire TV Cube.\", \n"
+"                    \"PresetDescription\": \"H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) audio, in an MP4 container. Compatible with Amazon Fire TV 2nd Generation and later; Fire TV Cube, Fire TV Stick 4K.\", \n"
 "                    \"PresetName\": \"Amazon Fire 2160p60 4K HEVC Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
@@ -8324,7 +8440,7 @@ const char hb_builtin_presets_json[] =
 "            \"x264Option\": \"\", \n"
 "            \"x264UseAdvancedOptions\": false\n"
 "        }, \n"
-"        \"VersionMajor\": 33, \n"
+"        \"VersionMajor\": 34, \n"
 "        \"VersionMicro\": 0, \n"
 "        \"VersionMinor\": 0\n"
 "    }\n"

diff --git a/preset/preset_builtin.json b/preset/preset_builtin.json
index afdcd9cdd7910c748f0acbb772758010ad561db3..3ed618ff1a6359e4c47ce7bf5b6aed0d7a3d3a17 100644 (file)
--- a/preset/preset_builtin.json
+++ b/preset/preset_builtin.json
@@ -3270,7 +3270,7 @@
                     "PictureHeight": 1080,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPad 5th and 6th Generation; iPad mini 2, 3, and 4; iPad Air 1st Generation and Air 2; iPad Pro 1st and 2nd Generation; Apple TV 4th Generation and later.",
+                    "PresetDescription": "H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPad 5th and 6th Generation; iPad mini 2, 3, and 4; iPad Air 1st Generation and Air 2; iPad Pro 1st, 2nd, and 3rd Generation; Apple TV 4th Generation and later.",
                     "PresetName": "Apple 1080p60 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
@@ -3970,7 +3970,126 @@
                     "PictureHeight": 1080,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast.",
+                    "PresetDescription": "H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast 3rd Generation.",
+                    "PresetName": "Chromecast 1080p60 Surround",
+                    "Type": 0,
+                    "UsesPictureFilters": true,
+                    "UsesPictureSettings": 1,
+                    "SubtitleAddCC": false,
+                    "SubtitleAddForeignAudioSearch": true,
+                    "SubtitleAddForeignAudioSubtitle": false,
+                    "SubtitleBurnBehavior": "foreign",
+                    "SubtitleBurnBDSub": true,
+                    "SubtitleBurnDVDSub": true,
+                    "SubtitleLanguageList": [
+                    ],
+                    "SubtitleTrackSelectionBehavior": "none",
+                    "VideoAvgBitrate": 6000,
+                    "VideoColorMatrixCode": 0,
+                    "VideoEncoder": "x264",
+                    "VideoFramerate": "60",
+                    "VideoFramerateMode": "pfr",
+                    "VideoGrayScale": false,
+                    "VideoScaler": "swscale",
+                    "VideoPreset": "medium",
+                    "VideoTune": "",
+                    "VideoProfile": "high",
+                    "VideoLevel": "4.2",
+                    "VideoOptionExtra": "",
+                    "VideoQualityType": 2,
+                    "VideoQualitySlider": 22.0,
+                    "VideoQSVDecode": false,
+                    "VideoQSVAsyncDepth": 4,
+                    "VideoTwoPass": true,
+                    "VideoTurboTwoPass": false,
+                    "x264Option": "",
+                    "x264UseAdvancedOptions": false
+                },
+                {
+                    "AlignAVStart": false,
+                    "AudioCopyMask": [
+                        "copy:aac",
+                        "copy:ac3"
+                    ],
+                    "AudioEncoderFallback": "aac",
+                    "AudioLanguageList": [
+                    ],
+                    "AudioList": [
+                        {
+                            "AudioBitrate": 160,
+                            "AudioCompressionLevel": -1.0,
+                            "AudioDitherMethod": "auto",
+                            "AudioEncoder": "aac",
+                            "AudioMixdown": "stereo",
+                            "AudioNormalizeMixLevel": false,
+                            "AudioSamplerate": "auto",
+                            "AudioTrackQualityEnable": false,
+                            "AudioTrackQuality": -1.0,
+                            "AudioTrackGainSlider": 0.0,
+                            "AudioTrackDRCSlider": 0.0
+                        },
+                        {
+                            "AudioBitrate": 640,
+                            "AudioCompressionLevel": -1.0,
+                            "AudioDitherMethod": "auto",
+                            "AudioEncoder": "copy:ac3",
+                            "AudioMixdown": "none",
+                            "AudioNormalizeMixLevel": false,
+                            "AudioSamplerate": "auto",
+                            "AudioTrackQualityEnable": false,
+                            "AudioTrackQuality": -1.0,
+                            "AudioTrackGainSlider": 0.0,
+                            "AudioTrackDRCSlider": 0.0
+                        }
+                    ],
+                    "AudioSecondaryEncoderMode": true,
+                    "AudioTrackSelectionBehavior": "first",
+                    "ChapterMarkers": true,
+                    "ChildrenArray": [
+                    ],
+                    "Default": false,
+                    "FileFormat": "mp4",
+                    "Folder": false,
+                    "FolderOpen": false,
+                    "InlineParameterSets": false,
+                    "Mp4HttpOptimize": true,
+                    "Mp4iPodCompatible": false,
+                    "PictureAutoCrop": true,
+                    "PictureBottomCrop": 0,
+                    "PictureLeftCrop": 0,
+                    "PictureRightCrop": 0,
+                    "PictureTopCrop": 0,
+                    "PictureDARWidth": 0,
+                    "PictureDeblock": 0,
+                    "PictureDeblockCustom": "qp=0:mode=2",
+                    "PictureCombDetectCustom": "",
+                    "PictureCombDetectPreset": "default",
+                    "PictureDeinterlaceCustom": "",
+                    "PictureDeinterlaceFilter": "decomb",
+                    "PictureDeinterlacePreset": "default",
+                    "PictureDenoiseCustom": "",
+                    "PictureDenoiseFilter": "off",
+                    "PictureDenoisePreset": "light",
+                    "PictureDenoiseTune": "none",
+                    "PictureSharpenCustom": "",
+                    "PictureSharpenFilter": "off",
+                    "PictureSharpenPreset": "medium",
+                    "PictureSharpenTune": "none",
+                    "PictureDetelecine": "off",
+                    "PictureDetelecineCustom": "",
+                    "PictureItuPAR": false,
+                    "PictureKeepRatio": true,
+                    "PictureLooseCrop": false,
+                    "PictureModulus": 2,
+                    "PicturePAR": "auto",
+                    "PicturePARWidth": 853,
+                    "PicturePARHeight": 720,
+                    "PictureRotate": "angle=0:hflip=0",
+                    "PictureWidth": 1920,
+                    "PictureHeight": 1080,
+                    "PictureForceHeight": 0,
+                    "PictureForceWidth": 0,
+                    "PresetDescription": "H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast 1st, 2nd Generation and later.",
                     "PresetName": "Chromecast 1080p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
@@ -4089,7 +4208,7 @@
                     "PictureHeight": 2160,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) audio, in an MP4 container. Compatible with Amazon Fire TV 2nd Generation and later; Fire TV Cube.",
+                    "PresetDescription": "H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) audio, in an MP4 container. Compatible with Amazon Fire TV 2nd Generation and later; Fire TV Cube, Fire TV Stick 4K.",
                     "PresetName": "Amazon Fire 2160p60 4K HEVC Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,

diff --git a/preset/preset_builtin.list b/preset/preset_builtin.list
index faf49aacba15957baced3f265bf139a30d667322..702d5a83c2105f810eb72f25e52d89d75791c1e6 100644 (file)
--- a/preset/preset_builtin.list
+++ b/preset/preset_builtin.list
@@ -1,6 +1,6 @@
 <resources>
     <section name="PresetTemplate">
-        <integer name="VersionMajor" value="33" />
+        <integer name="VersionMajor" value="34" />
         <integer name="VersionMinor" value="0" />
         <integer name="VersionMicro" value="0" />
         <json name="Preset" file="preset_template.json" />