Merge branch 'master' of https://github.com/optiscaler/OptiScaler

OptiScaler/low_latency/input/input_antilag2.cpp

@@ -29,7 +29,7 @@ HRESULT STDMETHODCALLTYPE AmdExtAntiLagApi::UpdateAntiLagState(VOID* pData)
 
         result = InputCommon::set_marker(inputContext, device, markerParams);
 
-        if (result != InputResult::Ok)
+        if (result != InputResult::Ok && result != InputResult::UsingDifferentInput)
         {
             LOG_ERROR("set_marker result: {}", magic_enum::enum_name(result));
             return E_FAIL;

OptiScaler/low_latency/input/input_common.cpp

@@ -1448,8 +1448,16 @@ void InputCommon::update()
 
 InputResult InputCommon::mark_present_start(IUnknown* pDevice)
 {
-    // TODO: could allow AL2 but need to check the InputMarkerMode of the active AL2 input
-    if (activeInput != LowLatencyInput::UeLowLatency)
+    auto fg = State::Instance().CurrentFG();
+    bool fsrfgTypesFrames =
+        State::Instance().activeFgOutput == FGOutput::FSRFG && fg != nullptr && fg->IsActive() && !fg->IsPaused();
+
+    // UE only sends simulation markers
+    bool marksEnds =
+        activeInput == LowLatencyInput::UeLowLatency || (activeInput == LowLatencyInput::AntiLag2 && fsrfgTypesFrames &&
+                                                         !reports_frame_generation(LowLatencyInput::AntiLag2));
+
+    if (!marksEnds)
         return InputResult::InputNotSupported;
 
     // TODO: this is missing the frame id required by other outputs