Commit 05e2e63b authored by GitLab CI's avatar GitLab CI

Merge remote-tracking branch 'upstream/master' into master-build

* upstream/master:
  preset: Add Playstation 2160p60 Surround for PS4 Pro.
  Update SECURITY.md
  Corrected typo
  Create Security.MD for GitHub's new Security Tab
parents 59d3fc2c acbeba35
Pipeline #63170710 passed with stages
in 64 minutes and 37 seconds
# Security Policy
## Reporting a Vulnerability
If you believe you’ve found a security vulnerability in HandBrake or our website (https://handbrake.fr) please send details to us by emailing
security /at/ handbrake /dot/ fr
Contributors to this project are also available in [#handbrake on Freenode IRC](https://webchat.freenode.net/?channels=handbrake) (irc://irc.freenode.net/#handbrake).
Please note, #handbrake and #handbrake-dev are public so details should only be send to contributors via private message.
## Responsible Disclosure
We kindly ask that you use responsible disclosure practices when alerting us to any security related issues.
This allows us time to investigate and take corrective action where necessary.
Our goal is to deal with any issues reported as quickly as possible. If you do not receive a direct response from us within 24 hours, please follow up with us as we may not have received the message.
## Supported Versions
We accept bug reports (including security reports) for the following versions:
| Version | Supported |
| ------------------ | ------------------ |
| 1.2.2 | :white_check_mark: |
| 1.2.1 | :white_check_mark: (Linux Only) |
| Earlier Releases | :x: |
......@@ -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"
......
......@@ -4627,6 +4627,127 @@
"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": 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": [
......
<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" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment