CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-28 11:10:23 +12:00
Code Issues Packages Projects Releases Wiki Activity

Added ddagrab (Desktop Duplication API) support to screen recording

Browse source
This commit is contained in:
Jaex 2023-07-07 11:37:40 +03:00
parent 049172d146
commit 03e83ae240
3 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ShareX.MediaLib/FFmpegCLIManager.cs
View file

@ -40,6 +40,7 @@ public class FFmpegCLIManager : ExternalCLIManager
{
public const string SourceNone = "None";
public const string SourceGDIGrab = "GDI grab";
public const string SourceDDAGrab = "Desktop Duplication API";
public const string SourceVideoDevice = "screen-capture-recorder";
public const string SourceAudioDevice = "virtual-audio-capturer";

6
ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.cs
View file

@ -157,6 +157,12 @@ private async Task RefreshSourcesAsync(bool selectDevices = false)
cbVideoSource.Items.Clear();
cbVideoSource.Items.Add(FFmpegCLIManager.SourceNone);
cbVideoSource.Items.Add(FFmpegCLIManager.SourceGDIGrab);
if (Helpers.IsWindows10OrGreater())
{
cbVideoSource.Items.Add(FFmpegCLIManager.SourceDDAGrab);
}
cbAudioSource.Items.Clear();
cbAudioSource.Items.Add(FFmpegCLIManager.SourceNone);

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

@ -30,6 +30,7 @@
using System.Globalization;
using System.IO;
using System.Text;
using System.Windows.Forms;
namespace ShareX.ScreenCaptureLib
{
@ -120,6 +121,46 @@ public string GetFFmpegArgs(bool isCustom = false)
args.Append($"-i audio={Helpers.EscapeCLIText(FFmpeg.AudioSource)} ");
}
}
else if (FFmpeg.VideoSource.Equals(FFmpegCLIManager.SourceDDAGrab, StringComparison.OrdinalIgnoreCase))
{
int monitorIndex = 0;
Rectangle captureArea = Screen.AllScreens[0].Bounds;
int maxIntersectionArea = 0;
for (int i = 0; i < Screen.AllScreens.Length; i++)
{
Screen screen = Screen.AllScreens[i];
Rectangle intersection = Rectangle.Intersect(screen.Bounds, CaptureArea);
int intersectionArea = intersection.Width * intersection.Height;
if (intersectionArea > maxIntersectionArea)
{
maxIntersectionArea = intersectionArea;
monitorIndex = i;
captureArea = new Rectangle(intersection.X - screen.Bounds.X, intersection.Y - screen.Bounds.Y, intersection.Width, intersection.Height);
}
}
// https://ffmpeg.org/ffmpeg-filters.html#ddagrab
AppendInputDevice(args, "lavfi", FFmpeg.IsAudioSourceSelected);
args.Append("-i ddagrab=");
args.Append($"output_idx={monitorIndex}:"); // DXGI Output Index to capture.
args.Append($"draw_mouse={DrawCursor.ToString().ToLowerInvariant()}:"); // Whether to draw the mouse cursor.
args.Append($"framerate={framerate}:"); // Framerate at which the desktop will be captured.
args.Append($"offset_x={captureArea.X}:"); // Horizontal offset of the captured video.
args.Append($"offset_y={captureArea.Y}:"); // Vertical offset of the captured video.
args.Append($"video_size={captureArea.Width}x{captureArea.Height}:"); // Specify the size of the captured video.
args.Append("output_fmt=bgra"); // Desired filter output format.
if (FFmpeg.VideoCodec != FFmpegVideoCodec.h264_nvenc && FFmpeg.VideoCodec != FFmpegVideoCodec.hevc_nvenc)
{
args.Append(",hwdownload");
args.Append(",format=bgra");
}
args.Append(" ");
}
else
{
AppendInputDevice(args, "dshow", FFmpeg.IsAudioSourceSelected);
@ -213,7 +254,6 @@ public string GetFFmpegArgs(bool isCustom = false)
case FFmpegVideoCodec.hevc_nvenc:
args.Append($"-preset {FFmpeg.NVENC_Preset} ");
args.Append($"-b:v {FFmpeg.NVENC_Bitrate}k ");
args.Append("-pix_fmt yuv420p ");
args.Append("-movflags +faststart "); // This will move some information to the beginning of your file and allow the video to begin playing before it is completely downloaded by the viewer
break;
case FFmpegVideoCodec.h264_amf: