diff options
author | Bradley Sepos <[email protected]> | 2020-06-19 21:57:10 -0400 |
---|---|---|
committer | Bradley Sepos <[email protected]> | 2020-06-19 21:57:10 -0400 |
commit | f4107ce2e1fe1f0977f90fa542447353dcdc8a6f (patch) | |
tree | 85d3724f4f13c8c61082b9f38f4db05db3ae7075 /libhb | |
parent | e8d5cc79660cf7e3671c4cfab51da54451e5b14c (diff) |
presets: Move Amazon Fire to top of Devices category.
I apparently forgot to alphabetize after renaming Fire TV -> Amazon Fire. No need to bump preset revision number for this.
Diffstat (limited to 'libhb')
-rw-r--r-- | libhb/handbrake/preset_builtin.h | 428 |
1 files changed, 214 insertions, 214 deletions
diff --git a/libhb/handbrake/preset_builtin.h b/libhb/handbrake/preset_builtin.h index f0539afe1..20de14c9e 100644 --- a/libhb/handbrake/preset_builtin.h +++ b/libhb/handbrake/preset_builtin.h @@ -3206,7 +3206,8 @@ const char hb_builtin_presets_json[] = " {\n" " \"AlignAVStart\": false, \n" " \"AudioCopyMask\": [\n" -" \"copy:aac\"\n" +" \"copy:aac\", \n" +" \"copy:ac3\"\n" " ], \n" " \"AudioEncoderFallback\": \"aac\", \n" " \"AudioLanguageList\": [], \n" @@ -3223,6 +3224,19 @@ const char hb_builtin_presets_json[] = " \"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" @@ -3258,7 +3272,7 @@ const char hb_builtin_presets_json[] = " \"PictureDetelecineCustom\": \"\", \n" " \"PictureForceHeight\": 0, \n" " \"PictureForceWidth\": 0, \n" -" \"PictureHeight\": 1080, \n" +" \"PictureHeight\": 2160, \n" " \"PictureItuPAR\": false, \n" " \"PictureKeepRatio\": true, \n" " \"PictureLeftCrop\": 0, \n" @@ -3274,9 +3288,9 @@ const char hb_builtin_presets_json[] = " \"PictureSharpenPreset\": \"medium\", \n" " \"PictureSharpenTune\": \"none\", \n" " \"PictureTopCrop\": 0, \n" -" \"PictureWidth\": 1920, \n" -" \"PresetDescription\": \"H.264 video (up to 1080p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n" -" \"PresetName\": \"Android 1080p30\", \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, Fire TV Stick 4K.\", \n" +" \"PresetName\": \"Amazon Fire 2160p60 4K HEVC Surround\", \n" " \"SubtitleAddCC\": false, \n" " \"SubtitleAddForeignAudioSearch\": true, \n" " \"SubtitleAddForeignAudioSubtitle\": false, \n" @@ -3288,19 +3302,19 @@ const char hb_builtin_presets_json[] = " \"Type\": 0, \n" " \"UsesPictureFilters\": true, \n" " \"UsesPictureSettings\": 1, \n" -" \"VideoAvgBitrate\": 6000, \n" +" \"VideoAvgBitrate\": 8000, \n" " \"VideoColorMatrixCodeOverride\": 0, \n" -" \"VideoEncoder\": \"x264\", \n" -" \"VideoFramerate\": \"30\", \n" +" \"VideoEncoder\": \"x265\", \n" +" \"VideoFramerate\": \"60\", \n" " \"VideoFramerateMode\": \"pfr\", \n" " \"VideoGrayScale\": false, \n" -" \"VideoLevel\": \"4.0\", \n" -" \"VideoOptionExtra\": \"\", \n" -" \"VideoPreset\": \"medium\", \n" +" \"VideoLevel\": \"auto\", \n" +" \"VideoOptionExtra\": \"strong-intra-smoothing=0:rect=0:aq-mode=1\", \n" +" \"VideoPreset\": \"slow\", \n" " \"VideoProfile\": \"main\", \n" " \"VideoQSVAsyncDepth\": 4, \n" " \"VideoQSVDecode\": false, \n" -" \"VideoQualitySlider\": 22.0, \n" +" \"VideoQualitySlider\": 24.0, \n" " \"VideoQualityType\": 2, \n" " \"VideoScaler\": \"swscale\", \n" " \"VideoTune\": \"\", \n" @@ -3312,7 +3326,8 @@ const char hb_builtin_presets_json[] = " {\n" " \"AlignAVStart\": false, \n" " \"AudioCopyMask\": [\n" -" \"copy:aac\"\n" +" \"copy:aac\", \n" +" \"copy:ac3\"\n" " ], \n" " \"AudioEncoderFallback\": \"aac\", \n" " \"AudioLanguageList\": [], \n" @@ -3329,6 +3344,19 @@ const char hb_builtin_presets_json[] = " \"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" @@ -3364,7 +3392,7 @@ const char hb_builtin_presets_json[] = " \"PictureDetelecineCustom\": \"\", \n" " \"PictureForceHeight\": 0, \n" " \"PictureForceWidth\": 0, \n" -" \"PictureHeight\": 720, \n" +" \"PictureHeight\": 1080, \n" " \"PictureItuPAR\": false, \n" " \"PictureKeepRatio\": true, \n" " \"PictureLeftCrop\": 0, \n" @@ -3380,9 +3408,9 @@ const char hb_builtin_presets_json[] = " \"PictureSharpenPreset\": \"medium\", \n" " \"PictureSharpenTune\": \"none\", \n" " \"PictureTopCrop\": 0, \n" -" \"PictureWidth\": 1280, \n" -" \"PresetDescription\": \"H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n" -" \"PresetName\": \"Android 720p30\", \n" +" \"PictureWidth\": 1920, \n" +" \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) audio, in an MP4 container. Compatible with Amazon Fire TV 1st Generation and later; Fire TV Stick 1st Generation and later; Fire HD 10 7th Generation (2017); Fire HDX 4th Generation (2014).\", \n" +" \"PresetName\": \"Amazon Fire 1080p30 Surround\", \n" " \"SubtitleAddCC\": false, \n" " \"SubtitleAddForeignAudioSearch\": true, \n" " \"SubtitleAddForeignAudioSubtitle\": false, \n" @@ -3394,19 +3422,19 @@ const char hb_builtin_presets_json[] = " \"Type\": 0, \n" " \"UsesPictureFilters\": true, \n" " \"UsesPictureSettings\": 1, \n" -" \"VideoAvgBitrate\": 3000, \n" +" \"VideoAvgBitrate\": 6000, \n" " \"VideoColorMatrixCodeOverride\": 0, \n" " \"VideoEncoder\": \"x264\", \n" " \"VideoFramerate\": \"30\", \n" " \"VideoFramerateMode\": \"pfr\", \n" " \"VideoGrayScale\": false, \n" -" \"VideoLevel\": \"3.1\", \n" +" \"VideoLevel\": \"4.0\", \n" " \"VideoOptionExtra\": \"\", \n" " \"VideoPreset\": \"medium\", \n" " \"VideoProfile\": \"main\", \n" " \"VideoQSVAsyncDepth\": 4, \n" " \"VideoQSVDecode\": false, \n" -" \"VideoQualitySlider\": 21.0, \n" +" \"VideoQualitySlider\": 22.0, \n" " \"VideoQualityType\": 2, \n" " \"VideoScaler\": \"swscale\", \n" " \"VideoTune\": \"\", \n" @@ -3424,7 +3452,7 @@ const char hb_builtin_presets_json[] = " \"AudioLanguageList\": [], \n" " \"AudioList\": [\n" " {\n" -" \"AudioBitrate\": 128, \n" +" \"AudioBitrate\": 160, \n" " \"AudioCompressionLevel\": -1.0, \n" " \"AudioDitherMethod\": \"auto\", \n" " \"AudioEncoder\": \"aac\", \n" @@ -3470,7 +3498,7 @@ const char hb_builtin_presets_json[] = " \"PictureDetelecineCustom\": \"\", \n" " \"PictureForceHeight\": 0, \n" " \"PictureForceWidth\": 0, \n" -" \"PictureHeight\": 576, \n" +" \"PictureHeight\": 720, \n" " \"PictureItuPAR\": false, \n" " \"PictureKeepRatio\": true, \n" " \"PictureLeftCrop\": 0, \n" @@ -3486,9 +3514,9 @@ const char hb_builtin_presets_json[] = " \"PictureSharpenPreset\": \"medium\", \n" " \"PictureSharpenTune\": \"none\", \n" " \"PictureTopCrop\": 0, \n" -" \"PictureWidth\": 720, \n" -" \"PresetDescription\": \"H.264 video (up to 576p25) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n" -" \"PresetName\": \"Android 576p25\", \n" +" \"PictureWidth\": 1280, \n" +" \"PresetDescription\": \"H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container. Compatible with Amazon Fire HD 4th Generation (2014) and later; Kindle Fire HDX 3rd Generation (2013); Kindle Fire HD 2nd Generation (2012) and later.\", \n" +" \"PresetName\": \"Amazon Fire 720p30\", \n" " \"SubtitleAddCC\": false, \n" " \"SubtitleAddForeignAudioSearch\": true, \n" " \"SubtitleAddForeignAudioSubtitle\": false, \n" @@ -3500,19 +3528,19 @@ const char hb_builtin_presets_json[] = " \"Type\": 0, \n" " \"UsesPictureFilters\": true, \n" " \"UsesPictureSettings\": 1, \n" -" \"VideoAvgBitrate\": 1800, \n" +" \"VideoAvgBitrate\": 3000, \n" " \"VideoColorMatrixCodeOverride\": 0, \n" " \"VideoEncoder\": \"x264\", \n" -" \"VideoFramerate\": \"25\", \n" +" \"VideoFramerate\": \"30\", \n" " \"VideoFramerateMode\": \"pfr\", \n" " \"VideoGrayScale\": false, \n" -" \"VideoLevel\": \"3.0\", \n" +" \"VideoLevel\": \"3.1\", \n" " \"VideoOptionExtra\": \"\", \n" " \"VideoPreset\": \"medium\", \n" -" \"VideoProfile\": \"main\", \n" +" \"VideoProfile\": \"high\", \n" " \"VideoQSVAsyncDepth\": 4, \n" " \"VideoQSVDecode\": false, \n" -" \"VideoQualitySlider\": 20.0, \n" +" \"VideoQualitySlider\": 21.0, \n" " \"VideoQualityType\": 2, \n" " \"VideoScaler\": \"swscale\", \n" " \"VideoTune\": \"\", \n" @@ -3530,7 +3558,7 @@ const char hb_builtin_presets_json[] = " \"AudioLanguageList\": [], \n" " \"AudioList\": [\n" " {\n" -" \"AudioBitrate\": 128, \n" +" \"AudioBitrate\": 160, \n" " \"AudioCompressionLevel\": -1.0, \n" " \"AudioDitherMethod\": \"auto\", \n" " \"AudioEncoder\": \"aac\", \n" @@ -3576,7 +3604,7 @@ const char hb_builtin_presets_json[] = " \"PictureDetelecineCustom\": \"\", \n" " \"PictureForceHeight\": 0, \n" " \"PictureForceWidth\": 0, \n" -" \"PictureHeight\": 480, \n" +" \"PictureHeight\": 1080, \n" " \"PictureItuPAR\": false, \n" " \"PictureKeepRatio\": true, \n" " \"PictureLeftCrop\": 0, \n" @@ -3592,9 +3620,9 @@ const char hb_builtin_presets_json[] = " \"PictureSharpenPreset\": \"medium\", \n" " \"PictureSharpenTune\": \"none\", \n" " \"PictureTopCrop\": 0, \n" -" \"PictureWidth\": 720, \n" -" \"PresetDescription\": \"H.264 video (up to 480p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n" -" \"PresetName\": \"Android 480p30\", \n" +" \"PictureWidth\": 1920, \n" +" \"PresetDescription\": \"H.264 video (up to 1080p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n" +" \"PresetName\": \"Android 1080p30\", \n" " \"SubtitleAddCC\": false, \n" " \"SubtitleAddForeignAudioSearch\": true, \n" " \"SubtitleAddForeignAudioSubtitle\": false, \n" @@ -3606,19 +3634,19 @@ const char hb_builtin_presets_json[] = " \"Type\": 0, \n" " \"UsesPictureFilters\": true, \n" " \"UsesPictureSettings\": 1, \n" -" \"VideoAvgBitrate\": 1500, \n" +" \"VideoAvgBitrate\": 6000, \n" " \"VideoColorMatrixCodeOverride\": 0, \n" " \"VideoEncoder\": \"x264\", \n" " \"VideoFramerate\": \"30\", \n" " \"VideoFramerateMode\": \"pfr\", \n" " \"VideoGrayScale\": false, \n" -" \"VideoLevel\": \"3.0\", \n" +" \"VideoLevel\": \"4.0\", \n" " \"VideoOptionExtra\": \"\", \n" " \"VideoPreset\": \"medium\", \n" " \"VideoProfile\": \"main\", \n" " \"VideoQSVAsyncDepth\": 4, \n" " \"VideoQSVDecode\": false, \n" -" \"VideoQualitySlider\": 20.0, \n" +" \"VideoQualitySlider\": 22.0, \n" " \"VideoQualityType\": 2, \n" " \"VideoScaler\": \"swscale\", \n" " \"VideoTune\": \"\", \n" @@ -3630,8 +3658,7 @@ const char hb_builtin_presets_json[] = " {\n" " \"AlignAVStart\": false, \n" " \"AudioCopyMask\": [\n" -" \"copy:aac\", \n" -" \"copy:ac3\"\n" +" \"copy:aac\"\n" " ], \n" " \"AudioEncoderFallback\": \"aac\", \n" " \"AudioLanguageList\": [], \n" @@ -3648,19 +3675,6 @@ const char hb_builtin_presets_json[] = " \"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" @@ -3696,7 +3710,7 @@ const char hb_builtin_presets_json[] = " \"PictureDetelecineCustom\": \"\", \n" " \"PictureForceHeight\": 0, \n" " \"PictureForceWidth\": 0, \n" -" \"PictureHeight\": 2160, \n" +" \"PictureHeight\": 720, \n" " \"PictureItuPAR\": false, \n" " \"PictureKeepRatio\": true, \n" " \"PictureLeftCrop\": 0, \n" @@ -3712,9 +3726,9 @@ const char hb_builtin_presets_json[] = " \"PictureSharpenPreset\": \"medium\", \n" " \"PictureSharpenTune\": \"none\", \n" " \"PictureTopCrop\": 0, \n" -" \"PictureWidth\": 3840, \n" -" \"PresetDescription\": \"H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 7, 7 Plus, 8, 8 Plus, X, XR, XS, XS Max; Apple TV 4K.\", \n" -" \"PresetName\": \"Apple 2160p60 4K HEVC Surround\", \n" +" \"PictureWidth\": 1280, \n" +" \"PresetDescription\": \"H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n" +" \"PresetName\": \"Android 720p30\", \n" " \"SubtitleAddCC\": false, \n" " \"SubtitleAddForeignAudioSearch\": true, \n" " \"SubtitleAddForeignAudioSubtitle\": false, \n" @@ -3726,19 +3740,19 @@ const char hb_builtin_presets_json[] = " \"Type\": 0, \n" " \"UsesPictureFilters\": true, \n" " \"UsesPictureSettings\": 1, \n" -" \"VideoAvgBitrate\": 8000, \n" +" \"VideoAvgBitrate\": 3000, \n" " \"VideoColorMatrixCodeOverride\": 0, \n" -" \"VideoEncoder\": \"x265\", \n" -" \"VideoFramerate\": \"60\", \n" +" \"VideoEncoder\": \"x264\", \n" +" \"VideoFramerate\": \"30\", \n" " \"VideoFramerateMode\": \"pfr\", \n" " \"VideoGrayScale\": false, \n" -" \"VideoLevel\": \"auto\", \n" -" \"VideoOptionExtra\": \"strong-intra-smoothing=0:rect=0:aq-mode=1\", \n" -" \"VideoPreset\": \"slow\", \n" +" \"VideoLevel\": \"3.1\", \n" +" \"VideoOptionExtra\": \"\", \n" +" \"VideoPreset\": \"medium\", \n" " \"VideoProfile\": \"main\", \n" " \"VideoQSVAsyncDepth\": 4, \n" " \"VideoQSVDecode\": false, \n" -" \"VideoQualitySlider\": 24.0, \n" +" \"VideoQualitySlider\": 21.0, \n" " \"VideoQualityType\": 2, \n" " \"VideoScaler\": \"swscale\", \n" " \"VideoTune\": \"\", \n" @@ -3750,14 +3764,13 @@ const char hb_builtin_presets_json[] = " {\n" " \"AlignAVStart\": false, \n" " \"AudioCopyMask\": [\n" -" \"copy:aac\", \n" -" \"copy:ac3\"\n" +" \"copy:aac\"\n" " ], \n" " \"AudioEncoderFallback\": \"aac\", \n" " \"AudioLanguageList\": [], \n" " \"AudioList\": [\n" " {\n" -" \"AudioBitrate\": 160, \n" +" \"AudioBitrate\": 128, \n" " \"AudioCompressionLevel\": -1.0, \n" " \"AudioDitherMethod\": \"auto\", \n" " \"AudioEncoder\": \"aac\", \n" @@ -3768,19 +3781,6 @@ const char hb_builtin_presets_json[] = " \"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" @@ -3816,7 +3816,7 @@ const char hb_builtin_presets_json[] = " \"PictureDetelecineCustom\": \"\", \n" " \"PictureForceHeight\": 0, \n" " \"PictureForceWidth\": 0, \n" -" \"PictureHeight\": 1080, \n" +" \"PictureHeight\": 576, \n" " \"PictureItuPAR\": false, \n" " \"PictureKeepRatio\": true, \n" " \"PictureLeftCrop\": 0, \n" @@ -3832,9 +3832,9 @@ const char hb_builtin_presets_json[] = " \"PictureSharpenPreset\": \"medium\", \n" " \"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, 2nd, and 3rd Generation; Apple TV 4th Generation and later.\", \n" -" \"PresetName\": \"Apple 1080p60 Surround\", \n" +" \"PictureWidth\": 720, \n" +" \"PresetDescription\": \"H.264 video (up to 576p25) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n" +" \"PresetName\": \"Android 576p25\", \n" " \"SubtitleAddCC\": false, \n" " \"SubtitleAddForeignAudioSearch\": true, \n" " \"SubtitleAddForeignAudioSubtitle\": false, \n" @@ -3846,19 +3846,19 @@ const char hb_builtin_presets_json[] = " \"Type\": 0, \n" " \"UsesPictureFilters\": true, \n" " \"UsesPictureSettings\": 1, \n" -" \"VideoAvgBitrate\": 6000, \n" +" \"VideoAvgBitrate\": 1800, \n" " \"VideoColorMatrixCodeOverride\": 0, \n" " \"VideoEncoder\": \"x264\", \n" -" \"VideoFramerate\": \"60\", \n" +" \"VideoFramerate\": \"25\", \n" " \"VideoFramerateMode\": \"pfr\", \n" " \"VideoGrayScale\": false, \n" -" \"VideoLevel\": \"4.2\", \n" +" \"VideoLevel\": \"3.0\", \n" " \"VideoOptionExtra\": \"\", \n" " \"VideoPreset\": \"medium\", \n" -" \"VideoProfile\": \"high\", \n" +" \"VideoProfile\": \"main\", \n" " \"VideoQSVAsyncDepth\": 4, \n" " \"VideoQSVDecode\": false, \n" -" \"VideoQualitySlider\": 22.0, \n" +" \"VideoQualitySlider\": 20.0, \n" " \"VideoQualityType\": 2, \n" " \"VideoScaler\": \"swscale\", \n" " \"VideoTune\": \"\", \n" @@ -3870,14 +3870,13 @@ const char hb_builtin_presets_json[] = " {\n" " \"AlignAVStart\": false, \n" " \"AudioCopyMask\": [\n" -" \"copy:aac\", \n" -" \"copy:ac3\"\n" +" \"copy:aac\"\n" " ], \n" " \"AudioEncoderFallback\": \"aac\", \n" " \"AudioLanguageList\": [], \n" " \"AudioList\": [\n" " {\n" -" \"AudioBitrate\": 160, \n" +" \"AudioBitrate\": 128, \n" " \"AudioCompressionLevel\": -1.0, \n" " \"AudioDitherMethod\": \"auto\", \n" " \"AudioEncoder\": \"aac\", \n" @@ -3888,19 +3887,6 @@ const char hb_builtin_presets_json[] = " \"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" @@ -3936,7 +3922,7 @@ const char hb_builtin_presets_json[] = " \"PictureDetelecineCustom\": \"\", \n" " \"PictureForceHeight\": 0, \n" " \"PictureForceWidth\": 0, \n" -" \"PictureHeight\": 1080, \n" +" \"PictureHeight\": 480, \n" " \"PictureItuPAR\": false, \n" " \"PictureKeepRatio\": true, \n" " \"PictureLeftCrop\": 0, \n" @@ -3952,9 +3938,9 @@ const char hb_builtin_presets_json[] = " \"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 Apple iPhone 5, 5s, SE, 6, 6 Plus, 6s, 6s Plus, and later; iPod touch 6th Generation; iPad 3rd, 4th Generation and later; iPad mini 1st Generation and later; Apple TV 3rd, 4th Generation and later.\", \n" -" \"PresetName\": \"Apple 1080p30 Surround\", \n" +" \"PictureWidth\": 720, \n" +" \"PresetDescription\": \"H.264 video (up to 480p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n" +" \"PresetName\": \"Android 480p30\", \n" " \"SubtitleAddCC\": false, \n" " \"SubtitleAddForeignAudioSearch\": true, \n" " \"SubtitleAddForeignAudioSubtitle\": false, \n" @@ -3966,19 +3952,19 @@ const char hb_builtin_presets_json[] = " \"Type\": 0, \n" " \"UsesPictureFilters\": true, \n" " \"UsesPictureSettings\": 1, \n" -" \"VideoAvgBitrate\": 6000, \n" +" \"VideoAvgBitrate\": 1500, \n" " \"VideoColorMatrixCodeOverride\": 0, \n" " \"VideoEncoder\": \"x264\", \n" " \"VideoFramerate\": \"30\", \n" " \"VideoFramerateMode\": \"pfr\", \n" " \"VideoGrayScale\": false, \n" -" \"VideoLevel\": \"4.0\", \n" +" \"VideoLevel\": \"3.0\", \n" " \"VideoOptionExtra\": \"\", \n" " \"VideoPreset\": \"medium\", \n" -" \"VideoProfile\": \"high\", \n" +" \"VideoProfile\": \"main\", \n" " \"VideoQSVAsyncDepth\": 4, \n" " \"VideoQSVDecode\": false, \n" -" \"VideoQualitySlider\": 22.0, \n" +" \"VideoQualitySlider\": 20.0, \n" " \"VideoQualityType\": 2, \n" " \"VideoScaler\": \"swscale\", \n" " \"VideoTune\": \"\", \n" @@ -4056,7 +4042,7 @@ const char hb_builtin_presets_json[] = " \"PictureDetelecineCustom\": \"\", \n" " \"PictureForceHeight\": 0, \n" " \"PictureForceWidth\": 0, \n" -" \"PictureHeight\": 720, \n" +" \"PictureHeight\": 2160, \n" " \"PictureItuPAR\": false, \n" " \"PictureKeepRatio\": true, \n" " \"PictureLeftCrop\": 0, \n" @@ -4072,9 +4058,9 @@ const char hb_builtin_presets_json[] = " \"PictureSharpenPreset\": \"medium\", \n" " \"PictureSharpenTune\": \"none\", \n" " \"PictureTopCrop\": 0, \n" -" \"PictureWidth\": 1280, \n" -" \"PresetDescription\": \"H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 4, 4S, and later; iPod touch 4th, 5th Generation and later; iPad 1st Generation, iPad 2, and later; Apple TV 2nd Generation and later.\", \n" -" \"PresetName\": \"Apple 720p30 Surround\", \n" +" \"PictureWidth\": 3840, \n" +" \"PresetDescription\": \"H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 7, 7 Plus, 8, 8 Plus, X, XR, XS, XS Max; Apple TV 4K.\", \n" +" \"PresetName\": \"Apple 2160p60 4K HEVC Surround\", \n" " \"SubtitleAddCC\": false, \n" " \"SubtitleAddForeignAudioSearch\": true, \n" " \"SubtitleAddForeignAudioSubtitle\": false, \n" @@ -4086,19 +4072,19 @@ const char hb_builtin_presets_json[] = " \"Type\": 0, \n" " \"UsesPictureFilters\": true, \n" " \"UsesPictureSettings\": 1, \n" -" \"VideoAvgBitrate\": 3000, \n" +" \"VideoAvgBitrate\": 8000, \n" " \"VideoColorMatrixCodeOverride\": 0, \n" -" \"VideoEncoder\": \"x264\", \n" -" \"VideoFramerate\": \"30\", \n" +" \"VideoEncoder\": \"x265\", \n" +" \"VideoFramerate\": \"60\", \n" " \"VideoFramerateMode\": \"pfr\", \n" " \"VideoGrayScale\": false, \n" -" \"VideoLevel\": \"3.1\", \n" -" \"VideoOptionExtra\": \"\", \n" -" \"VideoPreset\": \"medium\", \n" -" \"VideoProfile\": \"high\", \n" +" \"VideoLevel\": \"auto\", \n" +" \"VideoOptionExtra\": \"strong-intra-smoothing=0:rect=0:aq-mode=1\", \n" +" \"VideoPreset\": \"slow\", \n" +" \"VideoProfile\": \"main\", \n" " \"VideoQSVAsyncDepth\": 4, \n" " \"VideoQSVDecode\": false, \n" -" \"VideoQualitySlider\": 21.0, \n" +" \"VideoQualitySlider\": 24.0, \n" " \"VideoQualityType\": 2, \n" " \"VideoScaler\": \"swscale\", \n" " \"VideoTune\": \"\", \n" @@ -4176,7 +4162,7 @@ const char hb_builtin_presets_json[] = " \"PictureDetelecineCustom\": \"\", \n" " \"PictureForceHeight\": 0, \n" " \"PictureForceWidth\": 0, \n" -" \"PictureHeight\": 540, \n" +" \"PictureHeight\": 1080, \n" " \"PictureItuPAR\": false, \n" " \"PictureKeepRatio\": true, \n" " \"PictureLeftCrop\": 0, \n" @@ -4192,9 +4178,9 @@ const char hb_builtin_presets_json[] = " \"PictureSharpenPreset\": \"medium\", \n" " \"PictureSharpenTune\": \"none\", \n" " \"PictureTopCrop\": 0, \n" -" \"PictureWidth\": 960, \n" -" \"PresetDescription\": \"H.264 video (up to 540p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 1st Generation, 3G, 3GS, and later; iPod touch 1st, 2nd, 3rd Generation and later; iPod Classic; Apple TV 1st Generation and later.\", \n" -" \"PresetName\": \"Apple 540p30 Surround\", \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, 2nd, and 3rd Generation; Apple TV 4th Generation and later.\", \n" +" \"PresetName\": \"Apple 1080p60 Surround\", \n" " \"SubtitleAddCC\": false, \n" " \"SubtitleAddForeignAudioSearch\": true, \n" " \"SubtitleAddForeignAudioSubtitle\": false, \n" @@ -4206,19 +4192,19 @@ const char hb_builtin_presets_json[] = " \"Type\": 0, \n" " \"UsesPictureFilters\": true, \n" " \"UsesPictureSettings\": 1, \n" -" \"VideoAvgBitrate\": 2500, \n" +" \"VideoAvgBitrate\": 6000, \n" " \"VideoColorMatrixCodeOverride\": 0, \n" " \"VideoEncoder\": \"x264\", \n" -" \"VideoFramerate\": \"30\", \n" +" \"VideoFramerate\": \"60\", \n" " \"VideoFramerateMode\": \"pfr\", \n" " \"VideoGrayScale\": false, \n" -" \"VideoLevel\": \"3.1\", \n" -" \"VideoOptionExtra\": \"qpmin=4:cabac=0:ref=2:b-pyramid=none:weightb=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500\", \n" +" \"VideoLevel\": \"4.2\", \n" +" \"VideoOptionExtra\": \"\", \n" " \"VideoPreset\": \"medium\", \n" " \"VideoProfile\": \"high\", \n" " \"VideoQSVAsyncDepth\": 4, \n" " \"VideoQSVDecode\": false, \n" -" \"VideoQualitySlider\": 20.0, \n" +" \"VideoQualitySlider\": 22.0, \n" " \"VideoQualityType\": 2, \n" " \"VideoScaler\": \"swscale\", \n" " \"VideoTune\": \"\", \n" @@ -4230,7 +4216,8 @@ const char hb_builtin_presets_json[] = " {\n" " \"AlignAVStart\": false, \n" " \"AudioCopyMask\": [\n" -" \"copy:aac\"\n" +" \"copy:aac\", \n" +" \"copy:ac3\"\n" " ], \n" " \"AudioEncoderFallback\": \"aac\", \n" " \"AudioLanguageList\": [], \n" @@ -4247,6 +4234,19 @@ const char hb_builtin_presets_json[] = " \"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" @@ -4259,7 +4259,7 @@ const char hb_builtin_presets_json[] = " \"FolderOpen\": false, \n" " \"InlineParameterSets\": false, \n" " \"Mp4HttpOptimize\": false, \n" -" \"Mp4iPodCompatible\": true, \n" +" \"Mp4iPodCompatible\": false, \n" " \"PictureAutoCrop\": true, \n" " \"PictureBottomCrop\": 0, \n" " \"PictureChromaSmoothCustom\": \"\", \n" @@ -4282,13 +4282,13 @@ const char hb_builtin_presets_json[] = " \"PictureDetelecineCustom\": \"\", \n" " \"PictureForceHeight\": 0, \n" " \"PictureForceWidth\": 0, \n" -" \"PictureHeight\": 240, \n" +" \"PictureHeight\": 1080, \n" " \"PictureItuPAR\": false, \n" " \"PictureKeepRatio\": true, \n" " \"PictureLeftCrop\": 0, \n" " \"PictureLooseCrop\": false, \n" -" \"PictureModulus\": 16, \n" -" \"PicturePAR\": \"off\", \n" +" \"PictureModulus\": 2, \n" +" \"PicturePAR\": \"auto\", \n" " \"PicturePARHeight\": 720, \n" " \"PicturePARWidth\": 853, \n" " \"PictureRightCrop\": 0, \n" @@ -4298,9 +4298,9 @@ const char hb_builtin_presets_json[] = " \"PictureSharpenPreset\": \"medium\", \n" " \"PictureSharpenTune\": \"none\", \n" " \"PictureTopCrop\": 0, \n" -" \"PictureWidth\": 320, \n" -" \"PresetDescription\": \"H.264 video (up to 240p30) and AAC stereo audio, in an MP4 container. Compatible with Apple iPod 5th Generation and later.\", \n" -" \"PresetName\": \"Apple 240p30\", \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 Apple iPhone 5, 5s, SE, 6, 6 Plus, 6s, 6s Plus, and later; iPod touch 6th Generation; iPad 3rd, 4th Generation and later; iPad mini 1st Generation and later; Apple TV 3rd, 4th Generation and later.\", \n" +" \"PresetName\": \"Apple 1080p30 Surround\", \n" " \"SubtitleAddCC\": false, \n" " \"SubtitleAddForeignAudioSearch\": true, \n" " \"SubtitleAddForeignAudioSubtitle\": false, \n" @@ -4312,23 +4312,23 @@ const char hb_builtin_presets_json[] = " \"Type\": 0, \n" " \"UsesPictureFilters\": true, \n" " \"UsesPictureSettings\": 1, \n" -" \"VideoAvgBitrate\": 350, \n" +" \"VideoAvgBitrate\": 6000, \n" " \"VideoColorMatrixCodeOverride\": 0, \n" " \"VideoEncoder\": \"x264\", \n" " \"VideoFramerate\": \"30\", \n" " \"VideoFramerateMode\": \"pfr\", \n" " \"VideoGrayScale\": false, \n" -" \"VideoLevel\": \"1.3\", \n" +" \"VideoLevel\": \"4.0\", \n" " \"VideoOptionExtra\": \"\", \n" " \"VideoPreset\": \"medium\", \n" -" \"VideoProfile\": \"baseline\", \n" +" \"VideoProfile\": \"high\", \n" " \"VideoQSVAsyncDepth\": 4, \n" " \"VideoQSVDecode\": false, \n" " \"VideoQualitySlider\": 22.0, \n" " \"VideoQualityType\": 2, \n" " \"VideoScaler\": \"swscale\", \n" " \"VideoTune\": \"\", \n" -" \"VideoTurboTwoPass\": true, \n" +" \"VideoTurboTwoPass\": false, \n" " \"VideoTwoPass\": true, \n" " \"x264Option\": \"\", \n" " \"x264UseAdvancedOptions\": false\n" @@ -4378,7 +4378,7 @@ const char hb_builtin_presets_json[] = " \"Folder\": false, \n" " \"FolderOpen\": false, \n" " \"InlineParameterSets\": false, \n" -" \"Mp4HttpOptimize\": true, \n" +" \"Mp4HttpOptimize\": false, \n" " \"Mp4iPodCompatible\": false, \n" " \"PictureAutoCrop\": true, \n" " \"PictureBottomCrop\": 0, \n" @@ -4402,7 +4402,7 @@ const char hb_builtin_presets_json[] = " \"PictureDetelecineCustom\": \"\", \n" " \"PictureForceHeight\": 0, \n" " \"PictureForceWidth\": 0, \n" -" \"PictureHeight\": 2160, \n" +" \"PictureHeight\": 720, \n" " \"PictureItuPAR\": false, \n" " \"PictureKeepRatio\": true, \n" " \"PictureLeftCrop\": 0, \n" @@ -4418,9 +4418,9 @@ const char hb_builtin_presets_json[] = " \"PictureSharpenPreset\": \"medium\", \n" " \"PictureSharpenTune\": \"none\", \n" " \"PictureTopCrop\": 0, \n" -" \"PictureWidth\": 3840, \n" -" \"PresetDescription\": \"H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast Ultra.\", \n" -" \"PresetName\": \"Chromecast 2160p60 4K HEVC Surround\", \n" +" \"PictureWidth\": 1280, \n" +" \"PresetDescription\": \"H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 4, 4S, and later; iPod touch 4th, 5th Generation and later; iPad 1st Generation, iPad 2, and later; Apple TV 2nd Generation and later.\", \n" +" \"PresetName\": \"Apple 720p30 Surround\", \n" " \"SubtitleAddCC\": false, \n" " \"SubtitleAddForeignAudioSearch\": true, \n" " \"SubtitleAddForeignAudioSubtitle\": false, \n" @@ -4432,19 +4432,19 @@ const char hb_builtin_presets_json[] = " \"Type\": 0, \n" " \"UsesPictureFilters\": true, \n" " \"UsesPictureSettings\": 1, \n" -" \"VideoAvgBitrate\": 8000, \n" +" \"VideoAvgBitrate\": 3000, \n" " \"VideoColorMatrixCodeOverride\": 0, \n" -" \"VideoEncoder\": \"x265\", \n" -" \"VideoFramerate\": \"60\", \n" +" \"VideoEncoder\": \"x264\", \n" +" \"VideoFramerate\": \"30\", \n" " \"VideoFramerateMode\": \"pfr\", \n" " \"VideoGrayScale\": false, \n" -" \"VideoLevel\": \"auto\", \n" -" \"VideoOptionExtra\": \"strong-intra-smoothing=0:rect=0:aq-mode=1\", \n" -" \"VideoPreset\": \"slow\", \n" -" \"VideoProfile\": \"main\", \n" +" \"VideoLevel\": \"3.1\", \n" +" \"VideoOptionExtra\": \"\", \n" +" \"VideoPreset\": \"medium\", \n" +" \"VideoProfile\": \"high\", \n" " \"VideoQSVAsyncDepth\": 4, \n" " \"VideoQSVDecode\": false, \n" -" \"VideoQualitySlider\": 24.0, \n" +" \"VideoQualitySlider\": 21.0, \n" " \"VideoQualityType\": 2, \n" " \"VideoScaler\": \"swscale\", \n" " \"VideoTune\": \"\", \n" @@ -4498,7 +4498,7 @@ const char hb_builtin_presets_json[] = " \"Folder\": false, \n" " \"FolderOpen\": false, \n" " \"InlineParameterSets\": false, \n" -" \"Mp4HttpOptimize\": true, \n" +" \"Mp4HttpOptimize\": false, \n" " \"Mp4iPodCompatible\": false, \n" " \"PictureAutoCrop\": true, \n" " \"PictureBottomCrop\": 0, \n" @@ -4522,7 +4522,7 @@ const char hb_builtin_presets_json[] = " \"PictureDetelecineCustom\": \"\", \n" " \"PictureForceHeight\": 0, \n" " \"PictureForceWidth\": 0, \n" -" \"PictureHeight\": 1080, \n" +" \"PictureHeight\": 540, \n" " \"PictureItuPAR\": false, \n" " \"PictureKeepRatio\": true, \n" " \"PictureLeftCrop\": 0, \n" @@ -4538,9 +4538,9 @@ const char hb_builtin_presets_json[] = " \"PictureSharpenPreset\": \"medium\", \n" " \"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 Google Chromecast 3rd Generation.\", \n" -" \"PresetName\": \"Chromecast 1080p60 Surround\", \n" +" \"PictureWidth\": 960, \n" +" \"PresetDescription\": \"H.264 video (up to 540p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 1st Generation, 3G, 3GS, and later; iPod touch 1st, 2nd, 3rd Generation and later; iPod Classic; Apple TV 1st Generation and later.\", \n" +" \"PresetName\": \"Apple 540p30 Surround\", \n" " \"SubtitleAddCC\": false, \n" " \"SubtitleAddForeignAudioSearch\": true, \n" " \"SubtitleAddForeignAudioSubtitle\": false, \n" @@ -4552,19 +4552,19 @@ const char hb_builtin_presets_json[] = " \"Type\": 0, \n" " \"UsesPictureFilters\": true, \n" " \"UsesPictureSettings\": 1, \n" -" \"VideoAvgBitrate\": 6000, \n" +" \"VideoAvgBitrate\": 2500, \n" " \"VideoColorMatrixCodeOverride\": 0, \n" " \"VideoEncoder\": \"x264\", \n" -" \"VideoFramerate\": \"60\", \n" +" \"VideoFramerate\": \"30\", \n" " \"VideoFramerateMode\": \"pfr\", \n" " \"VideoGrayScale\": false, \n" -" \"VideoLevel\": \"4.2\", \n" -" \"VideoOptionExtra\": \"\", \n" +" \"VideoLevel\": \"3.1\", \n" +" \"VideoOptionExtra\": \"qpmin=4:cabac=0:ref=2:b-pyramid=none:weightb=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500\", \n" " \"VideoPreset\": \"medium\", \n" " \"VideoProfile\": \"high\", \n" " \"VideoQSVAsyncDepth\": 4, \n" " \"VideoQSVDecode\": false, \n" -" \"VideoQualitySlider\": 22.0, \n" +" \"VideoQualitySlider\": 20.0, \n" " \"VideoQualityType\": 2, \n" " \"VideoScaler\": \"swscale\", \n" " \"VideoTune\": \"\", \n" @@ -4576,8 +4576,7 @@ const char hb_builtin_presets_json[] = " {\n" " \"AlignAVStart\": false, \n" " \"AudioCopyMask\": [\n" -" \"copy:aac\", \n" -" \"copy:ac3\"\n" +" \"copy:aac\"\n" " ], \n" " \"AudioEncoderFallback\": \"aac\", \n" " \"AudioLanguageList\": [], \n" @@ -4594,19 +4593,6 @@ const char hb_builtin_presets_json[] = " \"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" @@ -4618,8 +4604,8 @@ const char hb_builtin_presets_json[] = " \"Folder\": false, \n" " \"FolderOpen\": false, \n" " \"InlineParameterSets\": false, \n" -" \"Mp4HttpOptimize\": true, \n" -" \"Mp4iPodCompatible\": false, \n" +" \"Mp4HttpOptimize\": false, \n" +" \"Mp4iPodCompatible\": true, \n" " \"PictureAutoCrop\": true, \n" " \"PictureBottomCrop\": 0, \n" " \"PictureChromaSmoothCustom\": \"\", \n" @@ -4642,13 +4628,13 @@ const char hb_builtin_presets_json[] = " \"PictureDetelecineCustom\": \"\", \n" " \"PictureForceHeight\": 0, \n" " \"PictureForceWidth\": 0, \n" -" \"PictureHeight\": 1080, \n" +" \"PictureHeight\": 240, \n" " \"PictureItuPAR\": false, \n" " \"PictureKeepRatio\": true, \n" " \"PictureLeftCrop\": 0, \n" " \"PictureLooseCrop\": false, \n" -" \"PictureModulus\": 2, \n" -" \"PicturePAR\": \"auto\", \n" +" \"PictureModulus\": 16, \n" +" \"PicturePAR\": \"off\", \n" " \"PicturePARHeight\": 720, \n" " \"PicturePARWidth\": 853, \n" " \"PictureRightCrop\": 0, \n" @@ -4658,9 +4644,9 @@ const char hb_builtin_presets_json[] = " \"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" +" \"PictureWidth\": 320, \n" +" \"PresetDescription\": \"H.264 video (up to 240p30) and AAC stereo audio, in an MP4 container. Compatible with Apple iPod 5th Generation and later.\", \n" +" \"PresetName\": \"Apple 240p30\", \n" " \"SubtitleAddCC\": false, \n" " \"SubtitleAddForeignAudioSearch\": true, \n" " \"SubtitleAddForeignAudioSubtitle\": false, \n" @@ -4672,23 +4658,23 @@ const char hb_builtin_presets_json[] = " \"Type\": 0, \n" " \"UsesPictureFilters\": true, \n" " \"UsesPictureSettings\": 1, \n" -" \"VideoAvgBitrate\": 6000, \n" +" \"VideoAvgBitrate\": 350, \n" " \"VideoColorMatrixCodeOverride\": 0, \n" " \"VideoEncoder\": \"x264\", \n" " \"VideoFramerate\": \"30\", \n" " \"VideoFramerateMode\": \"pfr\", \n" " \"VideoGrayScale\": false, \n" -" \"VideoLevel\": \"4.0\", \n" +" \"VideoLevel\": \"1.3\", \n" " \"VideoOptionExtra\": \"\", \n" " \"VideoPreset\": \"medium\", \n" -" \"VideoProfile\": \"high\", \n" +" \"VideoProfile\": \"baseline\", \n" " \"VideoQSVAsyncDepth\": 4, \n" " \"VideoQSVDecode\": false, \n" " \"VideoQualitySlider\": 22.0, \n" " \"VideoQualityType\": 2, \n" " \"VideoScaler\": \"swscale\", \n" " \"VideoTune\": \"\", \n" -" \"VideoTurboTwoPass\": false, \n" +" \"VideoTurboTwoPass\": true, \n" " \"VideoTwoPass\": true, \n" " \"x264Option\": \"\", \n" " \"x264UseAdvancedOptions\": false\n" @@ -4738,7 +4724,7 @@ const char hb_builtin_presets_json[] = " \"Folder\": false, \n" " \"FolderOpen\": false, \n" " \"InlineParameterSets\": false, \n" -" \"Mp4HttpOptimize\": false, \n" +" \"Mp4HttpOptimize\": true, \n" " \"Mp4iPodCompatible\": false, \n" " \"PictureAutoCrop\": true, \n" " \"PictureBottomCrop\": 0, \n" @@ -4779,8 +4765,8 @@ 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, Fire TV Stick 4K.\", \n" -" \"PresetName\": \"Amazon Fire 2160p60 4K HEVC Surround\", \n" +" \"PresetDescription\": \"H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast Ultra.\", \n" +" \"PresetName\": \"Chromecast 2160p60 4K HEVC Surround\", \n" " \"SubtitleAddCC\": false, \n" " \"SubtitleAddForeignAudioSearch\": true, \n" " \"SubtitleAddForeignAudioSubtitle\": false, \n" @@ -4858,7 +4844,7 @@ const char hb_builtin_presets_json[] = " \"Folder\": false, \n" " \"FolderOpen\": false, \n" " \"InlineParameterSets\": false, \n" -" \"Mp4HttpOptimize\": false, \n" +" \"Mp4HttpOptimize\": true, \n" " \"Mp4iPodCompatible\": false, \n" " \"PictureAutoCrop\": true, \n" " \"PictureBottomCrop\": 0, \n" @@ -4899,8 +4885,8 @@ 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) audio, in an MP4 container. Compatible with Amazon Fire TV 1st Generation and later; Fire TV Stick 1st Generation and later; Fire HD 10 7th Generation (2017); Fire HDX 4th Generation (2014).\", \n" -" \"PresetName\": \"Amazon Fire 1080p30 Surround\", \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" @@ -4915,13 +4901,13 @@ const char hb_builtin_presets_json[] = " \"VideoAvgBitrate\": 6000, \n" " \"VideoColorMatrixCodeOverride\": 0, \n" " \"VideoEncoder\": \"x264\", \n" -" \"VideoFramerate\": \"30\", \n" +" \"VideoFramerate\": \"60\", \n" " \"VideoFramerateMode\": \"pfr\", \n" " \"VideoGrayScale\": false, \n" -" \"VideoLevel\": \"4.0\", \n" +" \"VideoLevel\": \"4.2\", \n" " \"VideoOptionExtra\": \"\", \n" " \"VideoPreset\": \"medium\", \n" -" \"VideoProfile\": \"main\", \n" +" \"VideoProfile\": \"high\", \n" " \"VideoQSVAsyncDepth\": 4, \n" " \"VideoQSVDecode\": false, \n" " \"VideoQualitySlider\": 22.0, \n" @@ -4936,7 +4922,8 @@ const char hb_builtin_presets_json[] = " {\n" " \"AlignAVStart\": false, \n" " \"AudioCopyMask\": [\n" -" \"copy:aac\"\n" +" \"copy:aac\", \n" +" \"copy:ac3\"\n" " ], \n" " \"AudioEncoderFallback\": \"aac\", \n" " \"AudioLanguageList\": [], \n" @@ -4953,6 +4940,19 @@ const char hb_builtin_presets_json[] = " \"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" @@ -4964,7 +4964,7 @@ const char hb_builtin_presets_json[] = " \"Folder\": false, \n" " \"FolderOpen\": false, \n" " \"InlineParameterSets\": false, \n" -" \"Mp4HttpOptimize\": false, \n" +" \"Mp4HttpOptimize\": true, \n" " \"Mp4iPodCompatible\": false, \n" " \"PictureAutoCrop\": true, \n" " \"PictureBottomCrop\": 0, \n" @@ -4988,7 +4988,7 @@ const char hb_builtin_presets_json[] = " \"PictureDetelecineCustom\": \"\", \n" " \"PictureForceHeight\": 0, \n" " \"PictureForceWidth\": 0, \n" -" \"PictureHeight\": 720, \n" +" \"PictureHeight\": 1080, \n" " \"PictureItuPAR\": false, \n" " \"PictureKeepRatio\": true, \n" " \"PictureLeftCrop\": 0, \n" @@ -5004,9 +5004,9 @@ const char hb_builtin_presets_json[] = " \"PictureSharpenPreset\": \"medium\", \n" " \"PictureSharpenTune\": \"none\", \n" " \"PictureTopCrop\": 0, \n" -" \"PictureWidth\": 1280, \n" -" \"PresetDescription\": \"H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container. Compatible with Amazon Fire HD 4th Generation (2014) and later; Kindle Fire HDX 3rd Generation (2013); Kindle Fire HD 2nd Generation (2012) and later.\", \n" -" \"PresetName\": \"Amazon Fire 720p30\", \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" " \"SubtitleAddForeignAudioSubtitle\": false, \n" @@ -5018,19 +5018,19 @@ const char hb_builtin_presets_json[] = " \"Type\": 0, \n" " \"UsesPictureFilters\": true, \n" " \"UsesPictureSettings\": 1, \n" -" \"VideoAvgBitrate\": 3000, \n" +" \"VideoAvgBitrate\": 6000, \n" " \"VideoColorMatrixCodeOverride\": 0, \n" " \"VideoEncoder\": \"x264\", \n" " \"VideoFramerate\": \"30\", \n" " \"VideoFramerateMode\": \"pfr\", \n" " \"VideoGrayScale\": false, \n" -" \"VideoLevel\": \"3.1\", \n" +" \"VideoLevel\": \"4.0\", \n" " \"VideoOptionExtra\": \"\", \n" " \"VideoPreset\": \"medium\", \n" " \"VideoProfile\": \"high\", \n" " \"VideoQSVAsyncDepth\": 4, \n" " \"VideoQSVDecode\": false, \n" -" \"VideoQualitySlider\": 21.0, \n" +" \"VideoQualitySlider\": 22.0, \n" " \"VideoQualityType\": 2, \n" " \"VideoScaler\": \"swscale\", \n" " \"VideoTune\": \"\", \n" |