CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-02 18:26:27 +13:00
Code Issues Projects Releases Packages Wiki Activity

Remember custom extension for FFmpeg set by user

Browse source
This commit is contained in:
mcored 2014-05-15 05:48:29 +08:00
parent 34b2ddf9f2
commit da43af6346
2 changed files with 51 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
ScreenCaptureLib/Screencast/FFmpegOptionsForm.Designer.cs generated
View file

@ -40,7 +40,7 @@ private void InitializeComponent()
this.tbVorbis_qscale = new System.Windows.Forms.TrackBar();
this.tbMP3_qscale = new System.Windows.Forms.TrackBar();
this.tbAACBitrate = new System.Windows.Forms.TrackBar();
this.cbExtension = new System.Windows.Forms.ComboBox();
this.cboExtension = new System.Windows.Forms.ComboBox();
this.lblCodec = new System.Windows.Forms.Label();
this.cboVideoCodec = new System.Windows.Forms.ComboBox();
this.lblPreset = new System.Windows.Forms.Label();
@ -62,12 +62,12 @@ private void InitializeComponent()
this.btnTest = new System.Windows.Forms.Button();
this.btnCopyPreview = new System.Windows.Forms.Button();
this.tcFFmpegAudioCodecs = new System.Windows.Forms.TabControl();
this.tpAAC = new System.Windows.Forms.TabPage();
this.lblAACQuality = new System.Windows.Forms.Label();
this.tpVorbis = new System.Windows.Forms.TabPage();
this.lblVorbisQuality = new System.Windows.Forms.Label();
this.tpMP3 = new System.Windows.Forms.TabPage();
this.lblMP3Quality = new System.Windows.Forms.Label();
this.tpAAC = new System.Windows.Forms.TabPage();
this.lblAACQuality = new System.Windows.Forms.Label();
this.cboVideoSource = new System.Windows.Forms.ComboBox();
this.lblVideoSource = new System.Windows.Forms.Label();
this.cboAudioSource = new System.Windows.Forms.ComboBox();
@ -92,9 +92,9 @@ private void InitializeComponent()
this.tpVpx.SuspendLayout();
this.tpXvid.SuspendLayout();
this.tcFFmpegAudioCodecs.SuspendLayout();
this.tpAAC.SuspendLayout();
this.tpVorbis.SuspendLayout();
this.tpMP3.SuspendLayout();
this.tpAAC.SuspendLayout();
this.gbSource.SuspendLayout();
this.gbCodecs.SuspendLayout();
this.gbContainer.SuspendLayout();
@ -260,15 +260,15 @@ private void InitializeComponent()
this.tbAACBitrate.Value = 64;
this.tbAACBitrate.Scroll += new System.EventHandler(this.tbAACBitrate_Scroll);
//
// cbExtension
// cboExtension
//
this.cbExtension.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cbExtension.FormattingEnabled = true;
this.cbExtension.Location = new System.Drawing.Point(72, 22);
this.cbExtension.Name = "cbExtension";
this.cbExtension.Size = new System.Drawing.Size(88, 21);
this.cbExtension.TabIndex = 1;
this.cbExtension.SelectedIndexChanged += new System.EventHandler(this.cbExtension_SelectedIndexChanged);
this.cboExtension.FormattingEnabled = true;
this.cboExtension.Location = new System.Drawing.Point(72, 22);
this.cboExtension.Name = "cboExtension";
this.cboExtension.Size = new System.Drawing.Size(88, 21);
this.cboExtension.TabIndex = 1;
this.cboExtension.SelectedIndexChanged += new System.EventHandler(this.cbExtension_SelectedIndexChanged);
this.cboExtension.TextChanged += new System.EventHandler(this.cboExtension_TextChanged);
//
// lblCodec
//
@ -490,6 +490,27 @@ private void InitializeComponent()
this.tcFFmpegAudioCodecs.Size = new System.Drawing.Size(320, 72);
this.tcFFmpegAudioCodecs.TabIndex = 5;
//
// tpAAC
//
this.tpAAC.Controls.Add(this.tbAACBitrate);
this.tpAAC.Controls.Add(this.lblAACQuality);
this.tpAAC.Location = new System.Drawing.Point(4, 22);
this.tpAAC.Name = "tpAAC";
this.tpAAC.Padding = new System.Windows.Forms.Padding(3);
this.tpAAC.Size = new System.Drawing.Size(312, 46);
this.tpAAC.TabIndex = 3;
this.tpAAC.Text = "AAC";
this.tpAAC.UseVisualStyleBackColor = true;
//
// lblAACQuality
//
this.lblAACQuality.AutoSize = true;
this.lblAACQuality.Location = new System.Drawing.Point(16, 16);
this.lblAACQuality.Name = "lblAACQuality";
this.lblAACQuality.Size = new System.Drawing.Size(40, 13);
this.lblAACQuality.TabIndex = 0;
this.lblAACQuality.Text = "Bitrate:";
//
// tpVorbis
//
this.tpVorbis.Controls.Add(this.tbVorbis_qscale);
@ -532,27 +553,6 @@ private void InitializeComponent()
this.lblMP3Quality.TabIndex = 0;
this.lblMP3Quality.Text = "Quality:";
//
// tpAAC
//
this.tpAAC.Controls.Add(this.tbAACBitrate);
this.tpAAC.Controls.Add(this.lblAACQuality);
this.tpAAC.Location = new System.Drawing.Point(4, 22);
this.tpAAC.Name = "tpAAC";
this.tpAAC.Padding = new System.Windows.Forms.Padding(3);
this.tpAAC.Size = new System.Drawing.Size(312, 46);
this.tpAAC.TabIndex = 3;
this.tpAAC.Text = "AAC";
this.tpAAC.UseVisualStyleBackColor = true;
//
// lblAACQuality
//
this.lblAACQuality.AutoSize = true;
this.lblAACQuality.Location = new System.Drawing.Point(16, 16);
this.lblAACQuality.Name = "lblAACQuality";
this.lblAACQuality.Size = new System.Drawing.Size(40, 13);
this.lblAACQuality.TabIndex = 0;
this.lblAACQuality.Text = "Bitrate:";
//
// cboVideoSource
//
this.cboVideoSource.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@ -638,7 +638,7 @@ private void InitializeComponent()
//
// gbContainer
//
this.gbContainer.Controls.Add(this.cbExtension);
this.gbContainer.Controls.Add(this.cboExtension);
this.gbContainer.Controls.Add(this.lblExt);
this.gbContainer.Location = new System.Drawing.Point(488, 8);
this.gbContainer.Name = "gbContainer";
@ -701,12 +701,12 @@ private void InitializeComponent()
this.tpXvid.ResumeLayout(false);
this.tpXvid.PerformLayout();
this.tcFFmpegAudioCodecs.ResumeLayout(false);
this.tpAAC.ResumeLayout(false);
this.tpAAC.PerformLayout();
this.tpVorbis.ResumeLayout(false);
this.tpVorbis.PerformLayout();
this.tpMP3.ResumeLayout(false);
this.tpMP3.PerformLayout();
this.tpAAC.ResumeLayout(false);
this.tpAAC.PerformLayout();
this.gbSource.ResumeLayout(false);
this.gbSource.PerformLayout();
this.gbCodecs.ResumeLayout(false);
@ -723,7 +723,7 @@ private void InitializeComponent()
private System.Windows.Forms.Label lblX264CRF;
private System.Windows.Forms.NumericUpDown nudx264CRF;
private System.Windows.Forms.ToolTip tpFFmpeg;
private System.Windows.Forms.ComboBox cbExtension;
private System.Windows.Forms.ComboBox cboExtension;
private System.Windows.Forms.Label lblCodec;
private System.Windows.Forms.ComboBox cboVideoCodec;
private System.Windows.Forms.ComboBox cbPreset;

21
ScreenCaptureLib/Screencast/FFmpegOptionsForm.cs
View file

@ -73,7 +73,7 @@ private void SettingsLoad()
cboVideoCodec.SelectedIndex = (int)Options.FFmpeg.VideoCodec;
cboAudioCodec.Items.AddRange(Helpers.GetEnumDescriptions<FFmpegAudioCodec>());
cboAudioCodec.SelectedIndex = (int)Options.FFmpeg.AudioCodec;
cbExtension.Text = Options.FFmpeg.Extension;
cboExtension.Text = Options.FFmpeg.Extension;
string cli = "ffmpeg.exe";
if (string.IsNullOrEmpty(Options.FFmpeg.CLIPath) && File.Exists(cli))
@ -152,6 +152,7 @@ private void BindUpdatePreview(System.Windows.Forms.Control.ControlCollection co
else if (ctl is ComboBox)
{
((ComboBox)ctl).SelectedIndexChanged += (sender, e) => UpdatePreview();
((ComboBox)ctl).TextChanged += (sender, e) => UpdatePreview();
}
}
}
@ -163,19 +164,20 @@ public void UpdatePreview()
public void UpdateExtensions()
{
cbExtension.Items.Clear();
cboExtension.Items.Clear();
if (Options.FFmpeg.VideoCodec == FFmpegVideoCodec.libx264 || Options.FFmpeg.VideoCodec == FFmpegVideoCodec.libxvid)
{
cbExtension.Items.Add("mp4");
cboExtension.Items.Add("mp4");
}
else if (Options.FFmpeg.VideoCodec == FFmpegVideoCodec.libvpx)
{
cbExtension.Items.Add("webm");
cboExtension.Items.Add("webm");
}
cbExtension.Items.Add("avi");
cbExtension.SelectedIndex = 0;
cboExtension.Items.Add("avi");
cboExtension.Items.Add("mkv");
cboExtension.Text = Options.FFmpeg.Extension;
}
private void UpdateUI()
@ -213,7 +215,7 @@ private void cboAudioCodec_SelectedIndexChanged(object sender, EventArgs e)
private void cbExtension_SelectedIndexChanged(object sender, EventArgs e)
{
Options.FFmpeg.Extension = cbExtension.Text;
Options.FFmpeg.Extension = cboExtension.Text;
}
private void nudx264CRF_ValueChanged(object sender, EventArgs e)
@ -332,5 +334,10 @@ private void tbAACBitrate_Scroll(object sender, EventArgs e)
Options.FFmpeg.AAC_bitrate = tbAACBitrate.Value;
UpdateUI();
}
private void cboExtension_TextChanged(object sender, EventArgs e)
{
Options.FFmpeg.Extension = cboExtension.Text;
}
}
}