CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 09:47:22 +13:00
Code Issues Projects Releases Packages Wiki Activity

Workaround for incorrect output_idx issue

Browse source
This commit is contained in:
Jaex 2023-07-14 00:52:22 +03:00
parent f7a8d504ee
commit 4f4f983b9a
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ShareX.ScreenCaptureLib/ScreenRecording/ScreenRecordingOptions.cs
View file

@ -29,6 +29,7 @@ You should have received a copy of the GNU General Public License
using System.Drawing; using System.Drawing;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
@ -123,13 +124,14 @@ public string GetFFmpegArgs(bool isCustom = false)
} }
else if (FFmpeg.VideoSource.Equals(FFmpegCLIManager.SourceDDAGrab, StringComparison.OrdinalIgnoreCase)) else if (FFmpeg.VideoSource.Equals(FFmpegCLIManager.SourceDDAGrab, StringComparison.OrdinalIgnoreCase))
{ {
Screen[] screens = Screen.AllScreens.OrderBy(x => !x.Primary).ToArray();
int monitorIndex = 0; int monitorIndex = 0;
Rectangle captureArea = Screen.AllScreens[0].Bounds; Rectangle captureArea = screens[0].Bounds;
int maxIntersectionArea = 0; int maxIntersectionArea = 0;
for (int i = 0; i < Screen.AllScreens.Length; i++) for (int i = 0; i < screens.Length; i++)
{ {
Screen screen = Screen.AllScreens[i]; Screen screen = screens[i];
Rectangle intersection = Rectangle.Intersect(screen.Bounds, CaptureArea); Rectangle intersection = Rectangle.Intersect(screen.Bounds, CaptureArea);
int intersectionArea = intersection.Width * intersection.Height; int intersectionArea = intersection.Width * intersection.Height;
@ -139,14 +141,14 @@ public string GetFFmpegArgs(bool isCustom = false)
monitorIndex = i; monitorIndex = i;
captureArea = new Rectangle(intersection.X - screen.Bounds.X, intersection.Y - screen.Bounds.Y, intersection.Width, intersection.Height); captureArea = new Rectangle(intersection.X - screen.Bounds.X, intersection.Y - screen.Bounds.Y, intersection.Width, intersection.Height);
if (FFmpeg.IsEvenSizeRequired)
{
captureArea = CaptureHelpers.EvenRectangleSize(captureArea);
}
} }
} }
if (FFmpeg.IsEvenSizeRequired)
{
captureArea = CaptureHelpers.EvenRectangleSize(captureArea);
}
// https://ffmpeg.org/ffmpeg-filters.html#ddagrab // https://ffmpeg.org/ffmpeg-filters.html#ddagrab
AppendInputDevice(args, "lavfi", FFmpeg.IsAudioSourceSelected); AppendInputDevice(args, "lavfi", FFmpeg.IsAudioSourceSelected);
args.Append("-i ddagrab="); args.Append("-i ddagrab=");