From e78cc9a5720b7019d5663cb6c4e0696cb0421662 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Sat, 1 Aug 2009 16:09:51 +0000 Subject: [PATCH] LinGui: accomodate new x264 defaults - presets updated so that they behave as they did before defaults change - added subme 10 option git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2743 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- gtk/src/hb-backend.c | 1 + gtk/src/standard_presets.xml | 1951 +++++++++++++++++----------------- gtk/src/x264handler.c | 24 +- 3 files changed, 993 insertions(+), 983 deletions(-) diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index 4aa1351a8..65f553f47 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -300,6 +300,7 @@ static options_map_t d_subme_opts[] = {"7", "7", 7, "7"}, {"8", "8", 8, "8"}, {"9", "9", 9, "9"}, + {"10", "10", 10, "10"}, }; combo_opts_t subme_opts = { diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml index 1192a2e56..1f8e8c980 100644 --- a/gtk/src/standard_presets.xml +++ b/gtk/src/standard_presets.xml @@ -1,976 +1,975 @@ - - - - - - ChildrenArray - - - AudioList - - - AudioBitrate - 160 - AudioEncoder - AAC (faac) - AudioMixdown - Dolby Pro Logic II - AudioSamplerate - 48 - AudioTrack - 1 - AudioTrackDRCSlider - 0.0 - - - AudioBitrate - 160 - AudioEncoder - AC3 Passthru - AudioMixdown - AC3 Passthru - AudioSamplerate - Auto - AudioTrack - 1 - AudioTrackDRCSlider - 0.0 - - - ChapterMarkers - 1 - Default - 0 - FileFormat - MP4 file - Folder - - Mp4LargeFile - 0 - PictureAutoCrop - 1 - PictureBottomCrop - 0 - PictureDeblock - 0 - PictureDeinterlace - 0 - PictureDenoise - 0 - PictureDetelecine - 0 - PictureHeight - 0 - PictureKeepRatio - 0 - PictureLeftCrop - 0 - PicturePAR - 2 - PictureRightCrop - 0 - PictureTopCrop - 0 - PictureWidth - 720 - PresetDescription - HandBrake's universally compatible, full resolution settings for all current Apple devices: iPod (6G and up), iPhone, AppleTV, and Macs - PresetName - Universal - Subtitles - None - Type - 0 - UsesPictureFilters - 1 - UsesPictureSettings - 1 - VFR - 0 - VideoAvgBitrate - 2500 - VideoEncoder - H.264 (x264) - VideoFramerate - Same as source - VideoGrayScale - 0 - VideoQualitySlider - 20 - VideoQualityType - 2 - VideoTargetSize - 700 - VideoTwoPass - 0 - x264Option - cabac=0:ref=2:mixed-refs=1:me=umh - - - AudioList - - - AudioBitrate - 160 - AudioEncoder - AAC (faac) - AudioMixdown - Dolby Pro Logic II - AudioSamplerate - 48 - AudioTrack - 1 - AudioTrackDRCSlider - 0.0 - - - ChapterMarkers - 1 - Default - 0 - FileFormat - MP4 file - Mp4iPodCompatible - 1 - PictureAutoCrop - 1 - PictureBottomCrop - 0 - PictureDeblock - 0 - PictureDeinterlace - 0 - PictureDenoise - 0 - PictureDetelecine - 0 - PictureHeight - 0 - PictureKeepRatio - 1 - PictureLeftCrop - 0 - PicturePAR - 0 - PictureRightCrop - 0 - PictureTopCrop - 0 - PictureWidth - 320 - PresetDescription - HandBrake's low resolution settings for the iPod (5G and up). Optimized for great playback on the iPod screen, with smaller file size. - PresetName - iPod - Subtitles - None - Type - 0 - UsesMaxPictureSettings - 0 - UsesPictureFilters - 1 - UsesPictureSettings - 1 - VFR - 0 - VideoAvgBitrate - 700 - VideoEncoder - H.264 (x264) - VideoFramerate - Same as source - VideoGrayScale - 0 - VideoQualitySlider - 0.64709997177124023 - VideoQualityType - 1 - VideoTargetSize - 700 - VideoTwoPass - 0 - x264Option - level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1 - - - AudioList - - - AudioBitrate - 128 - AudioEncoder - AAC (faac) - AudioMixdown - Dolby Pro Logic II - AudioSamplerate - 48 - AudioTrack - 1 - AudioTrackDRCSlider - 0.0 - - - ChapterMarkers - 1 - Default - 0 - FileFormat - MP4 file - Mp4iPodCompatible - 0 - PictureAutoCrop - 1 - PictureBottomCrop - 0 - PictureDeblock - 0 - PictureDeinterlace - 0 - PictureDenoise - 0 - PictureDetelecine - 0 - PictureHeight - 0 - PictureKeepRatio - 1 - PictureLeftCrop - 0 - PicturePAR - 0 - PictureRightCrop - 0 - PictureTopCrop - 0 - PictureWidth - 480 - PresetDescription - HandBrake's settings for the iPhone and iPod Touch. - PresetName - iPhone & iPod Touch - Subtitles - None - Type - 0 - UsesMaxPictureSettings - 0 - UsesPictureFilters - 1 - UsesPictureSettings - 1 - VFR - 0 - VideoAvgBitrate - 960 - VideoEncoder - H.264 (x264) - VideoFramerate - Same as source - VideoGrayScale - 0 - VideoQualitySlider - 20 - VideoQualityType - 2 - VideoTargetSize - 700 - VideoTwoPass - 0 - x264Option - cabac=0:ref=2:mixed-refs:me=umh - - - AudioList - - - AudioBitrate - 160 - AudioEncoder - AAC (faac) - AudioMixdown - Dolby Pro Logic II - AudioSamplerate - 48 - AudioTrack - 1 - AudioTrackDRCSlider - 0.0 - - - AudioBitrate - 160 - AudioEncoder - AC3 Passthru - AudioMixdown - AC3 Passthru - AudioSamplerate - Auto - AudioTrack - 1 - AudioTrackDRCSlider - 0.0 - - - ChapterMarkers - 1 - Default - 0 - FileFormat - MP4 file - Folder - - Mp4LargeFile - 1 - PictureAutoCrop - 1 - PictureBottomCrop - 0 - PictureDeblock - 0 - PictureDeinterlace - 0 - PictureDenoise - 0 - PictureDetelecine - 0 - PictureHeight - 0 - PictureKeepRatio - 0 - PictureLeftCrop - 0 - PicturePAR - 2 - PictureRightCrop - 0 - PictureTopCrop - 0 - PictureWidth - 960 - PresetDescription - HandBrake's settings for the AppleTV, including Dolby Digital 5.1 AC3 sound. Provides a good balance between quality and file size, and pushes the AppleTV to its limits. - PresetName - AppleTV - Subtitles - None - Type - 0 - UsesPictureFilters - 1 - UsesPictureSettings - 1 - VFR - 0 - VideoAvgBitrate - 2500 - VideoEncoder - H.264 (x264) - VideoFramerate - Same as source - VideoGrayScale - 0 - VideoQualitySlider - 20 - VideoQualityType - 2 - VideoTargetSize - 700 - VideoTwoPass - 0 - x264Option - cabac=0:ref=2:mixed-refs=1:bframes=3:me=umh:subme=7:b-adapt=2:8x8dct=1 - - - Default - 0 - Folder - - PresetBuildNumber - 2009060401 - PresetName - Apple - Type - 0 - - - ChildrenArray - - - AudioList - - - AudioBitrate - 160 - AudioEncoder - AAC (faac) - AudioMixdown - Dolby Pro Logic II - AudioSamplerate - 48 - AudioTrack - 1 - AudioTrackDRCSlider - 0.0 - - - ChapterMarkers - 1 - Default - 1 - FileFormat - MP4 file - PictureAutoCrop - 1 - PictureBottomCrop - 0 - PictureDeblock - 0 - PictureDeinterlace - 0 - PictureDenoise - 0 - PictureDetelecine - 0 - PictureHeight - 0 - PictureKeepRatio - 0 - PictureLeftCrop - 0 - PicturePAR - 1 - PictureRightCrop - 0 - PictureTopCrop - 0 - PictureWidth - 0 - PresetDescription - HandBrake's normal, default settings. - PresetName - Normal - Subtitles - None - Type - 0 - UsesMaxPictureSettings - 1 - UsesPictureFilters - 1 - UsesPictureSettings - 1 - VFR - 0 - VideoAvgBitrate - 1500 - VideoEncoder - H.264 (x264) - VideoFramerate - Same as source - VideoGrayScale - 0 - VideoQualitySlider - 20 - VideoQualityType - 2 - VideoTargetSize - 700 - VideoTurboTwoPass - 0 - VideoTwoPass - 0 - x264Option - ref=2:bframes=2:me=umh - - - AudioList - - - AudioBitrate - 160 - AudioEncoder - AAC (faac) - AudioMixdown - Dolby Pro Logic II - AudioSamplerate - 48 - AudioTrack - 1 - AudioTrackDRCSlider - 0.0 - - - AudioBitrate - 160 - AudioEncoder - AC3 Passthru - AudioMixdown - AC3 Passthru - AudioSamplerate - Auto - AudioTrack - 1 - AudioTrackDRCSlider - 0.0 - - - ChapterMarkers - 1 - Default - 0 - FileFormat - MP4 file - PictureAutoCrop - 1 - PictureBottomCrop - 0 - PictureDeblock - 0 - PictureDecomb - 1 - PictureDeinterlace - 0 - PictureDenoise - 0 - PictureDetelecine - 1 - PictureHeight - 0 - PictureKeepRatio - 0 - PictureLeftCrop - 0 - PicturePAR - 2 - PictureRightCrop - 0 - PictureTopCrop - 0 - PictureWidth - 0 - PresetDescription - HandBrake's general-purpose preset for High Profile H.264 video, with all the bells and whistles. - PresetName - High Profile - Subtitles - None - Type - 0 - UsesMaxPictureSettings - 1 - UsesPictureFilters - 1 - UsesPictureSettings - 1 - VideoAvgBitrate - 1800 - VideoEncoder - H.264 (x264) - VideoFramerate - Same as source - VideoGrayScale - 0 - VideoQualitySlider - 20 - VideoQualityType - 2 - VideoTargetSize - 700 - VideoTurboTwoPass - 0 - VideoTwoPass - 0 - x264Option - ref=3:mixed-refs:bframes=3:weightb:b-pyramid:b-adapt=2:me=umh:subme=9:analyse=all:8x8dct - - - Default - 0 - Folder - - PresetBuildNumber - 2009060401 - PresetName - Regular - Type - 0 - - - ChildrenArray - - - AudioList - - - AudioBitrate - 160 - AudioEncoder - AAC (faac) - AudioMixdown - Dolby Pro Logic II - AudioSamplerate - 48 - AudioTrack - 1 - AudioTrackDRCSlider - 0.0 - - - ChapterMarkers - 0 - Default - 0 - FileFormat - MP4 file - PictureAutoCrop - 1 - PictureBottomCrop - 0 - PictureDeblock - 0 - PictureDeinterlace - 0 - PictureDenoise - 0 - PictureDetelecine - 0 - PictureHeight - 0 - PictureKeepRatio - 1 - PictureLeftCrop - 0 - PicturePAR - 0 - PictureRightCrop - 0 - PictureTopCrop - 0 - PictureWidth - 0 - PresetDescription - HandBrake's traditional, faster, lower-quality settings. - PresetName - Classic - Subtitles - None - Type - 0 - UsesMaxPictureSettings - 1 - UsesPictureFilters - 1 - UsesPictureSettings - 1 - VFR - 0 - VideoAvgBitrate - 1000 - VideoEncoder - MPEG-4 (FFmpeg) - VideoFramerate - Same as source - VideoGrayScale - 0 - VideoQualitySlider - 0.64709997177124023 - VideoQualityType - 1 - VideoTargetSize - 700 - VideoTwoPass - 0 - x264Option - - - - AudioList - - - AudioBitrate - 160 - AudioEncoder - AAC (faac) - AudioMixdown - Dolby Pro Logic II - AudioSamplerate - 48 - AudioTrack - 1 - AudioTrackDRCSlider - 0.0 - - - AudioBitrate - 160 - AudioEncoder - AC3 Passthru - AudioMixdown - AC3 Passthru - AudioSamplerate - Auto - AudioTrack - 1 - AudioTrackDRCSlider - 0.0 - - - ChapterMarkers - 1 - Default - 0 - FileFormat - MP4 file - Mp4LargeFile - 1 - PictureAutoCrop - 1 - PictureBottomCrop - 0 - PictureDeblock - 0 - PictureDeinterlace - 0 - PictureDenoise - 0 - PictureDetelecine - 0 - PictureHeight - 0 - PictureKeepRatio - 0 - PictureLeftCrop - 0 - PicturePAR - 1 - PictureRightCrop - 0 - PictureTopCrop - 0 - PictureWidth - 0 - PresetDescription - HandBrake's deprecated settings for the AppleTV, including Dolby Digital 5.1 AC3 sound. Provides a good balance between quality and file size, and optimizes performance. This is the AppleTV preset from HandBrake 0.9.2, and while it is offered as a service to legacy users, it is no longer supported. - PresetName - AppleTV Legacy - Subtitles - None - Type - 0 - UsesMaxPictureSettings - 1 - UsesPictureFilters - 1 - UsesPictureSettings - 1 - VFR - 0 - VideoAvgBitrate - 2500 - VideoEncoder - H.264 (x264) - VideoFramerate - Same as source - VideoGrayScale - 0 - VideoQualitySlider - 0.64709997177124023 - VideoQualityType - 1 - VideoTargetSize - 700 - VideoTwoPass - 0 - x264Option - bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:cabac=0 - - - AudioList - - - AudioBitrate - 128 - AudioEncoder - AAC (faac) - AudioMixdown - Dolby Pro Logic II - AudioSamplerate - 48 - AudioTrack - 1 - AudioTrackDRCSlider - 0.0 - - - ChapterMarkers - 1 - Default - 0 - FileFormat - MP4 file - Mp4iPodCompatible - 1 - PictureAutoCrop - 1 - PictureBottomCrop - 0 - PictureDeblock - 0 - PictureDeinterlace - 0 - PictureDenoise - 0 - PictureDetelecine - 0 - PictureHeight - 0 - PictureKeepRatio - 1 - PictureLeftCrop - 0 - PicturePAR - 0 - PictureRightCrop - 0 - PictureTopCrop - 0 - PictureWidth - 480 - PresetDescription - HandBrake's deprecated settings for the iPhone and iPod Touch. This is the iPhone preset from HandBrake 0.9.2, and while it is offered as a service to legacy users, it is no longer supported. - PresetName - iPhone Legacy - Subtitles - None - Type - 0 - UsesMaxPictureSettings - 0 - UsesPictureFilters - 1 - UsesPictureSettings - 1 - VFR - 0 - VideoAvgBitrate - 960 - VideoEncoder - H.264 (x264) - VideoFramerate - Same as source - VideoGrayScale - 0 - VideoQualitySlider - 0.64709997177124023 - VideoQualityType - 1 - VideoTargetSize - 700 - VideoTwoPass - 0 - x264Option - level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0 - - - AudioList - - - AudioBitrate - 160 - AudioEncoder - AAC (faac) - AudioMixdown - Dolby Pro Logic II - AudioSamplerate - 48 - AudioTrack - 1 - AudioTrackDRCSlider - 0.0 - - - ChapterMarkers - 1 - Default - 0 - FileFormat - MP4 file - Mp4iPodCompatible - 1 - PictureAutoCrop - 1 - PictureBottomCrop - 0 - PictureDeblock - 0 - PictureDeinterlace - 0 - PictureDenoise - 0 - PictureDetelecine - 0 - PictureHeight - 0 - PictureKeepRatio - 1 - PictureLeftCrop - 0 - PicturePAR - 0 - PictureRightCrop - 0 - PictureTopCrop - 0 - PictureWidth - 640 - PresetDescription - HandBrake's high resolution settings for older 5 and 5.5G iPods. Good video quality, great for viewing on a TV using your iPod. This is the iPod High-Rez preset from 0.9.2. - PresetName - iPod Legacy - Subtitles - None - Type - 0 - UsesMaxPictureSettings - 0 - UsesPictureFilters - 1 - UsesPictureSettings - 1 - VFR - 0 - VideoAvgBitrate - 1500 - VideoEncoder - H.264 (x264) - VideoFramerate - Same as source - VideoGrayScale - 0 - VideoQualitySlider - 0.64709997177124023 - VideoQualityType - 1 - VideoTargetSize - 700 - VideoTwoPass - 0 - x264Option - level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0 - - - Default - 0 - Folder - - PresetBuildNumber - 2009060401 - PresetName - Legacy - Type - 0 - - - - + + + + + + ChildrenArray + + + AudioList + + + AudioBitrate + 160 + AudioEncoder + AAC (faac) + AudioMixdown + Dolby Pro Logic II + AudioSamplerate + 48 + AudioTrack + 1 + AudioTrackDRCSlider + 0.0 + + + AudioBitrate + 160 + AudioEncoder + AC3 Passthru + AudioMixdown + AC3 Passthru + AudioSamplerate + Auto + AudioTrack + 1 + AudioTrackDRCSlider + 0.0 + + + ChapterMarkers + 1 + Default + 0 + FileFormat + MP4 file + Folder + + Mp4LargeFile + 0 + PictureAutoCrop + 1 + PictureBottomCrop + 0 + PictureDeblock + 0 + PictureDeinterlace + 0 + PictureDenoise + 0 + PictureDetelecine + 0 + PictureHeight + 0 + PictureKeepRatio + 0 + PictureLeftCrop + 0 + PicturePAR + 2 + PictureRightCrop + 0 + PictureTopCrop + 0 + PictureWidth + 720 + PresetDescription + HandBrake's universally compatible, full resolution settings for all current Apple devices: iPod (6G and up), iPhone, AppleTV, and Macs + PresetName + Universal + Subtitles + None + Type + 0 + UsesPictureFilters + 1 + UsesPictureSettings + 1 + VFR + 0 + VideoAvgBitrate + 2500 + VideoEncoder + H.264 (x264) + VideoFramerate + Same as source + VideoGrayScale + 0 + VideoQualitySlider + 20 + VideoQualityType + 2 + VideoTargetSize + 700 + VideoTwoPass + 0 + x264Option + cabac=0:ref=2:me=umh:bframes=0:8x8dct=0:trellis=0:subme=6 + + + AudioList + + + AudioBitrate + 160 + AudioEncoder + AAC (faac) + AudioMixdown + Dolby Pro Logic II + AudioSamplerate + 48 + AudioTrack + 1 + AudioTrackDRCSlider + 0.0 + + + ChapterMarkers + 1 + Default + 0 + FileFormat + MP4 file + Mp4iPodCompatible + 1 + PictureAutoCrop + 1 + PictureBottomCrop + 0 + PictureDeblock + 0 + PictureDeinterlace + 0 + PictureDenoise + 0 + PictureDetelecine + 0 + PictureHeight + 0 + PictureKeepRatio + 1 + PictureLeftCrop + 0 + PicturePAR + 0 + PictureRightCrop + 0 + PictureTopCrop + 0 + PictureWidth + 320 + PresetDescription + HandBrake's low resolution settings for the iPod (5G and up). Optimized for great playback on the iPod screen, with smaller file size. + PresetName + iPod + Subtitles + None + Type + 0 + UsesMaxPictureSettings + 0 + UsesPictureFilters + 1 + UsesPictureSettings + 1 + VFR + 0 + VideoAvgBitrate + 700 + VideoEncoder + H.264 (x264) + VideoFramerate + Same as source + VideoGrayScale + 0 + VideoQualitySlider + 0.64709997177124023 + VideoQualityType + 1 + VideoTargetSize + 700 + VideoTwoPass + 0 + x264Option + level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subme=6:8x8dct=0:trellis=0 + + + AudioList + + + AudioBitrate + 128 + AudioEncoder + AAC (faac) + AudioMixdown + Dolby Pro Logic II + AudioSamplerate + 48 + AudioTrack + 1 + AudioTrackDRCSlider + 0.0 + + + ChapterMarkers + 1 + Default + 0 + FileFormat + MP4 file + Mp4iPodCompatible + 0 + PictureAutoCrop + 1 + PictureBottomCrop + 0 + PictureDeblock + 0 + PictureDeinterlace + 0 + PictureDenoise + 0 + PictureDetelecine + 0 + PictureHeight + 0 + PictureKeepRatio + 1 + PictureLeftCrop + 0 + PicturePAR + 0 + PictureRightCrop + 0 + PictureTopCrop + 0 + PictureWidth + 480 + PresetDescription + HandBrake's settings for the iPhone and iPod Touch. + PresetName + iPhone & iPod Touch + Subtitles + None + Type + 0 + UsesMaxPictureSettings + 0 + UsesPictureFilters + 1 + UsesPictureSettings + 1 + VFR + 0 + VideoAvgBitrate + 960 + VideoEncoder + H.264 (x264) + VideoFramerate + Same as source + VideoGrayScale + 0 + VideoQualitySlider + 20 + VideoQualityType + 2 + VideoTargetSize + 700 + VideoTwoPass + 0 + x264Option + cabac=0:ref=2:me=umh:bframes=0:subme=6:8x8dct=0:trellis=0 + + + AudioList + + + AudioBitrate + 160 + AudioEncoder + AAC (faac) + AudioMixdown + Dolby Pro Logic II + AudioSamplerate + 48 + AudioTrack + 1 + AudioTrackDRCSlider + 0.0 + + + AudioBitrate + 160 + AudioEncoder + AC3 Passthru + AudioMixdown + AC3 Passthru + AudioSamplerate + Auto + AudioTrack + 1 + AudioTrackDRCSlider + 0.0 + + + ChapterMarkers + 1 + Default + 0 + FileFormat + MP4 file + Folder + + Mp4LargeFile + 1 + PictureAutoCrop + 1 + PictureBottomCrop + 0 + PictureDeblock + 0 + PictureDeinterlace + 0 + PictureDenoise + 0 + PictureDetelecine + 0 + PictureHeight + 0 + PictureKeepRatio + 0 + PictureLeftCrop + 0 + PicturePAR + 2 + PictureRightCrop + 0 + PictureTopCrop + 0 + PictureWidth + 960 + PresetDescription + HandBrake's settings for the AppleTV, including Dolby Digital 5.1 AC3 sound. Provides a good balance between quality and file size, and pushes the AppleTV to its limits. + PresetName + AppleTV + Subtitles + None + Type + 0 + UsesPictureFilters + 1 + UsesPictureSettings + 1 + VFR + 0 + VideoAvgBitrate + 2500 + VideoEncoder + H.264 (x264) + VideoFramerate + Same as source + VideoGrayScale + 0 + VideoQualitySlider + 20 + VideoQualityType + 2 + VideoTargetSize + 700 + VideoTwoPass + 0 + x264Option + cabac=0:ref=2:me=umh:b-adapt=2:weightb=0:trellis=0 + + + Default + 0 + Folder + + PresetBuildNumber + 2009073001 + PresetName + Apple + Type + 0 + + + ChildrenArray + + + AudioList + + + AudioBitrate + 160 + AudioEncoder + AAC (faac) + AudioMixdown + Dolby Pro Logic II + AudioSamplerate + 48 + AudioTrack + 1 + AudioTrackDRCSlider + 0.0 + + + ChapterMarkers + 1 + Default + 1 + FileFormat + MP4 file + PictureAutoCrop + 1 + PictureBottomCrop + 0 + PictureDeblock + 0 + PictureDeinterlace + 0 + PictureDenoise + 0 + PictureDetelecine + 0 + PictureHeight + 0 + PictureKeepRatio + 0 + PictureLeftCrop + 0 + PicturePAR + 1 + PictureRightCrop + 0 + PictureTopCrop + 0 + PictureWidth + 0 + PresetDescription + HandBrake's normal, default settings. + PresetName + Normal + Subtitles + None + Type + 0 + UsesMaxPictureSettings + 1 + UsesPictureFilters + 1 + UsesPictureSettings + 1 + VFR + 0 + VideoAvgBitrate + 1500 + VideoEncoder + H.264 (x264) + VideoFramerate + Same as source + VideoGrayScale + 0 + VideoQualitySlider + 20 + VideoQualityType + 2 + VideoTargetSize + 700 + VideoTurboTwoPass + 0 + VideoTwoPass + 0 + x264Option + ref=2:bframes=2:me=umh:subme=6:mixed-refs=0:weightb=0:8x8dct=0:trellis=0 + + + AudioList + + + AudioBitrate + 160 + AudioEncoder + AAC (faac) + AudioMixdown + Dolby Pro Logic II + AudioSamplerate + 48 + AudioTrack + 1 + AudioTrackDRCSlider + 0.0 + + + AudioBitrate + 160 + AudioEncoder + AC3 Passthru + AudioMixdown + AC3 Passthru + AudioSamplerate + Auto + AudioTrack + 1 + AudioTrackDRCSlider + 0.0 + + + ChapterMarkers + 1 + Default + 0 + FileFormat + MP4 file + PictureAutoCrop + 1 + PictureBottomCrop + 0 + PictureDeblock + 0 + PictureDecomb + 1 + PictureDeinterlace + 0 + PictureDenoise + 0 + PictureDetelecine + 1 + PictureHeight + 0 + PictureKeepRatio + 0 + PictureLeftCrop + 0 + PicturePAR + 2 + PictureRightCrop + 0 + PictureTopCrop + 0 + PictureWidth + 0 + PresetDescription + HandBrake's general-purpose preset for High Profile H.264 video, with all the bells and whistles. + PresetName + High Profile + Subtitles + None + Type + 0 + UsesMaxPictureSettings + 1 + UsesPictureFilters + 1 + UsesPictureSettings + 1 + VideoAvgBitrate + 1800 + VideoEncoder + H.264 (x264) + VideoFramerate + Same as source + VideoGrayScale + 0 + VideoQualitySlider + 20 + VideoQualityType + 2 + VideoTargetSize + 700 + VideoTurboTwoPass + 0 + VideoTwoPass + 0 + x264Option + b-pyramid:b-adapt=2:me=umh:subme=9:analyse=all:trellis=0 + + + Default + 0 + Folder + + PresetBuildNumber + 2009073001 + PresetName + Regular + Type + 0 + + + ChildrenArray + + + AudioList + + + AudioBitrate + 160 + AudioEncoder + AAC (faac) + AudioMixdown + Dolby Pro Logic II + AudioSamplerate + 48 + AudioTrack + 1 + AudioTrackDRCSlider + 0.0 + + + ChapterMarkers + 0 + Default + 0 + FileFormat + MP4 file + PictureAutoCrop + 1 + PictureBottomCrop + 0 + PictureDeblock + 0 + PictureDeinterlace + 0 + PictureDenoise + 0 + PictureDetelecine + 0 + PictureHeight + 0 + PictureKeepRatio + 1 + PictureLeftCrop + 0 + PicturePAR + 0 + PictureRightCrop + 0 + PictureTopCrop + 0 + PictureWidth + 0 + PresetDescription + HandBrake's traditional, faster, lower-quality settings. + PresetName + Classic + Subtitles + None + Type + 0 + UsesMaxPictureSettings + 1 + UsesPictureFilters + 1 + UsesPictureSettings + 1 + VFR + 0 + VideoAvgBitrate + 1000 + VideoEncoder + MPEG-4 (FFmpeg) + VideoFramerate + Same as source + VideoGrayScale + 0 + VideoQualitySlider + 0.64709997177124023 + VideoQualityType + 1 + VideoTargetSize + 700 + VideoTwoPass + 0 + x264Option + + + + AudioList + + + AudioBitrate + 160 + AudioEncoder + AAC (faac) + AudioMixdown + Dolby Pro Logic II + AudioSamplerate + 48 + AudioTrack + 1 + AudioTrackDRCSlider + 0.0 + + + AudioBitrate + 160 + AudioEncoder + AC3 Passthru + AudioMixdown + AC3 Passthru + AudioSamplerate + Auto + AudioTrack + 1 + AudioTrackDRCSlider + 0.0 + + + ChapterMarkers + 1 + Default + 0 + FileFormat + MP4 file + Mp4LargeFile + 1 + PictureAutoCrop + 1 + PictureBottomCrop + 0 + PictureDeblock + 0 + PictureDeinterlace + 0 + PictureDenoise + 0 + PictureDetelecine + 0 + PictureHeight + 0 + PictureKeepRatio + 0 + PictureLeftCrop + 0 + PicturePAR + 1 + PictureRightCrop + 0 + PictureTopCrop + 0 + PictureWidth + 0 + PresetDescription + HandBrake's deprecated settings for the AppleTV, including Dolby Digital 5.1 AC3 sound. Provides a good balance between quality and file size, and optimizes performance. This is the AppleTV preset from HandBrake 0.9.2, and while it is offered as a service to legacy users, it is no longer supported. + PresetName + AppleTV Legacy + Subtitles + None + Type + 0 + UsesMaxPictureSettings + 1 + UsesPictureFilters + 1 + UsesPictureSettings + 1 + VFR + 0 + VideoAvgBitrate + 2500 + VideoEncoder + H.264 (x264) + VideoFramerate + Same as source + VideoGrayScale + 0 + VideoQualitySlider + 0.64709997177124023 + VideoQualityType + 1 + VideoTargetSize + 700 + VideoTwoPass + 0 + x264Option + ref=1:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0 + + + AudioList + + + AudioBitrate + 128 + AudioEncoder + AAC (faac) + AudioMixdown + Dolby Pro Logic II + AudioSamplerate + 48 + AudioTrack + 1 + AudioTrackDRCSlider + 0.0 + + + ChapterMarkers + 1 + Default + 0 + FileFormat + MP4 file + Mp4iPodCompatible + 1 + PictureAutoCrop + 1 + PictureBottomCrop + 0 + PictureDeblock + 0 + PictureDeinterlace + 0 + PictureDenoise + 0 + PictureDetelecine + 0 + PictureHeight + 0 + PictureKeepRatio + 1 + PictureLeftCrop + 0 + PicturePAR + 0 + PictureRightCrop + 0 + PictureTopCrop + 0 + PictureWidth + 480 + PresetDescription + HandBrake's deprecated settings for the iPhone and iPod Touch. This is the iPhone preset from HandBrake 0.9.2, and while it is offered as a service to legacy users, it is no longer supported. + PresetName + iPhone Legacy + Subtitles + None + Type + 0 + UsesMaxPictureSettings + 0 + UsesPictureFilters + 1 + UsesPictureSettings + 1 + VFR + 0 + VideoAvgBitrate + 960 + VideoEncoder + H.264 (x264) + VideoFramerate + Same as source + VideoGrayScale + 0 + VideoQualitySlider + 0.64709997177124023 + VideoQualityType + 1 + VideoTargetSize + 700 + VideoTwoPass + 0 + x264Option + level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:bframes=0:subme=6:8x8dct=0:trellis=0 + + + AudioList + + + AudioBitrate + 160 + AudioEncoder + AAC (faac) + AudioMixdown + Dolby Pro Logic II + AudioSamplerate + 48 + AudioTrack + 1 + AudioTrackDRCSlider + 0.0 + + + ChapterMarkers + 1 + Default + 0 + FileFormat + MP4 file + Mp4iPodCompatible + 1 + PictureAutoCrop + 1 + PictureBottomCrop + 0 + PictureDeblock + 0 + PictureDeinterlace + 0 + PictureDenoise + 0 + PictureDetelecine + 0 + PictureHeight + 0 + PictureKeepRatio + 1 + PictureLeftCrop + 0 + PicturePAR + 0 + PictureRightCrop + 0 + PictureTopCrop + 0 + PictureWidth + 640 + PresetDescription + HandBrake's high resolution settings for older 5 and 5.5G iPods. Good video quality, great for viewing on a TV using your iPod. This is the iPod High-Rez preset from 0.9.2. + PresetName + iPod Legacy + Subtitles + None + Type + 0 + UsesMaxPictureSettings + 0 + UsesPictureFilters + 1 + UsesPictureSettings + 1 + VFR + 0 + VideoAvgBitrate + 1500 + VideoEncoder + H.264 (x264) + VideoFramerate + Same as source + VideoGrayScale + 0 + VideoQualitySlider + 0.64709997177124023 + VideoQualityType + 1 + VideoTargetSize + 700 + VideoTwoPass + 0 + x264Option + level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:subme=6:8x8dct=0:trellis=0 + + + Default + 0 + Folder + + PresetBuildNumber + 2009073001 + PresetName + Legacy + Type + 0 + + + diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c index 17c67db36..2b6b8830f 100644 --- a/gtk/src/x264handler.c +++ b/gtk/src/x264handler.c @@ -170,21 +170,21 @@ find_syn_match(const gchar *opt, gchar **syns) struct x264_opt_map_s x264_opt_map[] = { - {x264_ref_syns, "x264_refs", "1", X264_OPT_INT}, - {x264_mixed_syns, "x264_mixed_refs", "0", X264_OPT_BOOL}, - {x264_bframes_syns, "x264_bframes", "0", X264_OPT_INT}, + {x264_ref_syns, "x264_refs", "3", X264_OPT_INT}, + {x264_mixed_syns, "x264_mixed_refs", "1", X264_OPT_BOOL}, + {x264_bframes_syns, "x264_bframes", "3", X264_OPT_INT}, {x264_direct_syns, "x264_direct", "spatial", X264_OPT_COMBO}, {x264_badapt_syns, "x264_b_adapt", "1", X264_OPT_COMBO}, - {x264_weightb_syns, "x264_weighted_bframes", "0", X264_OPT_BOOL}, + {x264_weightb_syns, "x264_weighted_bframes", "1", X264_OPT_BOOL}, {x264_bpyramid_syns, "x264_bpyramid", "0", X264_OPT_BOOL}, {x264_me_syns, "x264_me", "hex", X264_OPT_COMBO}, {x264_merange_syns, "x264_merange", "16", X264_OPT_INT}, - {x264_subme_syns, "x264_subme", "6", X264_OPT_COMBO}, + {x264_subme_syns, "x264_subme", "7", X264_OPT_COMBO}, {x264_analyse_syns, "x264_analyse", "some", X264_OPT_COMBO}, - {x264_8x8dct_syns, "x264_8x8dct", "0", X264_OPT_BOOL}, + {x264_8x8dct_syns, "x264_8x8dct", "1", X264_OPT_BOOL}, {x264_deblock_syns, "x264_deblock_alpha", "0,0", X264_OPT_DEBLOCK}, {x264_deblock_syns, "x264_deblock_beta", "0,0", X264_OPT_DEBLOCK}, - {x264_trellis_syns, "x264_trellis", "0", X264_OPT_COMBO}, + {x264_trellis_syns, "x264_trellis", "1", X264_OPT_COMBO}, {x264_pskip_syns, "x264_no_fast_pskip", "0", X264_OPT_BOOL}, {x264_decimate_syns, "x264_no_dct_decimate", "0", X264_OPT_BOOL}, {x264_cabac_syns, "x264_cabac", "1", X264_OPT_BOOL}, @@ -716,6 +716,16 @@ sanitize_x264opts(signal_user_data_t *ud, const gchar *options) { x264_remove_opt(split, x264_psy_syns); } + if (subme == 10) + { + gdouble psy_rd = ghb_settings_get_double(ud->settings, "x264_psy_rd"); + if (psy_rd == 0.0) + { + gint pos = x264_find_opt(split, x264_subme_syns); + g_free(split[pos]); + split[pos] = g_strdup_printf("subme=9"); + } + } gint trell = ghb_settings_combo_int(ud->settings, "x264_trellis"); if (trell < 1) { -- 2.40.0