diff --git a/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.cs b/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.cs index fc89c999d..3842f8057 100644 --- a/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.cs +++ b/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.cs @@ -319,11 +319,12 @@ private void cbVideoCodec_SelectedIndexChanged(object sender, EventArgs e) { Options.FFmpeg.VideoCodec = (FFmpegVideoCodec)cbVideoCodec.SelectedIndex; + tcFFmpegVideoCodecs.Visible = Options.FFmpeg.VideoCodec != FFmpegVideoCodec.libwebp && Options.FFmpeg.VideoCodec != FFmpegVideoCodec.apng; + if (cbVideoCodec.SelectedIndex >= 0) { switch (Options.FFmpeg.VideoCodec) { - default: case FFmpegVideoCodec.libx264: case FFmpegVideoCodec.libx265: tcFFmpegVideoCodecs.SelectedIndex = 0; @@ -369,7 +370,6 @@ private void cbAudioCodec_SelectedIndexChanged(object sender, EventArgs e) { switch (Options.FFmpeg.AudioCodec) { - default: case FFmpegAudioCodec.libvoaacenc: tcFFmpegAudioCodecs.SelectedIndex = 0; break; diff --git a/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.resx b/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.resx index fda63c30c..0b8712e34 100644 --- a/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.resx +++ b/ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.resx @@ -185,7 +185,7 @@ A higher value means bad quality, but a low file size. 128, 4 - 48, 20 + 56, 20 1 @@ -212,7 +212,7 @@ A higher value means bad quality, but a low file size. 72, 28 - 121, 21 + 144, 21 6 @@ -238,10 +238,10 @@ For real time encoding (e.g. screen recording), the preset must be as fast as po False - 88, 0 + 80, 0 - 224, 32 + 232, 32 1 @@ -265,10 +265,10 @@ For real time encoding (e.g. screen recording), the preset must be as fast as po False - 88, 0 + 80, 0 - 224, 32 + 232, 32 1 @@ -295,10 +295,10 @@ For real time encoding (e.g. screen recording), the preset must be as fast as po NoControl - 88, 0 + 80, 0 - 224, 32 + 232, 32 1 @@ -370,7 +370,7 @@ For real time encoding (e.g. screen recording), the preset must be as fast as po NoControl - 200, 30 + 224, 30 16, 16 @@ -407,10 +407,10 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< NoControl - 88, 0 + 80, 0 - 224, 32 + 232, 32 3 @@ -461,7 +461,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 312, 21 - 12 + 11 cbVideoCodec @@ -587,7 +587,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 136, 17 - 20 + 19 Use custom commands @@ -620,7 +620,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 632, 67 - 21 + 20 txtCommandLinePreview @@ -641,7 +641,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 632, 20 - 18 + 17 txtUserArgs @@ -655,111 +655,6 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 6 - - tpX264 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFFmpegVideoCodecs - - - 0 - - - tpVpx - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFFmpegVideoCodecs - - - 1 - - - tpXvid - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFFmpegVideoCodecs - - - 2 - - - tpNVENC - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFFmpegVideoCodecs - - - 3 - - - tpGIF - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFFmpegVideoCodecs - - - 4 - - - tbAMF - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFFmpegVideoCodecs - - - 5 - - - tbQSV - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFFmpegVideoCodecs - - - 6 - - - 16, 184 - - - 312, 112 - - - 15 - - - tcFFmpegVideoCodecs - - - ShareX.HelpersLib.TablessControl, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 14 - lblx264BitrateK @@ -823,84 +718,6 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 0 - - True - - - 149, 8 - - - 34, 13 - - - 3 - - - kbit/s - - - lblx264BitrateK - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpX264 - - - 0 - - - True - - - 200, 6 - - - 77, 17 - - - 4 - - - Use bitrate - - - cbx264UseBitrate - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpX264 - - - 1 - - - 72, 4 - - - 72, 20 - - - 2 - - - Center - - - nudx264Bitrate - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpX264 - - - 7 - lblVP8BitrateK @@ -961,87 +778,6 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 1 - - True - - - NoControl - - - 149, 8 - - - 34, 13 - - - 2 - - - kbit/s - - - lblVP8BitrateK - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpVpx - - - 0 - - - 72, 4 - - - 72, 20 - - - 1 - - - Center - - - nudVP8Bitrate - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpVpx - - - 1 - - - True - - - 0, 8 - - - 40, 13 - - - 0 - - - Bitrate: - - - lblVP8Bitrate - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpVpx - - - 2 - 4, 40 @@ -1153,132 +889,6 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 3 - - True - - - 149, 32 - - - 34, 13 - - - 4 - - - kbit/s - - - lblNVENCBitrateK - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNVENC - - - 0 - - - 72, 4 - - - 200, 21 - - - 3 - - - cbNVENCPreset - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNVENC - - - 1 - - - True - - - 0, 8 - - - 40, 13 - - - 2 - - - Preset: - - - lblNVENCPreset - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNVENC - - - 2 - - - 72, 28 - - - 72, 20 - - - 1 - - - Center - - - nudNVENCBitrate - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNVENC - - - 3 - - - True - - - 0, 32 - - - 40, 13 - - - 0 - - - Bitrate: - - - lblNVENCBitrate - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNVENC - - - 4 - lblGIFDither @@ -1330,63 +940,6 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 4 - - True - - - NoControl - - - 0, 32 - - - 81, 13 - - - 2 - - - Dithering mode: - - - lblGIFDither - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGIF - - - 2 - - - True - - - 0, 8 - - - 72, 13 - - - 0 - - - Palette mode: - - - lblGIFStatsMode - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGIF - - - 4 - cbAMFQuality @@ -1462,108 +1015,6 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 5 - - 79, 32 - - - 192, 21 - - - 7 - - - cbAMFQuality - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tbAMF - - - 0 - - - True - - - NoControl - - - 0, 32 - - - 42, 13 - - - 6 - - - Quality: - - - lblAMFQuality - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tbAMF - - - 1 - - - 79, 5 - - - 192, 21 - - - 5 - - - cbAMFUsage - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tbAMF - - - 2 - - - True - - - NoControl - - - 0, 8 - - - 41, 13 - - - 4 - - - Usage: - - - lblAMFUsage - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tbAMF - - - 3 - lblQSVBitrateK @@ -1651,11 +1102,476 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 6 + + 16, 184 + + + 312, 112 + + + 14 + + + tcFFmpegVideoCodecs + + + ShareX.HelpersLib.TablessControl, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 14 + + + True + + + 149, 8 + + + 34, 13 + + + 3 + + + kbit/s + + + lblx264BitrateK + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpX264 + + + 0 + + + True + + + 200, 6 + + + 77, 17 + + + 4 + + + Use bitrate + + + cbx264UseBitrate + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpX264 + + + 1 + + + 72, 4 + + + 72, 20 + + + 2 + + + Center + + + nudx264Bitrate + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpX264 + + + 7 + + + True + + + NoControl + + + 149, 8 + + + 34, 13 + + + 2 + + + kbit/s + + + lblVP8BitrateK + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpVpx + + + 0 + + + 72, 4 + + + 72, 20 + + + 1 + + + Center + + + nudVP8Bitrate + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpVpx + + + 1 + + + True + + + 0, 8 + + + 40, 13 + + + 0 + + + Bitrate: + + + lblVP8Bitrate + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpVpx + + + 2 + + + True + + + 157, 32 + + + 34, 13 + + + 4 + + + kbit/s + + + lblNVENCBitrateK + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNVENC + + + 0 + + + 80, 4 + + + 232, 21 + + + 3 + + + cbNVENCPreset + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNVENC + + + 1 + + + True + + + 0, 8 + + + 40, 13 + + + 2 + + + Preset: + + + lblNVENCPreset + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNVENC + + + 2 + + + 80, 28 + + + 72, 20 + + + 1 + + + Center + + + nudNVENCBitrate + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNVENC + + + 3 + + + True + + + 0, 32 + + + 40, 13 + + + 0 + + + Bitrate: + + + lblNVENCBitrate + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNVENC + + + 4 + + + True + + + NoControl + + + 0, 32 + + + 81, 13 + + + 2 + + + Dithering mode: + + + lblGIFDither + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpGIF + + + 2 + + + True + + + 0, 8 + + + 72, 13 + + + 0 + + + Palette mode: + + + lblGIFStatsMode + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpGIF + + + 4 + + + 80, 28 + + + 232, 21 + + + 7 + + + cbAMFQuality + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tbAMF + + + 0 + + + True + + + NoControl + + + 0, 32 + + + 42, 13 + + + 6 + + + Quality: + + + lblAMFQuality + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tbAMF + + + 1 + + + 80, 4 + + + 232, 21 + + + 5 + + + cbAMFUsage + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tbAMF + + + 2 + + + True + + + NoControl + + + 0, 8 + + + 41, 13 + + + 4 + + + Usage: + + + lblAMFUsage + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tbAMF + + + 3 + True - 149, 32 + 157, 32 34, 13 @@ -1679,10 +1595,10 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 0 - 72, 4 + 80, 4 - 200, 21 + 232, 21 7 @@ -1730,7 +1646,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 2 - 72, 28 + 80, 28 72, 20 @@ -1790,7 +1706,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 128, 24 - 22 + 21 Test with CMD... @@ -1814,7 +1730,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 80, 24 - 23 + 22 Copy @@ -1831,6 +1747,75 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 22 + + tpAAC + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcFFmpegAudioCodecs + + + 0 + + + tpOpus + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcFFmpegAudioCodecs + + + 1 + + + tpVorbis + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcFFmpegAudioCodecs + + + 2 + + + tpMP3 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcFFmpegAudioCodecs + + + 3 + + + 336, 184 + + + 312, 112 + + + 15 + + + tcFFmpegAudioCodecs + + + ShareX.HelpersLib.TablessControl, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 12 + lblAACQuality @@ -1870,24 +1855,33 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 0 - + True - - NoControl - - + 0, 8 - + 40, 13 - - 2 + + 0 - + Bitrate: + + lblAACQuality + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpAAC + + + 1 + lblOpusQuality @@ -1927,20 +1921,35 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 1 - + True - + + NoControl + + 0, 8 - - 42, 13 + + 40, 13 - - 0 + + 2 - - Quality: + + Bitrate: + + + lblOpusQuality + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOpus + + + 1 lblVorbisQuality @@ -1981,21 +1990,33 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 2 - + True - + 0, 8 - + 42, 13 - + 0 - + Quality: + + lblVorbisQuality + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpVorbis + + + 1 + lblMP3Quality @@ -2035,52 +2056,31 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 3 - - 336, 184 - - - 312, 112 - - - 16 - - - tcFFmpegAudioCodecs - - - ShareX.HelpersLib.TablessControl, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 12 - - + True - + 0, 8 - - 40, 13 + + 42, 13 - + 0 - - Bitrate: + + Quality: - - lblAACQuality + + lblMP3Quality - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tpAAC + + tpMP3 - + 1 @@ -2090,7 +2090,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 312, 21 - 5 + 4 cbVideoSource @@ -2114,7 +2114,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 72, 13 - 4 + 3 Video source: @@ -2138,7 +2138,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 312, 21 - 7 + 6 cbAudioSource @@ -2162,7 +2162,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 72, 13 - 6 + 5 Audio source: @@ -2186,7 +2186,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 312, 21 - 14 + 13 cbAudioCodec @@ -2207,7 +2207,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 24, 24 - 9 + 8 ? @@ -2234,7 +2234,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 396, 13 - 10 + 9 Installs "screen-capture-recorder" and "virtual-audio-capturer" video/audio source. @@ -2258,7 +2258,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 160, 24 - 8 + 7 Install recorder devices... @@ -2282,7 +2282,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 184, 24 - 24 + 23 eiFFmpeg @@ -2306,7 +2306,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 176, 13 - 17 + 16 Additional command line arguments: @@ -2333,7 +2333,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 116, 13 - 19 + 18 Command line preview: @@ -2387,7 +2387,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 79, 13 - 25 + 10 Video encoder: @@ -2414,7 +2414,7 @@ Otherwise it can't keep up with recording and a lot of frame drops will happen.< 79, 13 - 26 + 12 Audio encoder: