Clean up video IO

src/RenderCadenceCompositor.cpp

@@ -7,8 +7,9 @@
 #include "render/thread/RenderThread.h"
 #include "video/decklink/DeckLinkInput.h"
 #include "video/decklink/DeckLinkInputThread.h"
-#include "DeckLinkDisplayMode.h"
-#include "VideoIOFormat.h"
+#include "video/decklink/DeckLinkDisplayMode.h"
+#include "video/core/VideoIOFormat.h"
+#include "video/core/VideoMode.h"
 
 #include <windows.h>
 
@@ -93,7 +94,7 @@ int main(int argc, char** argv)
 	}
 
 	SystemFrameExchangeConfig frameExchangeConfig;
-	RenderCadenceCompositor::VideoFormatDimensions(
+	VideoFormatDimensions(
 		appConfig.outputVideoFormat,
 		frameExchangeConfig.width,
 		frameExchangeConfig.height);
@@ -108,7 +109,7 @@ int main(int argc, char** argv)
 	SystemFrameExchange frameExchange(frameExchangeConfig);
 
 	InputFrameMailboxConfig inputMailboxConfig;
-	RenderCadenceCompositor::VideoFormatDimensions(
+	VideoFormatDimensions(
 		appConfig.inputVideoFormat,
 		inputMailboxConfig.width,
 		inputMailboxConfig.height);
@@ -194,9 +195,9 @@ int main(int argc, char** argv)
 	RenderThread::Config renderConfig;
 	renderConfig.width = frameExchangeConfig.width;
 	renderConfig.height = frameExchangeConfig.height;
-	const double fallbackFrameDurationMilliseconds = RenderCadenceCompositor::FrameDurationMillisecondsFromRateString(appConfig.outputFrameRate);
+	const double fallbackFrameDurationMilliseconds = FrameDurationMillisecondsFromRateString(appConfig.outputFrameRate);
 	renderConfig.frameDurationMilliseconds = outputVideoModeResolved
-		? RenderCadenceCompositor::FrameDurationMillisecondsFromDisplayMode(outputVideoMode.displayMode, fallbackFrameDurationMilliseconds)
+		? outputVideoMode.frameDurationMilliseconds
 		: fallbackFrameDurationMilliseconds;
 	renderConfig.pboDepth = kReadbackDepth;