From: Scott Date: Sat, 3 Oct 2015 13:17:53 +0000 (+0100) Subject: Adding some additional tooltips to the picture settings and video tabs. X-Git-Tag: 1.0.0~894^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc988f3d7b7f3595f1d06e9d819a5ff845bc360d;p=handbrake Adding some additional tooltips to the picture settings and video tabs. --- diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs index 23cceef50..d245d5dc8 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs +++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs @@ -1496,50 +1496,6 @@ namespace HandBrakeWPF.Properties { } } - /// - /// Looks up a localized string similar to Sets and ensures compliance with the specified H.264 Levels. This will override all other settings.. - /// - public static string Video_EncoderLevel { - get { - return ResourceManager.GetString("Video_EncoderLevel", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Adjusts settings to trade off compression efficiency against encoding speed. - /// - ///This establishes your default settings. Tunes, profiles, levels and advanced options string will be applied to this. - /// - ///You should generally set this option to the slowest you can bear since slower settings will result in better quality or smaller files.. - /// - public static string Video_EncoderPreset { - get { - return ResourceManager.GetString("Video_EncoderPreset", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Limit the profile of the output stream. This will override all other settings.. - /// - public static string Video_EncoderProfile { - get { - return ResourceManager.GetString("Video_EncoderProfile", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Tune settings to optimise for common scenarios - /// - ///This can improve efficiency for particular source characteristics or set of characteristics of the output file. - /// - ///Changes will be applied after the preset but before all other parameters.. - /// - public static string Video_EncoderTune { - get { - return ResourceManager.GetString("Video_EncoderTune", resourceCulture); - } - } - /// /// Looks up a localized string similar to Higher Quality |. /// @@ -1590,22 +1546,6 @@ namespace HandBrakeWPF.Properties { } } - /// - /// Looks up a localized string similar to Set the desired quality factor. The encoder targets a certain quality. - ///The scale used by each video encoder is different. - /// - ///x264's scale is logarithmic and lower values correspond to higher quality. - ///So small changes in value will result in progressively larger increases or decreases in the resulting file size. - ///A value of 0 means lossless and will result in a file size that is larger than the original source, - ///unless the source was also lossless. - ///Suggested values are: 18 to 20 for standard definiti [rest of string was truncated]";. - /// - public static string Video_QualitySlider { - get { - return ResourceManager.GetString("Video_QualitySlider", resourceCulture); - } - } - /// /// Looks up a localized string similar to QuickSync hardware not detected or enabled! /// diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx index 7915ff051..41a9e58aa 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.resx +++ b/win/CS/HandBrakeWPF/Properties/Resources.resx @@ -241,40 +241,6 @@ may have problems with Weighted P-frame prediction: the Apple TV is completely i Reduce decoder CPU usage. Set this if your device is struggling to play the output. (i.e. dropped frames) - - - Sets and ensures compliance with the specified H.264 Levels. This will override all other settings. - - - Adjusts settings to trade off compression efficiency against encoding speed. - -This establishes your default settings. Tunes, profiles, levels and advanced options string will be applied to this. - -You should generally set this option to the slowest you can bear since slower settings will result in better quality or smaller files. - - - Limit the profile of the output stream. This will override all other settings. - - - Tune settings to optimise for common scenarios - -This can improve efficiency for particular source characteristics or set of characteristics of the output file. - -Changes will be applied after the preset but before all other parameters. - - - Set the desired quality factor. The encoder targets a certain quality. -The scale used by each video encoder is different. - -x264's scale is logarithmic and lower values correspond to higher quality. -So small changes in value will result in progressively larger increases or decreases in the resulting file size. -A value of 0 means lossless and will result in a file size that is larger than the original source, -unless the source was also lossless. -Suggested values are: 18 to 20 for standard definition sources and 20 to 23 for high definition sources. - -x265 is a new encoder, so there are no recommended values yet. You'll have to experiment. - -FFMpeg's and Theora's scale is more linear. These encoders do not have a lossless mode. Warning: RF 0 is Lossless! diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs index c94852f1f..4839b7d42 100644 --- a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs +++ b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs @@ -185,6 +185,70 @@ namespace HandBrakeWPF.Properties { } } + /// + /// Looks up a localized string similar to Automatically crop black borders around edges of the video.. + /// + public static string PictureSettingsView_AutoCrop { + get { + return ResourceManager.GetString("PictureSettingsView_AutoCrop", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Crop the video from the bottom.. + /// + public static string PictureSettingsView_CropBottom { + get { + return ResourceManager.GetString("PictureSettingsView_CropBottom", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Crop the video from the left side.. + /// + public static string PictureSettingsView_CropLeft { + get { + return ResourceManager.GetString("PictureSettingsView_CropLeft", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Crop the video from the right side.. + /// + public static string PictureSettingsView_CropRight { + get { + return ResourceManager.GetString("PictureSettingsView_CropRight", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Crop the video from the top.. + /// + public static string PictureSettingsView_CropTop { + get { + return ResourceManager.GetString("PictureSettingsView_CropTop", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to This is the height that the video will be stored at. + ///The actual display dimensions will differ if the pixel aspect ratio is not 1:1.. + /// + public static string PictureSettingsView_Height { + get { + return ResourceManager.GetString("PictureSettingsView_Height", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Manually crop the video.. + /// + public static string PictureSettingsView_ManualCrop { + get { + return ResourceManager.GetString("PictureSettingsView_ManualCrop", resourceCulture); + } + } + /// /// Looks up a localized string similar to Align storage dimensions to multiples of this value. /// @@ -208,6 +272,16 @@ namespace HandBrakeWPF.Properties { } } + /// + /// Looks up a localized string similar to This is the width that the video will be stored at. + ///The actual display dimensions will differ if the pixel aspect ratio is not 1:1.. + /// + public static string PictureSettingsView_Width { + get { + return ResourceManager.GetString("PictureSettingsView_Width", resourceCulture); + } + } + /// /// Looks up a localized string similar to Delete the job from the queue.. /// @@ -234,5 +308,187 @@ namespace HandBrakeWPF.Properties { return ResourceManager.GetString("QueueView_SendJobBack", resourceCulture); } } + + /// + /// Looks up a localized string similar to Use advanced options Tab for x264 settings.. + /// + public static string Video_AdvancedOptions { + get { + return ResourceManager.GetString("Video_AdvancedOptions", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Set the average bitrate. + /// + ///The instantaneous bitrate can be much higher or lower at any point in time. + ///But the average over a long duration will be the value set here. If you need + ///to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings.. + /// + public static string Video_AvgBitrate { + get { + return ResourceManager.GetString("Video_AvgBitrate", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Enables constant framerate output.. + /// + public static string Video_ConstantFramerate { + get { + return ResourceManager.GetString("Video_ConstantFramerate", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Available video encoders.. + /// + public static string Video_Encoders { + get { + return ResourceManager.GetString("Video_Encoders", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Tune settings to optimize for common scenarios. + /// + ///This can improve effeciency for particular source characteristics or set + ///characteristics of the output file. Changes will be applied after the + ///preset but before all other parameters.. + /// + public static string Video_EncoderTune { + get { + return ResourceManager.GetString("Video_EncoderTune", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Additional encoder settings. + /// + ///Colon separated list of encoder options.. + /// + public static string Video_ExtraOpts { + get { + return ResourceManager.GetString("Video_ExtraOpts", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Reduce decoder CPU usage. + /// + ///Set this if your device is struggling to play the output (dropped frames).. + /// + public static string Video_FastDecode { + get { + return ResourceManager.GetString("Video_FastDecode", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Output framerate. + /// + ///'Same as source' is recommended. If your source video has a variable framerate, 'Same as source' will preserve it.. + /// + public static string Video_Framerate { + get { + return ResourceManager.GetString("Video_Framerate", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Sets and ensures compliance with the specified level. + /// + ///Overrides all other settings.. + /// + public static string Video_Level { + get { + return ResourceManager.GetString("Video_Level", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Enables variable framerate output with a peak rate determined by the framerate setting.. + /// + public static string Video_PeakFramerate { + get { + return ResourceManager.GetString("Video_PeakFramerate", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Adjusts encoder settings to trade off compression efficiency against encoding speed. + /// + ///This establishes your default encoder settings. + ///Tunes, profiles, levels and advanced option string will be applied to this. + ///You should generally set this option to the slowest you can bear since slower + ///settings will result in better quality or smaller files.. + /// + public static string Video_Presets { + get { + return ResourceManager.GetString("Video_Presets", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Sets and ensures compliance with the specified profile. + /// + ///Overrides all other settings.. + /// + public static string Video_Profile { + get { + return ResourceManager.GetString("Video_Profile", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Set the desired quality factor. + ///The encoder targets a certain quality. + ///The scale used by each video encoder is different. + /// + ///x264's scale is logarithmic and lower values correspond to higher quality. + ///So small decreases in value will result in progressively larger increases + ///in the resulting file size. A value of 0 means lossless and will result + ///in a file size that is larger than the original source, unless the source + ///was also lossless. + ///Suggested values are: 18 to 20 for standard definition sources an [rest of string was truncated]";. + /// + public static string Video_Quality { + get { + return ResourceManager.GetString("Video_Quality", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to During the 1st pass of a 2 pass encode, use settings that speed things along.. + /// + public static string Video_TurboFirstPass { + get { + return ResourceManager.GetString("Video_TurboFirstPass", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Perform 2 Pass Encoding. + /// + ///The 'Bitrate' option is prerequisite. During the 1st pass, statistics about + ///the video are collected. Then in the second pass, those statistics are used + ///to make bitrate allocation decisions.. + /// + public static string Video_TwoPass { + get { + return ResourceManager.GetString("Video_TwoPass", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Enables variable framerate output. + /// + ///VFR is not compatible with some players.. + /// + public static string Video_VariableFramerate { + get { + return ResourceManager.GetString("Video_VariableFramerate", resourceCulture); + } + } } } diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx index f3a1ab415..536409cae 100644 --- a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx +++ b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx @@ -170,6 +170,28 @@ Loose - Align dimensions to chosen 'Alignment' value original display aspect ratio Strict - Keep original source dimensions and pixel aspect ratio + + Automatically crop black borders around edges of the video. + + + Crop the video from the bottom. + + + Crop the video from the left side. + + + Crop the video from the right side. + + + Crop the video from the top. + + + This is the height that the video will be stored at. +The actual display dimensions will differ if the pixel aspect ratio is not 1:1. + + + Manually crop the video. + Align storage dimensions to multiples of this value. @@ -180,6 +202,10 @@ You should use 2 unless you experience compatibility issues. Pixel aspect defines the shape of the pixels. A 1:1 ratio defines a square pixel. Other values define rectangular shapes. Players will scale the image in order to achieve the specified aspect. + + + This is the width that the video will be stored at. +The actual display dimensions will differ if the pixel aspect ratio is not 1:1. Delete the job from the queue. @@ -190,4 +216,93 @@ Players will scale the image in order to achieve the specified aspect. Send the job back to the main window for editing. + + Use advanced options Tab for x264 settings. + + + Set the average bitrate. + +The instantaneous bitrate can be much higher or lower at any point in time. +But the average over a long duration will be the value set here. If you need +to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings. + + + Enables constant framerate output. + + + Available video encoders. + + + Tune settings to optimize for common scenarios. + +This can improve effeciency for particular source characteristics or set +characteristics of the output file. Changes will be applied after the +preset but before all other parameters. + + + Additional encoder settings. + +Colon separated list of encoder options. + + + Reduce decoder CPU usage. + +Set this if your device is struggling to play the output (dropped frames). + + + Output framerate. + +'Same as source' is recommended. If your source video has a variable framerate, 'Same as source' will preserve it. + + + Sets and ensures compliance with the specified level. + +Overrides all other settings. + + + Enables variable framerate output with a peak rate determined by the framerate setting. + + + Adjusts encoder settings to trade off compression efficiency against encoding speed. + +This establishes your default encoder settings. +Tunes, profiles, levels and advanced option string will be applied to this. +You should generally set this option to the slowest you can bear since slower +settings will result in better quality or smaller files. + + + Sets and ensures compliance with the specified profile. + +Overrides all other settings. + + + Set the desired quality factor. +The encoder targets a certain quality. +The scale used by each video encoder is different. + +x264's scale is logarithmic and lower values correspond to higher quality. +So small decreases in value will result in progressively larger increases +in the resulting file size. A value of 0 means lossless and will result +in a file size that is larger than the original source, unless the source +was also lossless. +Suggested values are: 18 to 20 for standard definition sources and 20 to 23 for high definition sources. + +FFMpeg's and Theora's scale is more linear. +These encoders do not have a lossless mode. + + + During the 1st pass of a 2 pass encode, use settings that speed things along. + + + Perform 2 Pass Encoding. + +The 'Bitrate' option is prerequisite. During the 1st pass, statistics about +the video are collected. Then in the second pass, those statistics are used +to make bitrate allocation decisions. + + + Enables variable framerate output. + +VFR is not compatible with some players. + \ No newline at end of file diff --git a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml index be53554d9..eb9d9eee6 100644 --- a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml +++ b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml @@ -43,11 +43,11 @@