diff options
author | Bradley Sepos <[email protected]> | 2016-12-16 19:39:33 -0500 |
---|---|---|
committer | Bradley Sepos <[email protected]> | 2016-12-16 19:40:04 -0500 |
commit | d165aa9348e80491568d8e30fb6f0226124f5b9a (patch) | |
tree | 15ac0086535885d673019f82e566f8d0b4f59233 | |
parent | 555e960cc4bb81f44194df7d04aa736382b3ce27 (diff) |
preset: Revise Gmail presets.
Longer durations, better resolutions.
Gmail Large 3 Minutes 720p30: Up to 3 minutes of 720p video in 25 MB or less.
Gmail Medium 5 Minutes 480p30: Up to 5 minutes of 480p video in 25 MB or less.
Gmail Small 10 Minutes 288p30: Up to 10 minutes of 288p video in 25 MB or less.
-rw-r--r-- | libhb/preset_builtin.h | 64 | ||||
-rw-r--r-- | preset/preset_builtin.json | 62 | ||||
-rw-r--r-- | preset/preset_builtin.list | 2 |
3 files changed, 64 insertions, 64 deletions
diff --git a/libhb/preset_builtin.h b/libhb/preset_builtin.h index 28964a30e..2db4f2a8f 100644 --- a/libhb/preset_builtin.h +++ b/libhb/preset_builtin.h @@ -1666,11 +1666,11 @@ const char hb_builtin_presets_json[] = " \"AudioLanguageList\": [], \n" " \"AudioList\": [\n" " {\n" -" \"AudioBitrate\": 160, \n" +" \"AudioBitrate\": 96, \n" " \"AudioCompressionLevel\": -1.0, \n" " \"AudioDitherMethod\": \"auto\", \n" " \"AudioEncoder\": \"aac\", \n" -" \"AudioMixdown\": \"dpl2\", \n" +" \"AudioMixdown\": \"stereo\", \n" " \"AudioNormalizeMixLevel\": false, \n" " \"AudioSamplerate\": \"auto\", \n" " \"AudioTrackDRCSlider\": 0.0, \n" @@ -1707,7 +1707,7 @@ const char hb_builtin_presets_json[] = " \"PictureDetelecineCustom\": \"\", \n" " \"PictureForceHeight\": 0, \n" " \"PictureForceWidth\": 0, \n" -" \"PictureHeight\": 1080, \n" +" \"PictureHeight\": 720, \n" " \"PictureItuPAR\": false, \n" " \"PictureKeepRatio\": true, \n" " \"PictureLeftCrop\": 0, \n" @@ -1719,9 +1719,9 @@ const char hb_builtin_presets_json[] = " \"PictureRightCrop\": 0, \n" " \"PictureRotate\": \"angle=0:hflip=0\", \n" " \"PictureTopCrop\": 0, \n" -" \"PictureWidth\": 1920, \n" -" \"PresetDescription\": \"Encode up to 1 minute of video in large size for Gmail (25 MB or less). H.264 video (up to 1080p30) and AAC stereo audio, in an MP4 container.\", \n" -" \"PresetName\": \"Gmail Large 1080p30\", \n" +" \"PictureWidth\": 1280, \n" +" \"PresetDescription\": \"Encode up to 3 minutes of video in large size for Gmail (25 MB or less). H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container.\", \n" +" \"PresetName\": \"Gmail Large 3 Minutes 720p30\", \n" " \"SubtitleAddCC\": false, \n" " \"SubtitleAddForeignAudioSearch\": true, \n" " \"SubtitleAddForeignAudioSubtitle\": false, \n" @@ -1733,23 +1733,23 @@ const char hb_builtin_presets_json[] = " \"Type\": 0, \n" " \"UsesPictureFilters\": true, \n" " \"UsesPictureSettings\": 1, \n" -" \"VideoAvgBitrate\": 2750, \n" +" \"VideoAvgBitrate\": 900, \n" " \"VideoColorMatrixCode\": 0, \n" " \"VideoEncoder\": \"x264\", \n" " \"VideoFramerate\": \"30\", \n" " \"VideoFramerateMode\": \"pfr\", \n" " \"VideoGrayScale\": false, \n" -" \"VideoLevel\": \"4.0\", \n" -" \"VideoOptionExtra\": \"vbv-bufsize=9950:vbv-maxrate=2750\", \n" +" \"VideoLevel\": \"3.1\", \n" +" \"VideoOptionExtra\": \"vbv-bufsize=3600:vbv-maxrate=900:aq-mode=2:aq-strength=0.8:direct=auto:analyse=all:deblock=3,2\", \n" " \"VideoPreset\": \"medium\", \n" " \"VideoProfile\": \"main\", \n" " \"VideoQSVAsyncDepth\": 4, \n" " \"VideoQSVDecode\": false, \n" -" \"VideoQualitySlider\": 22.0, \n" +" \"VideoQualitySlider\": 23.0, \n" " \"VideoQualityType\": 2, \n" " \"VideoScaler\": \"swscale\", \n" " \"VideoTune\": \"\", \n" -" \"VideoTurboTwoPass\": true, \n" +" \"VideoTurboTwoPass\": false, \n" " \"VideoTwoPass\": true, \n" " \"x264Option\": \"\", \n" " \"x264UseAdvancedOptions\": false\n" @@ -1762,11 +1762,11 @@ const char hb_builtin_presets_json[] = " \"AudioLanguageList\": [], \n" " \"AudioList\": [\n" " {\n" -" \"AudioBitrate\": 160, \n" +" \"AudioBitrate\": 96, \n" " \"AudioCompressionLevel\": -1.0, \n" " \"AudioDitherMethod\": \"auto\", \n" " \"AudioEncoder\": \"aac\", \n" -" \"AudioMixdown\": \"dpl2\", \n" +" \"AudioMixdown\": \"stereo\", \n" " \"AudioNormalizeMixLevel\": false, \n" " \"AudioSamplerate\": \"auto\", \n" " \"AudioTrackDRCSlider\": 0.0, \n" @@ -1803,7 +1803,7 @@ const char hb_builtin_presets_json[] = " \"PictureDetelecineCustom\": \"\", \n" " \"PictureForceHeight\": 0, \n" " \"PictureForceWidth\": 0, \n" -" \"PictureHeight\": 720, \n" +" \"PictureHeight\": 480, \n" " \"PictureItuPAR\": false, \n" " \"PictureKeepRatio\": true, \n" " \"PictureLeftCrop\": 0, \n" @@ -1815,9 +1815,9 @@ const char hb_builtin_presets_json[] = " \"PictureRightCrop\": 0, \n" " \"PictureRotate\": \"angle=0:hflip=0\", \n" " \"PictureTopCrop\": 0, \n" -" \"PictureWidth\": 1280, \n" -" \"PresetDescription\": \"Encode up to 2 minutes of video in medium size for Gmail (25 MB or less). H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container.\", \n" -" \"PresetName\": \"Gmail Medium 720p30\", \n" +" \"PictureWidth\": 720, \n" +" \"PresetDescription\": \"Encode up to 5 minutes of video in medium size for Gmail (25 MB or less). H.264 video (up to 480p30) and AAC stereo audio, in an MP4 container.\", \n" +" \"PresetName\": \"Gmail Medium 5 Minutes 480p30\", \n" " \"SubtitleAddCC\": false, \n" " \"SubtitleAddForeignAudioSearch\": true, \n" " \"SubtitleAddForeignAudioSubtitle\": false, \n" @@ -1829,23 +1829,23 @@ const char hb_builtin_presets_json[] = " \"Type\": 0, \n" " \"UsesPictureFilters\": true, \n" " \"UsesPictureSettings\": 1, \n" -" \"VideoAvgBitrate\": 1450, \n" +" \"VideoAvgBitrate\": 500, \n" " \"VideoColorMatrixCode\": 0, \n" " \"VideoEncoder\": \"x264\", \n" " \"VideoFramerate\": \"30\", \n" " \"VideoFramerateMode\": \"pfr\", \n" " \"VideoGrayScale\": false, \n" " \"VideoLevel\": \"3.1\", \n" -" \"VideoOptionExtra\": \"vbv-bufsize=5250:vbv-maxrate=1450\", \n" +" \"VideoOptionExtra\": \"vbv-bufsize=2000:vbv-maxrate=500:aq-mode=2:aq-strength=0.8:direct=auto:analyse=all:deblock=3,2\", \n" " \"VideoPreset\": \"medium\", \n" " \"VideoProfile\": \"main\", \n" " \"VideoQSVAsyncDepth\": 4, \n" " \"VideoQSVDecode\": false, \n" -" \"VideoQualitySlider\": 21.0, \n" +" \"VideoQualitySlider\": 23.0, \n" " \"VideoQualityType\": 2, \n" " \"VideoScaler\": \"swscale\", \n" " \"VideoTune\": \"\", \n" -" \"VideoTurboTwoPass\": true, \n" +" \"VideoTurboTwoPass\": false, \n" " \"VideoTwoPass\": true, \n" " \"x264Option\": \"\", \n" " \"x264UseAdvancedOptions\": false\n" @@ -1858,11 +1858,11 @@ const char hb_builtin_presets_json[] = " \"AudioLanguageList\": [], \n" " \"AudioList\": [\n" " {\n" -" \"AudioBitrate\": 96, \n" +" \"AudioBitrate\": 48, \n" " \"AudioCompressionLevel\": -1.0, \n" " \"AudioDitherMethod\": \"auto\", \n" " \"AudioEncoder\": \"aac\", \n" -" \"AudioMixdown\": \"stereo\", \n" +" \"AudioMixdown\": \"mono\", \n" " \"AudioNormalizeMixLevel\": false, \n" " \"AudioSamplerate\": \"auto\", \n" " \"AudioTrackDRCSlider\": 0.0, \n" @@ -1899,7 +1899,7 @@ const char hb_builtin_presets_json[] = " \"PictureDetelecineCustom\": \"\", \n" " \"PictureForceHeight\": 0, \n" " \"PictureForceWidth\": 0, \n" -" \"PictureHeight\": 360, \n" +" \"PictureHeight\": 288, \n" " \"PictureItuPAR\": false, \n" " \"PictureKeepRatio\": true, \n" " \"PictureLeftCrop\": 0, \n" @@ -1911,9 +1911,9 @@ const char hb_builtin_presets_json[] = " \"PictureRightCrop\": 0, \n" " \"PictureRotate\": \"angle=0:hflip=0\", \n" " \"PictureTopCrop\": 0, \n" -" \"PictureWidth\": 640, \n" -" \"PresetDescription\": \"Encode up to 5 minutes of video in small size for Gmail (25 MB or less). H.264 video (up to 360p30) and AAC stereo audio, in an MP4 container.\", \n" -" \"PresetName\": \"Gmail Small 360p30\", \n" +" \"PictureWidth\": 384, \n" +" \"PresetDescription\": \"Encode up to 10 minutes of video in small size for Gmail (25 MB or less). H.264 video (up to 288p30) and AAC mono audio, in an MP4 container.\", \n" +" \"PresetName\": \"Gmail Small 10 Minutes 288p30\", \n" " \"SubtitleAddCC\": false, \n" " \"SubtitleAddForeignAudioSearch\": true, \n" " \"SubtitleAddForeignAudioSubtitle\": false, \n" @@ -1925,23 +1925,23 @@ const char hb_builtin_presets_json[] = " \"Type\": 0, \n" " \"UsesPictureFilters\": true, \n" " \"UsesPictureSettings\": 1, \n" -" \"VideoAvgBitrate\": 550, \n" +" \"VideoAvgBitrate\": 250, \n" " \"VideoColorMatrixCode\": 0, \n" " \"VideoEncoder\": \"x264\", \n" " \"VideoFramerate\": \"30\", \n" " \"VideoFramerateMode\": \"pfr\", \n" " \"VideoGrayScale\": false, \n" " \"VideoLevel\": \"3.1\", \n" -" \"VideoOptionExtra\": \"vbv-bufsize=2000:vbv-maxrate=550\", \n" +" \"VideoOptionExtra\": \"vbv-bufsize=1000:vbv-maxrate=250:aq-mode=2:aq-strength=0.8:direct=auto:analyse=all:deblock=3,2\", \n" " \"VideoPreset\": \"medium\", \n" " \"VideoProfile\": \"main\", \n" " \"VideoQSVAsyncDepth\": 4, \n" " \"VideoQSVDecode\": false, \n" -" \"VideoQualitySlider\": 22.0, \n" +" \"VideoQualitySlider\": 23.0, \n" " \"VideoQualityType\": 2, \n" " \"VideoScaler\": \"swscale\", \n" " \"VideoTune\": \"\", \n" -" \"VideoTurboTwoPass\": true, \n" +" \"VideoTurboTwoPass\": false, \n" " \"VideoTwoPass\": true, \n" " \"x264Option\": \"\", \n" " \"x264UseAdvancedOptions\": false\n" @@ -7133,7 +7133,7 @@ const char hb_builtin_presets_json[] = " \"x264Option\": \"\", \n" " \"x264UseAdvancedOptions\": false\n" " }, \n" -" \"VersionMajor\": 22, \n" +" \"VersionMajor\": 23, \n" " \"VersionMicro\": 0, \n" " \"VersionMinor\": 0\n" " }\n" diff --git a/preset/preset_builtin.json b/preset/preset_builtin.json index 0d4418e8f..5b5d53ccd 100644 --- a/preset/preset_builtin.json +++ b/preset/preset_builtin.json @@ -1713,11 +1713,11 @@ ], "AudioList": [ { - "AudioBitrate": 160, + "AudioBitrate": 96, "AudioCompressionLevel": -1.0, "AudioDitherMethod": "auto", "AudioEncoder": "aac", - "AudioMixdown": "dpl2", + "AudioMixdown": "stereo", "AudioNormalizeMixLevel": false, "AudioSamplerate": "auto", "AudioTrackQualityEnable": false, @@ -1764,12 +1764,12 @@ "PicturePARWidth": 853, "PicturePARHeight": 720, "PictureRotate": "angle=0:hflip=0", - "PictureWidth": 1920, - "PictureHeight": 1080, + "PictureWidth": 1280, + "PictureHeight": 720, "PictureForceHeight": 0, "PictureForceWidth": 0, - "PresetDescription": "Encode up to 1 minute of video in large size for Gmail (25 MB or less). H.264 video (up to 1080p30) and AAC stereo audio, in an MP4 container.", - "PresetName": "Gmail Large 1080p30", + "PresetDescription": "Encode up to 3 minutes of video in large size for Gmail (25 MB or less). H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container.", + "PresetName": "Gmail Large 3 Minutes 720p30", "Type": 0, "UsesPictureFilters": true, "UsesPictureSettings": 1, @@ -1782,7 +1782,7 @@ "SubtitleLanguageList": [ ], "SubtitleTrackSelectionBehavior": "none", - "VideoAvgBitrate": 2750, + "VideoAvgBitrate": 900, "VideoColorMatrixCode": 0, "VideoEncoder": "x264", "VideoFramerate": "30", @@ -1792,14 +1792,14 @@ "VideoPreset": "medium", "VideoTune": "", "VideoProfile": "main", - "VideoLevel": "4.0", - "VideoOptionExtra": "vbv-bufsize=9950:vbv-maxrate=2750", + "VideoLevel": "3.1", + "VideoOptionExtra": "vbv-bufsize=3600:vbv-maxrate=900:aq-mode=2:aq-strength=0.8:direct=auto:analyse=all:deblock=3,2", "VideoQualityType": 2, - "VideoQualitySlider": 22.0, + "VideoQualitySlider": 23.0, "VideoQSVDecode": false, "VideoQSVAsyncDepth": 4, "VideoTwoPass": true, - "VideoTurboTwoPass": true, + "VideoTurboTwoPass": false, "x264Option": "", "x264UseAdvancedOptions": false }, @@ -1812,11 +1812,11 @@ ], "AudioList": [ { - "AudioBitrate": 160, + "AudioBitrate": 96, "AudioCompressionLevel": -1.0, "AudioDitherMethod": "auto", "AudioEncoder": "aac", - "AudioMixdown": "dpl2", + "AudioMixdown": "stereo", "AudioNormalizeMixLevel": false, "AudioSamplerate": "auto", "AudioTrackQualityEnable": false, @@ -1863,12 +1863,12 @@ "PicturePARWidth": 853, "PicturePARHeight": 720, "PictureRotate": "angle=0:hflip=0", - "PictureWidth": 1280, - "PictureHeight": 720, + "PictureWidth": 720, + "PictureHeight": 480, "PictureForceHeight": 0, "PictureForceWidth": 0, - "PresetDescription": "Encode up to 2 minutes of video in medium size for Gmail (25 MB or less). H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container.", - "PresetName": "Gmail Medium 720p30", + "PresetDescription": "Encode up to 5 minutes of video in medium size for Gmail (25 MB or less). H.264 video (up to 480p30) and AAC stereo audio, in an MP4 container.", + "PresetName": "Gmail Medium 5 Minutes 480p30", "Type": 0, "UsesPictureFilters": true, "UsesPictureSettings": 1, @@ -1881,7 +1881,7 @@ "SubtitleLanguageList": [ ], "SubtitleTrackSelectionBehavior": "none", - "VideoAvgBitrate": 1450, + "VideoAvgBitrate": 500, "VideoColorMatrixCode": 0, "VideoEncoder": "x264", "VideoFramerate": "30", @@ -1892,13 +1892,13 @@ "VideoTune": "", "VideoProfile": "main", "VideoLevel": "3.1", - "VideoOptionExtra": "vbv-bufsize=5250:vbv-maxrate=1450", + "VideoOptionExtra": "vbv-bufsize=2000:vbv-maxrate=500:aq-mode=2:aq-strength=0.8:direct=auto:analyse=all:deblock=3,2", "VideoQualityType": 2, - "VideoQualitySlider": 21.0, + "VideoQualitySlider": 23.0, "VideoQSVDecode": false, "VideoQSVAsyncDepth": 4, "VideoTwoPass": true, - "VideoTurboTwoPass": true, + "VideoTurboTwoPass": false, "x264Option": "", "x264UseAdvancedOptions": false }, @@ -1911,11 +1911,11 @@ ], "AudioList": [ { - "AudioBitrate": 96, + "AudioBitrate": 48, "AudioCompressionLevel": -1.0, "AudioDitherMethod": "auto", "AudioEncoder": "aac", - "AudioMixdown": "stereo", + "AudioMixdown": "mono", "AudioNormalizeMixLevel": false, "AudioSamplerate": "auto", "AudioTrackQualityEnable": false, @@ -1962,12 +1962,12 @@ "PicturePARWidth": 853, "PicturePARHeight": 720, "PictureRotate": "angle=0:hflip=0", - "PictureWidth": 640, - "PictureHeight": 360, + "PictureWidth": 384, + "PictureHeight": 288, "PictureForceHeight": 0, "PictureForceWidth": 0, - "PresetDescription": "Encode up to 5 minutes of video in small size for Gmail (25 MB or less). H.264 video (up to 360p30) and AAC stereo audio, in an MP4 container.", - "PresetName": "Gmail Small 360p30", + "PresetDescription": "Encode up to 10 minutes of video in small size for Gmail (25 MB or less). H.264 video (up to 288p30) and AAC mono audio, in an MP4 container.", + "PresetName": "Gmail Small 10 Minutes 288p30", "Type": 0, "UsesPictureFilters": true, "UsesPictureSettings": 1, @@ -1980,7 +1980,7 @@ "SubtitleLanguageList": [ ], "SubtitleTrackSelectionBehavior": "none", - "VideoAvgBitrate": 550, + "VideoAvgBitrate": 250, "VideoColorMatrixCode": 0, "VideoEncoder": "x264", "VideoFramerate": "30", @@ -1991,13 +1991,13 @@ "VideoTune": "", "VideoProfile": "main", "VideoLevel": "3.1", - "VideoOptionExtra": "vbv-bufsize=2000:vbv-maxrate=550", + "VideoOptionExtra": "vbv-bufsize=1000:vbv-maxrate=250:aq-mode=2:aq-strength=0.8:direct=auto:analyse=all:deblock=3,2", "VideoQualityType": 2, - "VideoQualitySlider": 22.0, + "VideoQualitySlider": 23.0, "VideoQSVDecode": false, "VideoQSVAsyncDepth": 4, "VideoTwoPass": true, - "VideoTurboTwoPass": true, + "VideoTurboTwoPass": false, "x264Option": "", "x264UseAdvancedOptions": false } diff --git a/preset/preset_builtin.list b/preset/preset_builtin.list index 906da84d4..94865423e 100644 --- a/preset/preset_builtin.list +++ b/preset/preset_builtin.list @@ -1,6 +1,6 @@ <resources> <section name="PresetTemplate"> - <integer name="VersionMajor" value="22" /> + <integer name="VersionMajor" value="23" /> <integer name="VersionMinor" value="0" /> <integer name="VersionMicro" value="0" /> <json name="Preset" file="preset_template.json" /> |