diff --git a/ShareX.ScreenCaptureLib/Enums.cs b/ShareX.ScreenCaptureLib/Enums.cs
index a719c299e..bf467a161 100644
--- a/ShareX.ScreenCaptureLib/Enums.cs
+++ b/ShareX.ScreenCaptureLib/Enums.cs
@@ -79,7 +79,10 @@ internal enum NodePosition
internal enum NodeShape
{
- Square, Circle, Diamond, CustomNode
+ Square,
+ Circle,
+ Diamond,
+ CustomNode
}
public enum FFmpegVideoCodec
@@ -145,7 +148,21 @@ public enum FFmpegPreset
[Description("Slower")]
slower,
[Description("Very slow")]
- veryslow
+ veryslow,
+ [Description("Placebo")]
+ placebo
+ }
+
+ public enum FFmpegTune
+ {
+ film,
+ animation,
+ grain,
+ stillimage,
+ psnr,
+ ssim,
+ fastdecode,
+ zerolatency
}
public enum FFmpegNVENCPreset
@@ -216,14 +233,10 @@ public enum FFmpegQSVPreset
veryslow
}
- public enum FFmpegTune
- {
- film, animation, grain, stillimage, psnr, ssim, fastdecode, zerolatency
- }
-
public enum FFmpegPaletteGenStatsMode
{
- full, diff
+ full,
+ diff
}
public enum FFmpegPaletteUseDither
@@ -340,11 +353,21 @@ public enum BorderStyle // Localized
public enum ScreenRecordState
{
- Waiting, BeforeStart, AfterStart, AfterRecordingStart, RecordingEnd, Encoding
+ Waiting,
+ BeforeStart,
+ AfterStart,
+ AfterRecordingStart,
+ RecordingEnd,
+ Encoding
}
public enum ScreenRecordingStatus
{
- Waiting, Working, Recording, Paused, Stopped, Aborted
+ Waiting,
+ Working,
+ Recording,
+ Paused,
+ Stopped,
+ Aborted
}
}
\ No newline at end of file
diff --git a/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.Designer.cs b/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.Designer.cs
index 1feef555e..20626b2b0 100644
--- a/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.Designer.cs
+++ b/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.Designer.cs
@@ -801,6 +801,8 @@ private void InitializeComponent()
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.SystemColors.Window;
+ this.Controls.Add(this.tcFFmpegAudioCodecs);
+ this.Controls.Add(this.tcFFmpegVideoCodecs);
this.Controls.Add(this.lblAudioEncoder);
this.Controls.Add(this.lblVideoEncoder);
this.Controls.Add(this.cbUseCustomFFmpegPath);
@@ -813,9 +815,7 @@ private void InitializeComponent()
this.Controls.Add(this.cbAudioCodec);
this.Controls.Add(this.lblHelperDevices);
this.Controls.Add(this.cbVideoCodec);
- this.Controls.Add(this.tcFFmpegAudioCodecs);
this.Controls.Add(this.btnInstallHelperDevices);
- this.Controls.Add(this.tcFFmpegVideoCodecs);
this.Controls.Add(this.cbVideoSource);
this.Controls.Add(this.btnFFmpegBrowse);
this.Controls.Add(this.lblVideoSource);
diff --git a/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.cs b/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.cs
index 7fa98cac8..e389c0cf2 100644
--- a/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.cs
+++ b/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.cs
@@ -216,9 +216,9 @@ private void UpdateUI()
nudx264Bitrate.Visible = lblx264BitrateK.Visible = Options.FFmpeg.x264_Use_Bitrate;
lblAACQuality.Text = string.Format(Resources.FFmpegOptionsForm_UpdateUI_Bitrate___0_k, Options.FFmpeg.AAC_Bitrate);
+ lblOpusQuality.Text = string.Format(Resources.FFmpegOptionsForm_UpdateUI_Bitrate___0_k, Options.FFmpeg.Opus_Bitrate);
lblVorbisQuality.Text = Resources.FFmpegOptionsForm_UpdateUI_Quality_ + " " + Options.FFmpeg.Vorbis_QScale;
lblMP3Quality.Text = Resources.FFmpegOptionsForm_UpdateUI_Quality_ + " " + Options.FFmpeg.MP3_QScale;
- lblOpusQuality.Text = string.Format(Resources.FFmpegOptionsForm_UpdateUI_Bitrate___0_k, Options.FFmpeg.Opus_Bitrate);
pbx264PresetWarning.Visible = (FFmpegPreset)cbx264Preset.SelectedIndex > FFmpegPreset.fast;
if (!Options.FFmpeg.UseCustomCommands)
@@ -226,7 +226,7 @@ private void UpdateUI()
txtCommandLinePreview.Text = Options.GetFFmpegArgs();
}
- nudGIFBayerScale.Visible = (Options.FFmpeg.GIFDither == FFmpegPaletteUseDither.bayer);
+ nudGIFBayerScale.Visible = Options.FFmpeg.GIFDither == FFmpegPaletteUseDither.bayer;
}
}
diff --git a/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.resx b/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.resx
index 6ba46c21f..9c7d448ec 100644
--- a/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.resx
+++ b/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.resx
@@ -238,10 +238,10 @@ For real time encoding (e.g. screen recording), the preset must be as fast as po
False
- 80, 0
+ 0, 32
- 232, 32
+ 312, 32
1
@@ -265,10 +265,10 @@ For real time encoding (e.g. screen recording), the preset must be as fast as po
False
- 80, 0
+ 0, 32
- 232, 32
+ 312, 32
1
@@ -295,10 +295,10 @@ For real time encoding (e.g. screen recording), the preset must be as fast as po
NoControl
- 80, 0
+ 0, 32
- 232, 32
+ 312, 32
1
@@ -407,10 +407,10 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
NoControl
- 80, 0
+ 0, 32
- 232, 32
+ 312, 32
3
@@ -431,14 +431,17 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
0
- 238, 28
+ 240, 28
- 44, 20
+ 48, 20
0
+
+ Center
+
Controls the Bayer Scale index, a higher scale will display more banding. Default is 2.
@@ -473,7 +476,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
$this
- 11
+ 13
True
@@ -602,7 +605,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
$this
- 3
+ 5
Microsoft Sans Serif, 9.75pt
@@ -632,7 +635,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
$this
- 5
+ 7
16, 288
@@ -653,7 +656,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
$this
- 6
+ 8
tpX264
@@ -758,7 +761,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
$this
- 14
+ 1
lblx264BitrateK
@@ -941,7 +944,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
4, 40
- 304, 68
+ 304, 124
2
@@ -1046,7 +1049,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
4, 40
- 304, 68
+ 304, 124
3
@@ -1133,7 +1136,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
3, 3, 3, 3
- 304, 68
+ 304, 124
5
@@ -1157,7 +1160,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
True
- 157, 32
+ 149, 8
34, 13
@@ -1181,10 +1184,10 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
0
- 80, 4
+ 72, 28
- 232, 21
+ 240, 21
3
@@ -1205,7 +1208,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
True
- 0, 8
+ 0, 32
40, 13
@@ -1229,7 +1232,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
2
- 80, 28
+ 72, 4
72, 20
@@ -1256,7 +1259,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
True
- 0, 32
+ 0, 8
40, 13
@@ -1310,7 +1313,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
3, 3, 3, 3
- 304, 68
+ 304, 124
4
@@ -1478,7 +1481,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
3, 3, 3, 3
- 304, 68
+ 304, 124
6
@@ -1505,7 +1508,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
NoControl
- 157, 56
+ 149, 8
34, 13
@@ -1529,7 +1532,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
0
- 80, 52
+ 72, 4
72, 20
@@ -1559,7 +1562,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
NoControl
- 0, 56
+ 0, 8
40, 13
@@ -1583,10 +1586,10 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
2
- 80, 28
+ 72, 52
- 232, 21
+ 240, 21
7
@@ -1610,7 +1613,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
NoControl
- 0, 32
+ 0, 56
42, 13
@@ -1634,10 +1637,10 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
4
- 80, 4
+ 72, 28
- 232, 21
+ 240, 21
5
@@ -1661,7 +1664,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
NoControl
- 0, 8
+ 0, 32
41, 13
@@ -1751,7 +1754,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
3, 3, 3, 3
- 304, 68
+ 304, 124
7
@@ -1775,7 +1778,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
True
- 157, 32
+ 149, 8
34, 13
@@ -1799,10 +1802,10 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
0
- 80, 4
+ 72, 28
- 232, 21
+ 240, 21
7
@@ -1826,7 +1829,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
NoControl
- 0, 8
+ 0, 32
40, 13
@@ -1850,7 +1853,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
2
- 80, 28
+ 72, 4
72, 20
@@ -1880,7 +1883,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
NoControl
- 0, 32
+ 0, 8
40, 13
@@ -1970,7 +1973,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
$this
- 12
+ 0
lblAACQuality
@@ -2057,7 +2060,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
3, 3, 3, 3
- 304, 86
+ 304, 54
4
@@ -2126,7 +2129,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
3, 3, 3, 3
- 304, 86
+ 304, 54
0
@@ -2192,7 +2195,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
3, 3, 3, 3
- 304, 86
+ 304, 54
2
@@ -2354,7 +2357,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
$this
- 9
+ 11
184, 112
@@ -2378,7 +2381,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
$this
- 8
+ 10
True
@@ -2405,7 +2408,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
$this
- 10
+ 12
16, 112
@@ -2429,7 +2432,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
$this
- 13
+ 14
True
@@ -2456,7 +2459,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
$this
- 7
+ 9
True
@@ -2483,7 +2486,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
$this
- 4
+ 6
True
@@ -2510,7 +2513,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
$this
- 2
+ 4
True
@@ -2537,7 +2540,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
$this
- 1
+ 3
True
@@ -2564,7 +2567,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.<
$this
- 0
+ 2
True