preset: Add Playstation 2160p60 Surround for PS4 Pro.

Reference: https://manuals.playstation.net/document/gb/ps4/music/mp_format_m.html

3 files changed, 243 insertions, 2 deletions

diff --git a/libhb/preset_builtin.h b/libhb/preset_builtin.h
index 7b0de1f6f..294dfb556 100644
--- a/libhb/preset_builtin.h
+++ b/libhb/preset_builtin.h
@@ -4578,6 +4578,126 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureDetelecineCustom\": \"\", \n"
 "                    \"PictureForceHeight\": 0, \n"
 "                    \"PictureForceWidth\": 0, \n"
+"                    \"PictureHeight\": 2160, \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\": 3840, \n"
+"                    \"PresetDescription\": \"H.264 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Playstation 4 Pro.\", \n"
+"                    \"PresetName\": \"Playstation 2160p60 4K 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\": 12000, \n"
+"                    \"VideoColorMatrixCodeOverride\": 0, \n"
+"                    \"VideoEncoder\": \"x264\", \n"
+"                    \"VideoFramerate\": \"60\", \n"
+"                    \"VideoFramerateMode\": \"pfr\", \n"
+"                    \"VideoGrayScale\": false, \n"
+"                    \"VideoLevel\": \"5.2\", \n"
+"                    \"VideoOptionExtra\": \"\", \n"
+"                    \"VideoPreset\": \"medium\", \n"
+"                    \"VideoProfile\": \"main\", \n"
+"                    \"VideoQSVAsyncDepth\": 4, \n"
+"                    \"VideoQSVDecode\": false, \n"
+"                    \"VideoQualitySlider\": 24.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\": false, \n"
+"                    \"Mp4iPodCompatible\": false, \n"
+"                    \"PictureAutoCrop\": true, \n"
+"                    \"PictureBottomCrop\": 0, \n"
+"                    \"PictureChromaSmoothCustom\": \"\", \n"
+"                    \"PictureChromaSmoothPreset\": \"off\", \n"
+"                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureCombDetectCustom\": \"\", \n"
+"                    \"PictureCombDetectPreset\": \"default\", \n"
+"                    \"PictureDARWidth\": 0, \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \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"
@@ -8756,7 +8876,7 @@ const char hb_builtin_presets_json[] =
 "            \"x264Option\": \"\", \n"
 "            \"x264UseAdvancedOptions\": false\n"
 "        }, \n"
-"        \"VersionMajor\": 36, \n"
+"        \"VersionMajor\": 37, \n"
 "        \"VersionMicro\": 0, \n"
 "        \"VersionMinor\": 0\n"
 "    }\n"
diff --git a/preset/preset_builtin.json b/preset/preset_builtin.json
index 2caa45bd6..917e71edf 100644
--- a/preset/preset_builtin.json
+++ b/preset/preset_builtin.json
@@ -4634,6 +4634,127 @@
                         "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": false,
+                    "Mp4iPodCompatible": false,
+                    "PictureAutoCrop": true,
+                    "PictureBottomCrop": 0,
+                    "PictureLeftCrop": 0,
+                    "PictureRightCrop": 0,
+                    "PictureTopCrop": 0,
+                    "PictureDARWidth": 0,
+                    "PictureDeblockPreset": "off",
+                    "PictureDeblockTune": "medium",
+                    "PictureDeblockCustom": "strength=strong:thresh=20:blocksize=8",
+                    "PictureCombDetectCustom": "",
+                    "PictureCombDetectPreset": "default",
+                    "PictureDeinterlaceCustom": "",
+                    "PictureDeinterlaceFilter": "decomb",
+                    "PictureDeinterlacePreset": "default",
+                    "PictureDenoiseCustom": "",
+                    "PictureDenoiseFilter": "off",
+                    "PictureDenoisePreset": "light",
+                    "PictureDenoiseTune": "none",
+                    "PictureChromaSmoothCustom": "",
+                    "PictureChromaSmoothPreset": "off",
+                    "PictureChromaSmoothTune": "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": 3840,
+                    "PictureHeight": 2160,
+                    "PictureForceHeight": 0,
+                    "PictureForceWidth": 0,
+                    "PresetDescription": "H.264 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Playstation 4 Pro.",
+                    "PresetName": "Playstation 2160p60 4K Surround",
+                    "Type": 0,
+                    "UsesPictureFilters": true,
+                    "UsesPictureSettings": 1,
+                    "SubtitleAddCC": false,
+                    "SubtitleAddForeignAudioSearch": true,
+                    "SubtitleAddForeignAudioSubtitle": false,
+                    "SubtitleBurnBehavior": "foreign",
+                    "SubtitleBurnBDSub": true,
+                    "SubtitleBurnDVDSub": true,
+                    "SubtitleLanguageList": [
+                    ],
+                    "SubtitleTrackSelectionBehavior": "none",
+                    "VideoAvgBitrate": 12000,
+                    "VideoColorMatrixCodeOverride": 0,
+                    "VideoEncoder": "x264",
+                    "VideoFramerate": "60",
+                    "VideoFramerateMode": "pfr",
+                    "VideoGrayScale": false,
+                    "VideoScaler": "swscale",
+                    "VideoPreset": "medium",
+                    "VideoTune": "",
+                    "VideoProfile": "main",
+                    "VideoLevel": "5.2",
+                    "VideoOptionExtra": "",
+                    "VideoQualityType": 2,
+                    "VideoQualitySlider": 24.0,
+                    "VideoQSVDecode": false,
+                    "VideoQSVAsyncDepth": 4,
+                    "VideoTwoPass": true,
+                    "VideoTurboTwoPass": false,
+                    "x264Option": "",
+                    "x264UseAdvancedOptions": false
+                },
+                {
+                    "AlignAVStart": false,
+                    "AudioCopyMask": [
+                        "copy:aac",
+                        "copy:ac3"
+                    ],
+                    "AudioEncoderFallback": "aac",
                     "AudioLanguageList": [
                     ],
                     "AudioList": [
diff --git a/preset/preset_builtin.list b/preset/preset_builtin.list
index 5662a7b2f..433497006 100644
--- a/preset/preset_builtin.list
+++ b/preset/preset_builtin.list
@@ -1,6 +1,6 @@
 <resources>
     <section name="PresetTemplate">
-        <integer name="VersionMajor" value="36" />
+        <integer name="VersionMajor" value="37" />
         <integer name="VersionMinor" value="0" />
         <integer name="VersionMicro" value="0" />
         <json name="Preset" file="preset_template.json" />