kmenshikov/GSS2Rework
1
0
Fork 0
forked from amkovkov/GranuSightSoftware2
Code Pull Requests Activity

fix: CameraService view finder

Browse Source 
Image capturing while view finder work
This commit is contained in:
amkovkov
2026-02-09 09:42:39 +03:00
parent 47b8d60c52
commit 47ca758fbb
6 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSS2.Core/Hardware/CameraService.cs
+17 -7
View File
@@ -79,6 +79,8 @@ public class CameraService : IDisposable
private List<MappedBuffer>? _imageCaptureMappedBuffers;
private readonly CancellationTokenSource _disposeCts = new CancellationTokenSource();
public bool IsImageCapturing { get; private set; } = false;
public CameraService(ILogger<CameraService> logger, CameraServiceConfiguration? configuration = null, bool autoInitialize = false)
{
_logger = logger;
@@ -488,6 +490,8 @@ public class CameraService : IDisposable
.CreateLinkedTokenSource(_disposeCts.Token, cancellationToken)
.Token;
IsImageCapturing = true;
_logger.LogDebug("Capturing {} frame(s)", framesCount);
OpenCvSharp.Mat? image = null;
@@ -501,8 +505,6 @@ public class CameraService : IDisposable
{
effectiveCancellationToken.ThrowIfCancellationRequested();
_logger.LogDebug("Requested {} frame(s), now collected {}", framesCount, planesData.Count());
if (File.Exists("/proc/self/status"))
_logger.LogDebug("Current RAM Usage: {}", File.ReadAllLines("/proc/self/status").FirstOrDefault(l => l.StartsWith("RssAnon:"))?.Substring("RssAnon:".Length)?.Trim() ?? "UNKNOWN");
var oldPlanesDataCount = planesData.Count();
@@ -521,7 +523,7 @@ public class CameraService : IDisposable
throw new Exception("Error while request create");
requests.Add(request);
}
_logger.LogDebug("Request(s) created");
_logger.LogDebug("{} request(s) created", requests.Count());
effectiveCancellationToken.ThrowIfCancellationRequested();
@@ -578,6 +580,8 @@ public class CameraService : IDisposable
planesData.Add(planeData);
}
_logger.LogDebug("Planes data added");
if (planesData.Count() - oldPlanesDataCount == requests.Count())
cts.SetResult();
}
@@ -592,8 +596,9 @@ public class CameraService : IDisposable
throw new Exception("Error while request queue");
}
}
_logger.LogDebug("Request(s) queued");
_logger.LogDebug("{} request(s) queued", requests.Count());
await cts.Task.WaitAsync(effectiveCancellationToken);
_logger.LogDebug("{} request(s) compilted", requests.Count());
_camera.RequestCompleted -= RequestCompleted;
foreach (var key in fdsData.Keys)
@@ -604,9 +609,6 @@ public class CameraService : IDisposable
}
_logger.LogDebug("Frame(s) collected");
if (File.Exists("/proc/self/status"))
_logger.LogDebug("Current RAM Usage: {}", File.ReadAllLines("/proc/self/status").FirstOrDefault(l => l.StartsWith("RssAnon:"))?.Substring("RssAnon:".Length)?.Trim() ?? "UNKNOWN");
effectiveCancellationToken.ThrowIfCancellationRequested();
@@ -657,6 +659,8 @@ public class CameraService : IDisposable
#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
planesData.Clear();
}
IsImageCapturing = false;
return image;
}
@@ -707,6 +711,9 @@ public class CameraService : IDisposable
void TimerElapsed(object? sender, System.Timers.ElapsedEventArgs ea)
{
if (IsImageCapturing)
return;
try
{
FrameBuffer buffer;
@@ -766,6 +773,9 @@ public class CameraService : IDisposable
}
public (FrameBuffer, StreamConfiguration)? GrabViewFinderFrame()
{
if (IsImageCapturing)
return null;
FrameBuffer? buffer = null;
lock (ViewFinderBufferQueue)
if (ViewFinderBufferQueue.Count() > 0)
GSS2.Test/ViewModels/MainViewModel.cs
+1 -1
View File
@@ -23,7 +23,7 @@ public partial class MainViewModel : ViewModelBase
ResourcesViewModel = resourcesViewModel;
ButtonClick = new RelayCommand(() =>
{
cameraService.CaptureImage(CancellationToken.None, 10).ContinueWith(image => Image = image.Result);
Task.Run(() => cameraService.CaptureImage(CancellationToken.None, 10).ContinueWith(image => Image = image.Result));
});
_logger.LogInformation("{} initialized", nameof(MainViewModel));
GSS2.Test/Views/MainView.axaml
+7 -5
View File
@@ -6,10 +6,12 @@
xmlns:core="using:GSS2.UI.Core"
x:DataType="local_vm:MainViewModel"
x:Class="GSS2.Test.Views.MainView">
<Grid ColumnDefinitions="*,Auto">
<core:OpenCvImage Grid.Column="0" Image="{Binding Image}" />
<Button Grid.Column="1" Width="50" VerticalAlignment="Stretch" Command="{Binding ButtonClick}"/>
<!-- <ContentControl Grid.Row="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Content="{Binding CameraViewModel}" /> -->
<!-- <ContentControl Grid.Row="1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Content="{Binding ResourcesViewModel}" /> -->
<Grid RowDefinitions="*,*">
<Grid Grid.Row="0" ColumnDefinitions="*,*,Auto">
<ContentControl Grid.Column="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Content="{Binding CameraViewModel}" />
<core:OpenCvImage Grid.Column="1" Image="{Binding Image}" />
<Button Grid.Column="2" Width="50" VerticalAlignment="Stretch" Command="{Binding ButtonClick}"/>
</Grid>
<ContentControl Grid.Row="1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Content="{Binding ResourcesViewModel}" />
</Grid>
</UserControl>
GSS2.Test/appsettings.json
+2 -2
View File
@@ -39,8 +39,8 @@
"Camera": {
"CameraId": "",
"ViewFinderFrameBufferCount": 5,
"ViewFinderWidth": 1920,
"ViewFinderHeight": 1080,
"ViewFinderWidth": 4056,
"ViewFinderHeight": 3040,
"ViewFinderFps": 30,
"ImageCaptureFrameBufferCount": 2,
"ImageCaptureWidth": 4056,
GSS2.UI.Core/ViewModels/CameraViewModel.cs
+6 -1
View File
@@ -28,7 +28,11 @@ public partial class CameraViewModel : ViewModelBase, IDisposable
_cameraService = cameraService;
_logger = logger;
_renderTimer = new System.Timers.Timer(33);
_renderTimer.Elapsed += (_, _) => RenderReqested?.Invoke(this, new EventArgs());
_renderTimer.Elapsed += (_, _) =>
{
if (!_cameraService.IsImageCapturing)
RenderReqested?.Invoke(this, new EventArgs());
};
_logger.LogInformation("{} initialized", nameof(CameraViewModel));
}
@@ -42,6 +46,7 @@ public partial class CameraViewModel : ViewModelBase, IDisposable
_renderTimer.Stop();
_cameraService.StopViewFinder();
}
public bool CanGrabViewFinderFrame() => !_cameraService.IsImageCapturing;
public (FrameBuffer, StreamConfiguration)? GrabViewFinderFrame() => _cameraService.GrabViewFinderFrame();
public void ReturnViewFinderFrame(FrameBuffer frameBuffer) => _cameraService.ReturnViewFinderFrame(frameBuffer);
GSS2.UI.Core/Views/CameraView.axaml.cs
+10 -8
View File
@@ -391,8 +391,10 @@ public partial class CameraView : OpenGlControlBase
try
{
(LibCameraSharp.FrameBuffer, LibCameraSharp.StreamConfiguration)? frame = null;
while (frame is null)
while (frame is null && (DataContext as CameraViewModel)?.CanGrabViewFinderFrame() == true)
frame = (DataContext as CameraViewModel)?.GrabViewFinderFrame();
if (frame is null)
return;
var (frameBuffer, streamConfiguration) = frame.Value;
// 0. Проверяем что полученый фрейм ожидаемый праильный формат
@@ -429,12 +431,12 @@ public partial class CameraView : OpenGlControlBase
return;
}
var plane = frameBuffer.Planes.First();
if (plane.Length != width * height * 4)
{
_logger.LogError("Cannot render frame, plane validation error, expected plane size 0x{:X}, got 0x{:X}", width * height * 4, plane.Length);
(DataContext as CameraViewModel)?.ReturnViewFinderFrame(frameBuffer);
return;
}
// if (plane.Length != width * height * 4)
// {
// _logger.LogError("Cannot render frame, plane validation error, expected plane size 0x{:X}, got 0x{:X}", width * height * 4, plane.Length);
// (DataContext as CameraViewModel)?.ReturnViewFinderFrame(frameBuffer);
// return;
// }
var fd = plane.Fd.Get();
if (fd <= 0)
{
@@ -468,7 +470,7 @@ public partial class CameraView : OpenGlControlBase
OpenGLContext.EGL_LINUX_DRM_FOURCC_EXT, unchecked((int)OpenGLContext.DRM_FORMAT_BGRX8888),
OpenGLContext.EGL_DMA_BUF_PLANE0_FD_EXT, fd,
OpenGLContext.EGL_DMA_BUF_PLANE0_OFFSET_EXT, 0,
OpenGLContext.EGL_DMA_BUF_PLANE0_PITCH_EXT, (int)(width * 4),
OpenGLContext.EGL_DMA_BUF_PLANE0_PITCH_EXT, (int)(plane.Length / height),
EglConsts.EGL_NONE
};
image = _openGLContext.EglCreateImageKHR.Invoke(_openGLContext.EglDisplay, IntPtr.Zero, OpenGLContext.EGL_LINUX_DMA_BUF_EXT, IntPtr.Zero, attribs);