Merge pull request #9 from FrostNovaHD/patch-9

Patch 9
WesleyVanNeck · Mar 2, 2024 · 5ebef80 · 5ebef80
2 parents 483af95 + 81600fb
commit 5ebef80
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/README.rst b/README.rst
@@ -15,7 +15,7 @@ System Requirements
 
 .. warning:: This table is a work in progress. Do not purchase hardware based on this.
 
-**Minimum Requirements**
+**Minimum Requirements** 
 
 +------------+------------------------------------------------------------+
 | GPU        | AMD: VCE 1.0 or higher, see `obs-amd hardware support`_    |

diff --git a/src/platform/windows/display_wgc.cpp b/src/platform/windows/display_wgc.cpp
@@ -130,12 +130,12 @@ namespace platf::dxgi {
     }
     if (frame != nullptr) {
       AcquireSRWLockExclusive(&frame_lock);
-      if (produced_frame) {
+      if (produced_frame)
         produced_frame.Close();
-      }
+
       produced_frame = frame;
-      WakeConditionVariable(&frame_present_cv);
       ReleaseSRWLockExclusive(&frame_lock);
+      WakeConditionVariable(&frame_present_cv);
     }
   }
 
@@ -145,7 +145,11 @@ namespace platf::dxgi {
     release_frame();
 
     AcquireSRWLockExclusive(&frame_lock);
-    if (timeout.count() > 0 && SleepConditionVariableSRW(&frame_present_cv, &frame_lock, timeout.count(), 0) == FALSE) {
+
+    if (produced_frame == nullptr && SleepConditionVariableSRW(&frame_present_cv, &frame_lock, timeout.count(), 0) == 0) {
+
+
+
       ReleaseSRWLockExclusive(&frame_lock);
       if (GetLastError() == ERROR_TIMEOUT)
         return capture_e::timeout;
@@ -157,7 +161,11 @@ namespace platf::dxgi {
       produced_frame = nullptr;
     }
     ReleaseSRWLockExclusive(&frame_lock);
-    if (consumed_frame == nullptr && timeout.count() == 0)
+
+    if (consumed_frame == nullptr)  // spurious wakeup
+
+
+
       return capture_e::timeout;
 
     auto capture_access = consumed_frame.Surface().as<winrt::IDirect3DDxgiInterfaceAccess>();