diff options
| -rw-r--r-- | win/C#/Functions/PresetLoader.cs | 19 | ||||
| -rw-r--r-- | win/C#/Functions/QueryGenerator.cs | 12 | ||||
| -rw-r--r-- | win/C#/frmMain.Designer.cs | 197 | ||||
| -rw-r--r-- | win/C#/frmMain.cs | 10 | ||||
| -rw-r--r-- | win/C#/frmMain.resx | 37 |
5 files changed, 180 insertions, 95 deletions
diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs index 342eb5e5d..82d3b9b8e 100644 --- a/win/C#/Functions/PresetLoader.cs +++ b/win/C#/Functions/PresetLoader.cs @@ -222,7 +222,24 @@ namespace Handbrake.Functions mainWindow.drp_videoFramerate.SelectedIndex = 0;
}
- mainWindow.checkMaximumFramerate.Checked = presetQuery.FramerateMode == FramerateMode.PFR;
+
+ if (presetQuery.Framerate != null)
+ {
+ // Constant or Peak Framerate for a set framerate.
+
+ if (presetQuery.FramerateMode == FramerateMode.PFR)
+ mainWindow.radio_peakAndVariable.Checked = true;
+ else
+ mainWindow.radio_constantFramerate.Checked = true;
+ }
+ else
+ {
+ // Constant or Variable Framerate for Same as Source.
+ if (presetQuery.FramerateMode == FramerateMode.VFR)
+ mainWindow.radio_peakAndVariable.Checked = true;
+ else
+ mainWindow.radio_constantFramerate.Checked = true;
+ }
mainWindow.check_turbo.CheckState = presetQuery.TurboFirstPass ? CheckState.Checked : CheckState.Unchecked;
diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs index a91a058c2..adb2199bc 100644 --- a/win/C#/Functions/QueryGenerator.cs +++ b/win/C#/Functions/QueryGenerator.cs @@ -340,8 +340,16 @@ namespace Handbrake.Functions if (mainWindow.drp_videoFramerate.Text != "Same as source")
query += " -r " + mainWindow.drp_videoFramerate.Text;
- if (mainWindow.checkMaximumFramerate.Checked)
- query += " --pfr ";
+ if (mainWindow.drp_videoFramerate.SelectedIndex == 0)
+ {
+ // If we use Same as Source, we can either output CFR or VFR
+ query += mainWindow.radio_constantFramerate.Checked ? " --cfr " : " --vfr ";
+ }
+ else
+ {
+ // We have a hard framerate set, so we can either be Constant or peak (VFR) framerate
+ query += mainWindow.radio_constantFramerate.Checked ? " --cfr " : " --pfr ";
+ }
return query;
}
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index 1edd06441..764d1c82b 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -93,11 +93,9 @@ namespace Handbrake this.Label47 = new System.Windows.Forms.Label();
this.Label3 = new System.Windows.Forms.Label();
this.tab_audio = new System.Windows.Forms.TabPage();
- this.AudioSettings = new Handbrake.Controls.AudioPanel();
this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);
this.tab_video = new System.Windows.Forms.TabPage();
this.lbl_rfwarn = new System.Windows.Forms.Label();
- this.checkMaximumFramerate = new System.Windows.Forms.CheckBox();
this.radio_cq = new System.Windows.Forms.RadioButton();
this.radio_avgBitrate = new System.Windows.Forms.RadioButton();
this.label25 = new System.Windows.Forms.Label();
@@ -106,17 +104,13 @@ namespace Handbrake this.lbl_SliderValue = new System.Windows.Forms.Label();
this.lbl_framerate = new System.Windows.Forms.Label();
this.tab_picture = new System.Windows.Forms.TabPage();
- this.PictureSettings = new Handbrake.Controls.PictureSettings();
this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();
this.tabs_panel = new System.Windows.Forms.TabControl();
this.tab_filters = new System.Windows.Forms.TabPage();
- this.Filters = new Handbrake.Controls.Filters();
this.tab_subtitles = new System.Windows.Forms.TabPage();
- this.Subtitles = new Handbrake.Controls.Subtitles();
this.tab_chapters = new System.Windows.Forms.TabPage();
this.label31 = new System.Windows.Forms.Label();
this.tab_advanced = new System.Windows.Forms.TabPage();
- this.x264Panel = new Handbrake.Controls.x264Panel();
this.tab_query = new System.Windows.Forms.TabPage();
this.btn_clear = new System.Windows.Forms.Button();
this.label34 = new System.Windows.Forms.Label();
@@ -178,6 +172,14 @@ namespace Handbrake this.SourceLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
this.openPreset = new System.Windows.Forms.OpenFileDialog();
this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();
+ this.radio_constantFramerate = new System.Windows.Forms.RadioButton();
+ this.radio_peakAndVariable = new System.Windows.Forms.RadioButton();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.PictureSettings = new Handbrake.Controls.PictureSettings();
+ this.Filters = new Handbrake.Controls.Filters();
+ this.AudioSettings = new Handbrake.Controls.AudioPanel();
+ this.Subtitles = new Handbrake.Controls.Subtitles();
+ this.x264Panel = new Handbrake.Controls.x264Panel();
notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
notifyIconMenu.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();
@@ -206,6 +208,7 @@ namespace Handbrake this.tableLayoutPanel3.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.SourceLayoutPanel.SuspendLayout();
+ this.panel1.SuspendLayout();
this.SuspendLayout();
//
// notifyIconMenu
@@ -281,9 +284,9 @@ namespace Handbrake this.check_turbo.AutoSize = true;
this.check_turbo.BackColor = System.Drawing.Color.Transparent;
this.check_turbo.Enabled = false;
- this.check_turbo.Location = new System.Drawing.Point(146, 143);
+ this.check_turbo.Location = new System.Drawing.Point(495, 134);
this.check_turbo.Name = "check_turbo";
- this.check_turbo.Size = new System.Drawing.Size(99, 17);
+ this.check_turbo.Size = new System.Drawing.Size(101, 17);
this.check_turbo.TabIndex = 9;
this.check_turbo.Text = "Turbo first Pass";
this.ToolTip.SetToolTip(this.check_turbo, "Makes the first pass of a 2 pass encode faster.");
@@ -314,23 +317,23 @@ namespace Handbrake //
this.slider_videoQuality.BackColor = System.Drawing.SystemColors.Window;
this.slider_videoQuality.Enabled = false;
- this.slider_videoQuality.Location = new System.Drawing.Point(376, 90);
+ this.slider_videoQuality.Location = new System.Drawing.Point(377, 60);
this.slider_videoQuality.Margin = new System.Windows.Forms.Padding(0);
this.slider_videoQuality.Maximum = 100;
this.slider_videoQuality.Name = "slider_videoQuality";
this.slider_videoQuality.Size = new System.Drawing.Size(322, 45);
this.slider_videoQuality.TabIndex = 13;
this.slider_videoQuality.TickFrequency = 17;
- this.ToolTip.SetToolTip(this.slider_videoQuality, "Set the quality level of the video. ");
+ this.ToolTip.SetToolTip(this.slider_videoQuality, resources.GetString("slider_videoQuality.ToolTip"));
this.slider_videoQuality.ValueChanged += new System.EventHandler(this.slider_videoQuality_Scroll);
//
// text_bitrate
//
- this.text_bitrate.Location = new System.Drawing.Point(511, 33);
+ this.text_bitrate.Location = new System.Drawing.Point(489, 107);
this.text_bitrate.Name = "text_bitrate";
this.text_bitrate.Size = new System.Drawing.Size(81, 21);
this.text_bitrate.TabIndex = 14;
- this.ToolTip.SetToolTip(this.text_bitrate, "Set the bitrate of the video");
+ this.ToolTip.SetToolTip(this.text_bitrate, "Set the average bitrate. The instantaneous bitrate can be");
//
// check_optimiseMP4
//
@@ -772,15 +775,6 @@ namespace Handbrake this.tab_audio.Text = "Audio";
this.tab_audio.UseVisualStyleBackColor = true;
//
- // AudioSettings
- //
- this.AudioSettings.BackColor = System.Drawing.Color.Transparent;
- this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.AudioSettings.Location = new System.Drawing.Point(0, 0);
- this.AudioSettings.Name = "AudioSettings";
- this.AudioSettings.Size = new System.Drawing.Size(715, 310);
- this.AudioSettings.TabIndex = 0;
- //
// AudioMenuRowHeightHack
//
this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
@@ -790,8 +784,8 @@ namespace Handbrake // tab_video
//
this.tab_video.BackColor = System.Drawing.Color.Transparent;
+ this.tab_video.Controls.Add(this.panel1);
this.tab_video.Controls.Add(this.lbl_rfwarn);
- this.tab_video.Controls.Add(this.checkMaximumFramerate);
this.tab_video.Controls.Add(this.drp_videoFramerate);
this.tab_video.Controls.Add(this.radio_cq);
this.tab_video.Controls.Add(this.radio_avgBitrate);
@@ -818,7 +812,7 @@ namespace Handbrake this.lbl_rfwarn.AutoSize = true;
this.lbl_rfwarn.BackColor = System.Drawing.Color.Transparent;
this.lbl_rfwarn.ForeColor = System.Drawing.Color.Red;
- this.lbl_rfwarn.Location = new System.Drawing.Point(385, 135);
+ this.lbl_rfwarn.Location = new System.Drawing.Point(363, 257);
this.lbl_rfwarn.Name = "lbl_rfwarn";
this.lbl_rfwarn.Size = new System.Drawing.Size(321, 39);
this.lbl_rfwarn.TabIndex = 0;
@@ -826,26 +820,16 @@ namespace Handbrake "not be compatible\r\nwith your playback software.";
this.lbl_rfwarn.Visible = false;
//
- // checkMaximumFramerate
- //
- this.checkMaximumFramerate.AutoSize = true;
- this.checkMaximumFramerate.BackColor = System.Drawing.Color.Transparent;
- this.checkMaximumFramerate.Location = new System.Drawing.Point(125, 89);
- this.checkMaximumFramerate.Name = "checkMaximumFramerate";
- this.checkMaximumFramerate.Size = new System.Drawing.Size(131, 17);
- this.checkMaximumFramerate.TabIndex = 1;
- this.checkMaximumFramerate.Text = "Peak Framerate (VFR)";
- this.checkMaximumFramerate.UseVisualStyleBackColor = false;
- //
// radio_cq
//
this.radio_cq.AutoSize = true;
this.radio_cq.BackColor = System.Drawing.Color.Transparent;
- this.radio_cq.Location = new System.Drawing.Point(365, 67);
+ this.radio_cq.Location = new System.Drawing.Point(366, 37);
this.radio_cq.Name = "radio_cq";
- this.radio_cq.Size = new System.Drawing.Size(105, 17);
+ this.radio_cq.Size = new System.Drawing.Size(110, 17);
this.radio_cq.TabIndex = 3;
this.radio_cq.Text = "Constant Quality:";
+ this.ToolTip.SetToolTip(this.radio_cq, resources.GetString("radio_cq.ToolTip"));
this.radio_cq.UseVisualStyleBackColor = false;
this.radio_cq.CheckedChanged += new System.EventHandler(this.radio_cq_CheckedChanged);
//
@@ -854,12 +838,13 @@ namespace Handbrake this.radio_avgBitrate.AutoSize = true;
this.radio_avgBitrate.BackColor = System.Drawing.Color.Transparent;
this.radio_avgBitrate.Checked = true;
- this.radio_avgBitrate.Location = new System.Drawing.Point(365, 34);
+ this.radio_avgBitrate.Location = new System.Drawing.Point(367, 108);
this.radio_avgBitrate.Name = "radio_avgBitrate";
- this.radio_avgBitrate.Size = new System.Drawing.Size(112, 17);
+ this.radio_avgBitrate.Size = new System.Drawing.Size(116, 17);
this.radio_avgBitrate.TabIndex = 4;
this.radio_avgBitrate.TabStop = true;
this.radio_avgBitrate.Text = "Avg Bitrate (kbps):";
+ this.ToolTip.SetToolTip(this.radio_avgBitrate, resources.GetString("radio_avgBitrate.ToolTip"));
this.radio_avgBitrate.UseVisualStyleBackColor = false;
this.radio_avgBitrate.CheckedChanged += new System.EventHandler(this.radio_avgBitrate_CheckedChanged);
//
@@ -878,11 +863,12 @@ namespace Handbrake //
this.check_2PassEncode.AutoSize = true;
this.check_2PassEncode.BackColor = System.Drawing.Color.Transparent;
- this.check_2PassEncode.Location = new System.Drawing.Point(125, 120);
+ this.check_2PassEncode.Location = new System.Drawing.Point(385, 134);
this.check_2PassEncode.Name = "check_2PassEncode";
- this.check_2PassEncode.Size = new System.Drawing.Size(106, 17);
+ this.check_2PassEncode.Size = new System.Drawing.Size(104, 17);
this.check_2PassEncode.TabIndex = 10;
this.check_2PassEncode.Text = "2-Pass Encoding";
+ this.ToolTip.SetToolTip(this.check_2PassEncode, resources.GetString("check_2PassEncode.ToolTip"));
this.check_2PassEncode.UseVisualStyleBackColor = false;
this.check_2PassEncode.CheckedChanged += new System.EventHandler(this.check_2PassEncode_CheckedChanged);
//
@@ -902,7 +888,7 @@ namespace Handbrake this.lbl_SliderValue.AutoSize = true;
this.lbl_SliderValue.BackColor = System.Drawing.Color.Transparent;
this.lbl_SliderValue.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbl_SliderValue.Location = new System.Drawing.Point(509, 70);
+ this.lbl_SliderValue.Location = new System.Drawing.Point(487, 39);
this.lbl_SliderValue.Name = "lbl_SliderValue";
this.lbl_SliderValue.Size = new System.Drawing.Size(21, 13);
this.lbl_SliderValue.TabIndex = 15;
@@ -930,25 +916,13 @@ namespace Handbrake this.tab_picture.Text = "Picture";
this.tab_picture.UseVisualStyleBackColor = true;
//
- // PictureSettings
- //
- this.PictureSettings.BackColor = System.Drawing.Color.Transparent;
- this.PictureSettings.CurrentlySelectedPreset = null;
- this.PictureSettings.Enabled = false;
- this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.PictureSettings.Location = new System.Drawing.Point(0, 0);
- this.PictureSettings.Name = "PictureSettings";
- this.PictureSettings.PresetMaximumResolution = new System.Drawing.Size(0, 0);
- this.PictureSettings.Size = new System.Drawing.Size(666, 279);
- this.PictureSettings.TabIndex = 0;
- //
// Check_ChapterMarkers
//
this.Check_ChapterMarkers.AutoSize = true;
this.Check_ChapterMarkers.BackColor = System.Drawing.Color.Transparent;
this.Check_ChapterMarkers.Location = new System.Drawing.Point(16, 32);
this.Check_ChapterMarkers.Name = "Check_ChapterMarkers";
- this.Check_ChapterMarkers.Size = new System.Drawing.Size(136, 17);
+ this.Check_ChapterMarkers.Size = new System.Drawing.Size(140, 17);
this.Check_ChapterMarkers.TabIndex = 4;
this.Check_ChapterMarkers.Text = "Create chapter markers";
this.Check_ChapterMarkers.UseVisualStyleBackColor = false;
@@ -980,15 +954,6 @@ namespace Handbrake this.tab_filters.Text = "Video Filters";
this.tab_filters.UseVisualStyleBackColor = true;
//
- // Filters
- //
- this.Filters.BackColor = System.Drawing.Color.Transparent;
- this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Filters.Location = new System.Drawing.Point(0, 0);
- this.Filters.Name = "Filters";
- this.Filters.Size = new System.Drawing.Size(713, 310);
- this.Filters.TabIndex = 0;
- //
// tab_subtitles
//
this.tab_subtitles.Controls.Add(this.Subtitles);
@@ -1000,15 +965,6 @@ namespace Handbrake this.tab_subtitles.Text = "Subtitles";
this.tab_subtitles.UseVisualStyleBackColor = true;
//
- // Subtitles
- //
- this.Subtitles.BackColor = System.Drawing.Color.Transparent;
- this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Subtitles.Location = new System.Drawing.Point(0, 0);
- this.Subtitles.Name = "Subtitles";
- this.Subtitles.Size = new System.Drawing.Size(722, 310);
- this.Subtitles.TabIndex = 0;
- //
// tab_chapters
//
this.tab_chapters.BackColor = System.Drawing.Color.Transparent;
@@ -1047,16 +1003,6 @@ namespace Handbrake this.tab_advanced.Text = "Advanced";
this.tab_advanced.UseVisualStyleBackColor = true;
//
- // x264Panel
- //
- this.x264Panel.BackColor = System.Drawing.Color.Transparent;
- this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.x264Panel.Location = new System.Drawing.Point(0, 0);
- this.x264Panel.Name = "x264Panel";
- this.x264Panel.Size = new System.Drawing.Size(720, 306);
- this.x264Panel.TabIndex = 0;
- this.x264Panel.X264Query = "";
- //
// tab_query
//
this.tab_query.Controls.Add(this.btn_clear);
@@ -1709,6 +1655,87 @@ namespace Handbrake //
this.File_ChapterImport.Filter = "CSV Files|*.csv";
//
+ // radio_constantFramerate
+ //
+ this.radio_constantFramerate.AutoSize = true;
+ this.radio_constantFramerate.BackColor = System.Drawing.Color.Transparent;
+ this.radio_constantFramerate.Checked = true;
+ this.radio_constantFramerate.Location = new System.Drawing.Point(0, 0);
+ this.radio_constantFramerate.Name = "radio_constantFramerate";
+ this.radio_constantFramerate.Size = new System.Drawing.Size(122, 17);
+ this.radio_constantFramerate.TabIndex = 17;
+ this.radio_constantFramerate.Text = "Constant Framerate";
+ this.radio_constantFramerate.UseVisualStyleBackColor = false;
+ //
+ // radio_peakAndVariable
+ //
+ this.radio_peakAndVariable.AutoSize = true;
+ this.radio_peakAndVariable.BackColor = System.Drawing.Color.Transparent;
+ this.radio_peakAndVariable.Location = new System.Drawing.Point(0, 23);
+ this.radio_peakAndVariable.Name = "radio_peakAndVariable";
+ this.radio_peakAndVariable.Size = new System.Drawing.Size(116, 17);
+ this.radio_peakAndVariable.TabIndex = 19;
+ this.radio_peakAndVariable.Text = "Variable Framerate";
+ this.radio_peakAndVariable.UseVisualStyleBackColor = false;
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.radio_constantFramerate);
+ this.panel1.Controls.Add(this.radio_peakAndVariable);
+ this.panel1.Location = new System.Drawing.Point(125, 92);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(184, 59);
+ this.panel1.TabIndex = 20;
+ //
+ // PictureSettings
+ //
+ this.PictureSettings.BackColor = System.Drawing.Color.Transparent;
+ this.PictureSettings.CurrentlySelectedPreset = null;
+ this.PictureSettings.Enabled = false;
+ this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.PictureSettings.Location = new System.Drawing.Point(0, 0);
+ this.PictureSettings.Name = "PictureSettings";
+ this.PictureSettings.PresetMaximumResolution = new System.Drawing.Size(0, 0);
+ this.PictureSettings.Size = new System.Drawing.Size(666, 279);
+ this.PictureSettings.TabIndex = 0;
+ //
+ // Filters
+ //
+ this.Filters.BackColor = System.Drawing.Color.Transparent;
+ this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.Filters.Location = new System.Drawing.Point(0, 0);
+ this.Filters.Name = "Filters";
+ this.Filters.Size = new System.Drawing.Size(713, 310);
+ this.Filters.TabIndex = 0;
+ //
+ // AudioSettings
+ //
+ this.AudioSettings.BackColor = System.Drawing.Color.Transparent;
+ this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.AudioSettings.Location = new System.Drawing.Point(0, 0);
+ this.AudioSettings.Name = "AudioSettings";
+ this.AudioSettings.Size = new System.Drawing.Size(715, 310);
+ this.AudioSettings.TabIndex = 0;
+ //
+ // Subtitles
+ //
+ this.Subtitles.BackColor = System.Drawing.Color.Transparent;
+ this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.Subtitles.Location = new System.Drawing.Point(0, 0);
+ this.Subtitles.Name = "Subtitles";
+ this.Subtitles.Size = new System.Drawing.Size(722, 310);
+ this.Subtitles.TabIndex = 0;
+ //
+ // x264Panel
+ //
+ this.x264Panel.BackColor = System.Drawing.Color.Transparent;
+ this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.x264Panel.Location = new System.Drawing.Point(0, 0);
+ this.x264Panel.Name = "x264Panel";
+ this.x264Panel.Size = new System.Drawing.Size(720, 306);
+ this.x264Panel.TabIndex = 0;
+ this.x264Panel.X264Query = "";
+ //
// frmMain
//
this.AllowDrop = true;
@@ -1774,6 +1801,8 @@ namespace Handbrake this.tableLayoutPanel1.PerformLayout();
this.SourceLayoutPanel.ResumeLayout(false);
this.SourceLayoutPanel.PerformLayout();
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -1897,7 +1926,6 @@ namespace Handbrake private DataGridViewTextBoxColumn number;
private DataGridViewTextBoxColumn name;
private ToolStripProgressBar ProgressBarStatus;
- internal CheckBox checkMaximumFramerate;
private ToolStripMenuItem btnTitleSpecific;
private ToolStripMenuItem FileTitleSpecificScan;
private ToolStripMenuItem FolderTitleSpecificScan;
@@ -1919,5 +1947,8 @@ namespace Handbrake private ToolStripMenuItem MnuExportPreset;
private ToolStripSeparator toolStripSeparator6;
private ToolStripMenuItem MnuResetBuiltInPresets;
+ internal RadioButton radio_peakAndVariable;
+ internal RadioButton radio_constantFramerate;
+ private Panel panel1;
}
}
\ No newline at end of file diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index efa9810f6..93742674f 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -1812,15 +1812,7 @@ namespace Handbrake /// </param>
private void drp_videoFramerate_SelectedIndexChanged(object sender, EventArgs e)
{
- if (this.drp_videoFramerate.SelectedIndex == 0)
- {
- this.checkMaximumFramerate.Visible = false;
- this.checkMaximumFramerate.CheckState = CheckState.Unchecked;
- }
- else
- {
- this.checkMaximumFramerate.Visible = true;
- }
+ this.radio_peakAndVariable.Text = this.drp_videoFramerate.SelectedIndex == 0 ? "Variable Framerate" : "Peak Framerate (VFR)";
}
/// <summary>
diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx index 2207ca2cf..ac23acbdf 100644 --- a/win/C#/frmMain.resx +++ b/win/C#/frmMain.resx @@ -129,6 +129,17 @@ <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>18, 15</value>
</metadata>
+ <data name="slider_videoQuality.ToolTip" xml:space="preserve">
+ <value>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
+
+FFmpeg's and Theora's scale is more linear. These encoders do not have a lossless mode.</value>
+ </data>
<metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@@ -191,6 +202,32 @@ The Following options are not 100% accurate: <metadata name="AudioMenuRowHeightHack.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 54</value>
</metadata>
+ <data name="radio_cq.ToolTip" xml:space="preserve">
+ <value>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
+
+FFmpeg's and Theora's scale is more linear. These encoders do not have a lossless mode.</value>
+ </data>
+ <data name="radio_avgBitrate.ToolTip" xml:space="preserve">
+ <value>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.
+</value>
+ </data>
+ <data name="check_2PassEncode.ToolTip" xml:space="preserve">
+ <value>Perform 2 Pass Encoding. The 'bitrate' option is a
+prerequisite. During the 1st pass, statistics about the video
+are collected. Then in a second pass, those statistics are used
+to make bitrate allocation decisions.</value>
+ </data>
<data name="label34.Text" xml:space="preserve">
<value>Here you can alter the query generated by this program. This feature is for one job overriding of the automatic query generation.
Don't forget to re-generate this query if you change any GUI options.
|