Osc orchestration

apps/LoopThroughWithOpenGLCompositing/gl/RenderEngine.h

@@ -12,6 +12,7 @@
 #include <cstdint>
 #include <chrono>
 #include <functional>
+#include <map>
 #include <string>
 #include <vector>
 
@@ -21,7 +22,29 @@ public:
 	using RenderEffectCallback = std::function<void()>;
 	using ScreenshotCallback = std::function<void()>;
 	using PreviewPaintCallback = std::function<void()>;
-	using OverlayApplier = std::function<void(std::vector<RuntimeRenderState>& states, bool allowCommit)>;
+
+	struct OscOverlayUpdate
+	{
+		std::string routeKey;
+		std::string layerKey;
+		std::string parameterKey;
+		JsonValue targetValue;
+	};
+
+	struct OscOverlayCommitCompletion
+	{
+		std::string routeKey;
+		uint64_t generation = 0;
+	};
+
+	struct OscOverlayCommitRequest
+	{
+		std::string routeKey;
+		std::string layerKey;
+		std::string parameterKey;
+		JsonValue value;
+		uint64_t generation = 0;
+	};
 
 	RenderEngine(
 		RuntimeSnapshotProvider& runtimeSnapshotProvider,
@@ -57,6 +80,10 @@ public:
 	const std::vector<RuntimeRenderState>& CommittedLayerStates() const;
 	void ResetTemporalHistoryState();
 	void ResetShaderFeedbackState();
+	void ClearOscOverlayState();
+	void UpdateOscOverlayState(
+		const std::vector<OscOverlayUpdate>& updates,
+		const std::vector<OscOverlayCommitCompletion>& completedCommits);
 	void ResizeView(int width, int height);
 	bool TryPresentPreview(bool force, unsigned previewFps, unsigned outputFrameWidth, unsigned outputFrameHeight);
 	bool TryUploadInputFrame(const VideoIOFrame& inputFrame, const VideoIOState& videoState);
@@ -65,7 +92,8 @@ public:
 		bool useCommittedLayerStates,
 		unsigned renderWidth,
 		unsigned renderHeight,
-		OverlayApplier overlayApplier,
+		double oscSmoothing,
+		std::vector<OscOverlayCommitRequest>* commitRequests,
 		std::vector<RuntimeRenderState>& layerStates);
 	void RenderLayerStack(
 		bool hasInputSource,
@@ -87,10 +115,32 @@ private:
 	CRITICAL_SECTION& mMutex;
 	HDC mHdc;
 	HGLRC mHglrc;
+
+	struct OscOverlayState
+	{
+		std::string layerKey;
+		std::string parameterKey;
+		JsonValue targetValue;
+		ShaderParameterValue currentValue;
+		bool hasCurrentValue = false;
+		std::chrono::steady_clock::time_point lastUpdatedTime;
+		std::chrono::steady_clock::time_point lastAppliedTime;
+		uint64_t generation = 0;
+		uint64_t pendingCommitGeneration = 0;
+		bool commitQueued = false;
+	};
+
+	void ApplyOscOverlays(
+		std::vector<RuntimeRenderState>& states,
+		bool allowCommit,
+		double smoothing,
+		std::vector<OscOverlayCommitRequest>* commitRequests);
+
 	std::vector<RuntimeRenderState> mCachedLayerRenderStates;
 	uint64_t mCachedRenderStateVersion = 0;
 	uint64_t mCachedParameterStateVersion = 0;
 	unsigned mCachedRenderStateWidth = 0;
 	unsigned mCachedRenderStateHeight = 0;
 	std::chrono::steady_clock::time_point mLastPreviewPresentTime;
+	std::map<std::string, OscOverlayState> mOscOverlayStates;
 };