From 2053bb8297c7d1a56ad2b1d5a150d5ac1e396f06 Mon Sep 17 00:00:00 2001
From: Arthur <arthur.brainville@eonreality.com>
Date: Thu, 14 Jun 2018 14:14:11 +0200
Subject: [PATCH 1/8] Permit to change the camera settings after compilation

Add CameraConfiguration.h, a class that parse a key=value file and get
the camera parameters. Implemented in a single header in the
SharedHeaders project.

Added static variables to be able to change the camera frame
configuraion. (They are initialized by default to their values in
CameraConstants.h)

Added the loading of the camrea configuration file into the
UnityCompositorInterface. If file isn't found, the old behavior of SV is
not changed.
---
 .../Calibration/Calibration/Main.cpp          |  20 +++
 .../CompositorDLL/CompositorDLL.cpp           | Bin 366 -> 832 bytes
 .../CompositorDLL/CompositorInterface.cpp     |   7 +-
 .../CompositorDLL/CompositorInterface.h       |   2 +-
 .../CompositorDLL/DeckLinkDevice.cpp          |  22 ++--
 .../Compositor/CompositorDLL/DeckLinkDevice.h |   6 +-
 .../CompositorDLL/DeckLinkManager.cpp         |  10 +-
 .../CompositorDLL/ElgatoFrameProvider.cpp     |  24 ++--
 .../CompositorDLL/ElgatoSampleCallback.cpp    |   8 +-
 .../CompositorDLL/OpenCVFrameProvider.cpp     |  24 ++--
 .../SharedHeaders/CameraConfigurationFile.h   | 115 ++++++++++++++++++
 .../Compositor/SharedHeaders/DirectXHelper.h  |   4 +-
 .../SharedHeaders/FrameProviderStaticConfig.h |  26 ++++
 .../SharedHeaders/SharedHeaders.vcxitems      |   2 +
 .../UnityCompositorInterface.cpp              | Bin 39662 -> 40876 bytes
 .../UnityCompositorInterface.vcxproj          |  12 +-
 16 files changed, 226 insertions(+), 56 deletions(-)
 create mode 100644 SpectatorView/Compositor/SharedHeaders/CameraConfigurationFile.h
 create mode 100644 SpectatorView/Compositor/SharedHeaders/FrameProviderStaticConfig.h

diff --git a/SpectatorView/Calibration/Calibration/Main.cpp b/SpectatorView/Calibration/Calibration/Main.cpp
index 3328dd1b..f94f917c 100644
--- a/SpectatorView/Calibration/Calibration/Main.cpp
+++ b/SpectatorView/Calibration/Calibration/Main.cpp
@@ -4,6 +4,11 @@
 #include "stdafx.h"
 #include "CalibrationApp.h"
 
+#define CAMERA_CFG_STATIC_IMPL
+#include "CameraConfigurationFile.h"
+
+#include <string>
+using namespace std::string_literals;
 using namespace DirectX;
 
 namespace
@@ -16,6 +21,21 @@ LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
 // Entry point
 int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR lpCmdLine, _In_ int nCmdShow)
 {
+
+	auto const filePath = CameraConfigurationFile::getMyDocumentPath() + "\\camera.cfg"s;
+
+	OutputDebugStringA(filePath.c_str());
+
+	try
+	{
+		CameraConfigurationFile cfg(filePath);
+		cfg.readConfig();
+	}
+	catch(const std::exception& e)
+	{
+		OutputDebugStringA(e.what());
+	}
+
     UNREFERENCED_PARAMETER(hPrevInstance);
     UNREFERENCED_PARAMETER(lpCmdLine);
 
diff --git a/SpectatorView/Compositor/CompositorDLL/CompositorDLL.cpp b/SpectatorView/Compositor/CompositorDLL/CompositorDLL.cpp
index 3e202deea9fb352bac4efd7ff0e522f6beddc78e..8f4a036963afc96ce89990e399640563fc6e7d7c 100644
GIT binary patch
literal 832
zcmbu7OHaa35QWd$#Q)IfMmMs@xG-3R1k?!8r6GMt4N%e+)IYC&GbJf#Sg2`w@7%d(
z&Y8#k{Aj7AKpo{;>Rp90J!`58--#lfvJde^+~g|xQ@=BOL4>UnJQ>zPXP_@N;|sQ!
zN<Sq;CwSMaF~~z5plsR$=TC??M2u&J9XmRJdx~XQ^fms0HpLP5h8Te8DAWy}kaGr0
z6Td_|*9*wVE3i}UR?1$0obBXM$JclBof<83`;T2AB5vi`20EgG3VTAA-l%bkXCKl!
zIQI^g@Km0I`K${S3=7tBi(?;8m)s{XCA#wp*Ra*S8##~7Ci3|%$jYYM<Yk=JC7br|
zdD?30)zxf9fi9foo)<8r|4({k9#_n)r*rSZ|CH<%G;i~}Ru9F#uF)EA)Kcb>``rFo
XTgr6o?V8qu*AnWMy1I0Fv{Cs2J6nzk

delta 16
VcmX@W_Ks;o8Y2fU0~Z4b0{|yz0|Wp7

diff --git a/SpectatorView/Compositor/CompositorDLL/CompositorInterface.cpp b/SpectatorView/Compositor/CompositorDLL/CompositorInterface.cpp
index 2a36d647..b30d1bce 100644
--- a/SpectatorView/Compositor/CompositorDLL/CompositorInterface.cpp
+++ b/SpectatorView/Compositor/CompositorDLL/CompositorInterface.cpp
@@ -3,6 +3,7 @@
 
 #include "stdafx.h"
 #include "CompositorInterface.h"
+#include "FrameProviderStaticConfig.h"
 
 
 CompositorInterface::CompositorInterface()
@@ -172,7 +173,7 @@ void CompositorInterface::TakePicture(ID3D11Texture2D* outputTexture)
 
     // Get bytes from texture because screengrab does not support texture format provided by Unity.
     DirectXHelper::GetBytesFromTexture(_device, outputTexture, FRAME_BPP, photoBytes);
-    ID3D11Texture2D* tex = DirectXHelper::CreateTexture(_device, photoBytes, FRAME_WIDTH, FRAME_HEIGHT, FRAME_BPP, DXGI_FORMAT_B8G8R8A8_UNORM_SRGB);
+    ID3D11Texture2D* tex = DirectXHelper::CreateTexture(_device, photoBytes, FrameProviderStaticConfig::width, FrameProviderStaticConfig::height, FRAME_BPP, DXGI_FORMAT_B8G8R8A8_UNORM_SRGB);
 
     photoIndex++;
     std::wstring photoPath = DirectoryHelper::FindUniqueFileName(outputPath, L"Photo", L".png", photoIndex);
@@ -183,7 +184,7 @@ void CompositorInterface::TakePicture(ID3D11Texture2D* outputTexture)
 
 bool CompositorInterface::InitializeVideoEncoder(ID3D11Device* device)
 {
-    videoEncoder = new VideoEncoder(FRAME_WIDTH, FRAME_HEIGHT, FRAME_WIDTH * FRAME_BPP, VIDEO_FPS,
+    videoEncoder = new VideoEncoder(FrameProviderStaticConfig::width, FrameProviderStaticConfig::height, FrameProviderStaticConfig::width * FRAME_BPP, UINT(std::ceil(FrameProviderStaticConfig::fps)),
         AUDIO_BUFSIZE, AUDIO_SAMPLE_RATE, AUDIO_CHANNELS, AUDIO_BPS);
 
     return videoEncoder->Initialize(device);
@@ -254,7 +255,7 @@ void CompositorInterface::AllocateVideoBuffers()
 
     for (int i = 0; i < NUM_VIDEO_BUFFERS; i++)
     {
-        videoBytes[i] = new byte[(int)(1.5f * FRAME_WIDTH * FRAME_HEIGHT)];
+        videoBytes[i] = new byte[(int)(1.5f * FrameProviderStaticConfig::width * FrameProviderStaticConfig::height)];
     }
 }
 
diff --git a/SpectatorView/Compositor/CompositorDLL/CompositorInterface.h b/SpectatorView/Compositor/CompositorDLL/CompositorInterface.h
index 02fa7ec1..541b532d 100644
--- a/SpectatorView/Compositor/CompositorDLL/CompositorInterface.h
+++ b/SpectatorView/Compositor/CompositorDLL/CompositorInterface.h
@@ -107,7 +107,7 @@ class CompositorInterface
     int lastVideoFrame = -1;
     BufferedTextureFetch VideoTextureBuffer;
     VideoEncoder* videoEncoder = nullptr;
-    byte* photoBytes = new byte[FRAME_BUFSIZE];
+    byte* photoBytes = new byte[FrameProviderStaticConfig::getFrameBuffSize()];
     byte** videoBytes = nullptr;
     int videoBufferIndex = 0;
 
diff --git a/SpectatorView/Compositor/CompositorDLL/DeckLinkDevice.cpp b/SpectatorView/Compositor/CompositorDLL/DeckLinkDevice.cpp
index 63fc27d9..d5db33dc 100644
--- a/SpectatorView/Compositor/CompositorDLL/DeckLinkDevice.cpp
+++ b/SpectatorView/Compositor/CompositorDLL/DeckLinkDevice.cpp
@@ -30,6 +30,8 @@
 
 #include <comutil.h>
 #include "DeckLinkDevice.h"
+#include "FrameProviderStaticConfig.h"
+
 
 using namespace std;
 
@@ -44,7 +46,7 @@ DeckLinkDevice::DeckLinkDevice(IDeckLink* device) :
 {
     for (int i = 0; i < MAX_NUM_CACHED_BUFFERS; i++)
     {
-        bufferCache[i].buffer = new BYTE[FRAME_BUFSIZE];
+        bufferCache[i].buffer = new BYTE[FrameProviderStaticConfig::getFrameBuffSize()];
         bufferCache[i].timeStamp = 0;
     }
 
@@ -156,13 +158,13 @@ bool DeckLinkDevice::Init(ID3D11ShaderResourceView* colorSRV)
     IDeckLinkDisplayMode*           displayMode = NULL;
     BSTR                            deviceNameBSTR = NULL;
 
-    ZeroMemory(rawBuffer, FRAME_BUFSIZE_RAW);
-    ZeroMemory(latestBuffer, FRAME_BUFSIZE);
-    ZeroMemory(outputBuffer, FRAME_BUFSIZE);
+    ZeroMemory(rawBuffer, FrameProviderStaticConfig::getFrameBuffSizeRaw());
+    ZeroMemory(latestBuffer, FrameProviderStaticConfig::getFrameBuffSize());
+    ZeroMemory(outputBuffer, FrameProviderStaticConfig::getFrameBuffSize());
 
     for (int i = 0; i < MAX_NUM_CACHED_BUFFERS; i++)
     {
-        ZeroMemory(bufferCache[i].buffer, FRAME_BUFSIZE);
+        ZeroMemory(bufferCache[i].buffer, FrameProviderStaticConfig::getFrameBuffSize());
     }
 
     captureFrameIndex = 0;
@@ -200,7 +202,7 @@ bool DeckLinkDevice::Init(ID3D11ShaderResourceView* colorSRV)
     // 1080i output causes horizontal artifacts on screen.
     if (m_deckLinkOutput != NULL)
     {
-        m_deckLinkOutput->CreateVideoFrame(FRAME_WIDTH, FRAME_HEIGHT, FRAME_WIDTH * FRAME_BPP, bmdFormat8BitBGRA, bmdFrameFlagDefault, &outputFrame);
+        m_deckLinkOutput->CreateVideoFrame(FrameProviderStaticConfig::width, FrameProviderStaticConfig::height, FrameProviderStaticConfig::width * FRAME_BPP, bmdFormat8BitBGRA, bmdFrameFlagDefault, &outputFrame);
         outputFrame->GetBytes((void**)&outputBuffer);
     }
 
@@ -294,7 +296,7 @@ HRESULT DeckLinkDevice::VideoInputFormatChanged(/* in */ BMDVideoInputFormatChan
     OutputDebugString(L"\n");
 
     // If we do not have the correct dimension frames - loop until user changes camera settings.
-    if (newMode->GetWidth() != FRAME_WIDTH || newMode->GetHeight() != FRAME_HEIGHT)
+    if (newMode->GetWidth() != FrameProviderStaticConfig::width || newMode->GetHeight() != FrameProviderStaticConfig::height)
     {
         OutputDebugString(L"Invalid frame dimensions detected.\n");
         OutputDebugString(L"Actual Frame Dimensions: ");
@@ -304,9 +306,9 @@ HRESULT DeckLinkDevice::VideoInputFormatChanged(/* in */ BMDVideoInputFormatChan
         OutputDebugString(L"\n");
 
         OutputDebugString(L"Expected Frame Dimensions: ");
-        OutputDebugString(std::to_wstring(FRAME_WIDTH).c_str());
+        OutputDebugString(std::to_wstring(FrameProviderStaticConfig::width).c_str());
         OutputDebugString(L", ");
-        OutputDebugString(std::to_wstring(FRAME_HEIGHT).c_str());
+        OutputDebugString(std::to_wstring(FrameProviderStaticConfig::height).c_str());
         OutputDebugString(L"\n");
 
         LeaveCriticalSection(&m_captureCardCriticalSection);
@@ -417,7 +419,7 @@ void DeckLinkDevice::Update(int compositeFrameIndex)
         const BufferCache& buffer = bufferCache[compositeFrameIndex % MAX_NUM_CACHED_BUFFERS];
         if (buffer.buffer != nullptr)
         {
-            DirectXHelper::UpdateSRV(device, _colorSRV, buffer.buffer, FRAME_WIDTH * FRAME_BPP);
+            DirectXHelper::UpdateSRV(device, _colorSRV, buffer.buffer, FrameProviderStaticConfig::width * FRAME_BPP);
         }
 
         if (supportsOutput && device != nullptr && _outputTexture != nullptr)
diff --git a/SpectatorView/Compositor/CompositorDLL/DeckLinkDevice.h b/SpectatorView/Compositor/CompositorDLL/DeckLinkDevice.h
index a59a9cc3..94bf67e2 100644
--- a/SpectatorView/Compositor/CompositorDLL/DeckLinkDevice.h
+++ b/SpectatorView/Compositor/CompositorDLL/DeckLinkDevice.h
@@ -59,10 +59,10 @@ class DeckLinkDevice : public IDeckLinkInputCallback
     CRITICAL_SECTION          m_outputCriticalSection;
 
     BYTE* localFrameBuffer;
-    BYTE* rawBuffer = new BYTE[FRAME_BUFSIZE_RAW];
+    BYTE* rawBuffer = new BYTE[FrameProviderStaticConfig::getFrameBuffSizeRaw()];
 
-    BYTE* latestBuffer = new BYTE[FRAME_BUFSIZE];
-    BYTE* outputBuffer = new BYTE[FRAME_BUFSIZE];
+    BYTE* latestBuffer = new BYTE[FrameProviderStaticConfig::getFrameBuffSize()];
+    BYTE* outputBuffer = new BYTE[FrameProviderStaticConfig::getFrameBuffSize()];
 
     IDeckLinkMutableVideoFrame* outputFrame = NULL;
 
diff --git a/SpectatorView/Compositor/CompositorDLL/DeckLinkManager.cpp b/SpectatorView/Compositor/CompositorDLL/DeckLinkManager.cpp
index 8b0c0aea..79e9b45d 100644
--- a/SpectatorView/Compositor/CompositorDLL/DeckLinkManager.cpp
+++ b/SpectatorView/Compositor/CompositorDLL/DeckLinkManager.cpp
@@ -3,6 +3,8 @@
 
 #include "stdafx.h"
 #include "DeckLinkManager.h"
+#include "FrameProviderStaticConfig.h"
+
 
 #if USE_DECKLINK || USE_DECKLINK_SHUTTLE
 
@@ -52,25 +54,25 @@ HRESULT DeckLinkManager::Initialize(ID3D11ShaderResourceView* srv)
                     //      However, if you select a valid format that is less than your output format, your frames will be downsized.
                     //      Update the videoDisplayMode if your camera's output does not meet this selection criteria.
                     BMDDisplayMode videoDisplayMode;
-                    if (FRAME_HEIGHT < 1080)
+                    if (FrameProviderStaticConfig::height < 1080)
                     {
                         videoDisplayMode = bmdModeHD720p5994;
                     }
-                    else if (FRAME_HEIGHT >= 1080 && FRAME_HEIGHT < 2160)
+                    else if (FrameProviderStaticConfig::height >= 1080 && FrameProviderStaticConfig::height < 2160)
                     {
                         videoDisplayMode = bmdModeHD1080p5994;
 #if USE_DECKLINK_SHUTTLE
                         videoDisplayMode = bmdModeHD1080p2398;
 #endif
                     }
-                    else if (FRAME_HEIGHT == 2160)
+                    else if (FrameProviderStaticConfig::height == 2160)
                     {
                         videoDisplayMode = bmdMode4K2160p5994;
 #if USE_DECKLINK_SHUTTLE
                         videoDisplayMode = bmdMode4K2160p2398;
 #endif
                     }
-                    else if (FRAME_HEIGHT > 2160)
+                    else if (FrameProviderStaticConfig::height > 2160)
                     {
                         videoDisplayMode = bmdMode4kDCI2398;
                     }
diff --git a/SpectatorView/Compositor/CompositorDLL/ElgatoFrameProvider.cpp b/SpectatorView/Compositor/CompositorDLL/ElgatoFrameProvider.cpp
index b6e93eeb..5e57d47c 100644
--- a/SpectatorView/Compositor/CompositorDLL/ElgatoFrameProvider.cpp
+++ b/SpectatorView/Compositor/CompositorDLL/ElgatoFrameProvider.cpp
@@ -3,6 +3,8 @@
 
 #include "stdafx.h"
 #include "ElgatoFrameProvider.h"
+#include "FrameProviderStaticConfig.h"
+
 
 #if USE_ELGATO
 
@@ -121,23 +123,23 @@ HRESULT ElgatoFrameProvider::InitGraph()
     hr = filter->GetSettingsEx(&settings);
     _ASSERT(SUCCEEDED(hr));
 
-    if (FRAME_HEIGHT == 1080)
+    if (FrameProviderStaticConfig::height == 1080)
     {
         settings.Settings.profile = VIDEO_CAPTURE_FILTER_VID_ENC_PROFILE_1080;
     }
-    else if (FRAME_HEIGHT == 720)
+    else if (FrameProviderStaticConfig::height == 720)
     {
         settings.Settings.profile = VIDEO_CAPTURE_FILTER_VID_ENC_PROFILE_720;
     }
-    else if (FRAME_HEIGHT == 480)
+    else if (FrameProviderStaticConfig::height == 480)
     {
         settings.Settings.profile = VIDEO_CAPTURE_FILTER_VID_ENC_PROFILE_480;
     }
-    else if (FRAME_HEIGHT == 360)
+    else if (FrameProviderStaticConfig::height == 360)
     {
         settings.Settings.profile = VIDEO_CAPTURE_FILTER_VID_ENC_PROFILE_360;
     }
-    else if (FRAME_HEIGHT == 240)
+    else if (FrameProviderStaticConfig::height == 240)
     {
         settings.Settings.profile = VIDEO_CAPTURE_FILTER_VID_ENC_PROFILE_240;
     }
@@ -245,17 +247,17 @@ HRESULT ElgatoFrameProvider::SetSampleGrabberParameters()
     amt.subtype = MEDIASUBTYPE_UYVY;
     amt.formattype = FORMAT_VideoInfo;
     amt.bFixedSizeSamples = TRUE;
-    amt.lSampleSize = FRAME_WIDTH * FRAME_HEIGHT * FRAME_BPP_RAW;
+    amt.lSampleSize = FrameProviderStaticConfig::width * FrameProviderStaticConfig::height * FRAME_BPP_RAW;
     amt.bTemporalCompression = FALSE;
     
     VIDEOINFOHEADER vih;
     ZeroMemory(&vih, sizeof(VIDEOINFOHEADER));
-    vih.rcTarget.right = FRAME_WIDTH;
-    vih.rcTarget.bottom = FRAME_HEIGHT;
+    vih.rcTarget.right = FrameProviderStaticConfig::width;
+    vih.rcTarget.bottom = FrameProviderStaticConfig::height;
     vih.AvgTimePerFrame = (REFERENCE_TIME)((1.0f / 30.0f) * S2HNS);
-    vih.bmiHeader.biWidth = FRAME_WIDTH;
-    vih.bmiHeader.biHeight = FRAME_HEIGHT;
-    vih.bmiHeader.biSizeImage = FRAME_WIDTH * FRAME_HEIGHT * FRAME_BPP_RAW;
+    vih.bmiHeader.biWidth = FrameProviderStaticConfig::width;
+    vih.bmiHeader.biHeight = FrameProviderStaticConfig::height;
+    vih.bmiHeader.biSizeImage = FrameProviderStaticConfig::width * FrameProviderStaticConfig::height * FRAME_BPP_RAW;
         
     amt.pbFormat = (BYTE*)&vih;
     
diff --git a/SpectatorView/Compositor/CompositorDLL/ElgatoSampleCallback.cpp b/SpectatorView/Compositor/CompositorDLL/ElgatoSampleCallback.cpp
index 47fc5262..08b854a7 100644
--- a/SpectatorView/Compositor/CompositorDLL/ElgatoSampleCallback.cpp
+++ b/SpectatorView/Compositor/CompositorDLL/ElgatoSampleCallback.cpp
@@ -12,7 +12,7 @@ ElgatoSampleCallback::ElgatoSampleCallback(ID3D11Device* device) :
 
     for (int i = 0; i < MAX_NUM_CACHED_BUFFERS; i++)
     {
-        bufferCache[i].buffer = new BYTE[FRAME_BUFSIZE];
+        bufferCache[i].buffer = new BYTE[FrameProviderStaticConfig::getFrameBuffSize()];
         bufferCache[i].timeStamp = 0;
     }
 
@@ -45,10 +45,10 @@ STDMETHODIMP ElgatoSampleCallback::BufferCB(double time, BYTE *pBuffer, long len
     }
 
     int copyLength = length;
-    if (copyLength > FRAME_BUFSIZE)
+    if (copyLength > FrameProviderStaticConfig::getFrameBuffSize())
     {
         // This might happen if the camera is outputting 4K but the system is expecting 1080.
-        copyLength = FRAME_BUFSIZE;
+        copyLength = static_cast<int>(FrameProviderStaticConfig::getFrameBuffSize());
     }
 
     captureFrameIndex++;
@@ -66,6 +66,6 @@ void ElgatoSampleCallback::UpdateSRV(ID3D11ShaderResourceView* srv, int composit
     const BufferCache& buffer = bufferCache[compositeFrameIndex % MAX_NUM_CACHED_BUFFERS];
     if (buffer.buffer != nullptr)
     {
-        DirectXHelper::UpdateSRV(_device, srv, buffer.buffer, FRAME_WIDTH * FRAME_BPP);
+        DirectXHelper::UpdateSRV(_device, srv, buffer.buffer, FrameProviderStaticConfig::width * FRAME_BPP);
     }
 }
diff --git a/SpectatorView/Compositor/CompositorDLL/OpenCVFrameProvider.cpp b/SpectatorView/Compositor/CompositorDLL/OpenCVFrameProvider.cpp
index f216ab6b..fb0ac72c 100644
--- a/SpectatorView/Compositor/CompositorDLL/OpenCVFrameProvider.cpp
+++ b/SpectatorView/Compositor/CompositorDLL/OpenCVFrameProvider.cpp
@@ -3,13 +3,15 @@
 
 #include "stdafx.h"
 #include "OpenCVFrameProvider.h"
+#include "FrameProviderStaticConfig.h"
+
 
 #if USE_OPENCV
 
 OpenCVFrameProvider::OpenCVFrameProvider()
 {
     QueryPerformanceFrequency(&freq);
-    rgbaFrame = cv::Mat(FRAME_HEIGHT, FRAME_WIDTH, CV_8UC4);
+    rgbaFrame = cv::Mat(FrameProviderStaticConfig::height, FrameProviderStaticConfig::width, CV_8UC4);
 
     for (int i = 0; i < 4; i++)
     {
@@ -19,7 +21,7 @@ OpenCVFrameProvider::OpenCVFrameProvider()
 
     for (int i = 0; i < MAX_NUM_CACHED_BUFFERS; i++)
     {
-        bufferCache[i].buffer = new BYTE[FRAME_BUFSIZE];
+        bufferCache[i].buffer = new BYTE[FrameProviderStaticConfig::getFrameBuffSize()];
         bufferCache[i].timeStamp = 0;
     }
 
@@ -52,7 +54,7 @@ HRESULT OpenCVFrameProvider::Initialize(ID3D11ShaderResourceView* srv)
 
     for (int i = 0; i < MAX_NUM_CACHED_BUFFERS; i++)
     {
-        ZeroMemory(bufferCache[i].buffer, FRAME_BUFSIZE);
+        ZeroMemory(bufferCache[i].buffer, FrameProviderStaticConfig::getFrameBuffSize());
     }
 
     captureFrameIndex = 0;
@@ -63,8 +65,8 @@ HRESULT OpenCVFrameProvider::Initialize(ID3D11ShaderResourceView* srv)
         // This must be called after opening.
         // Note: This may fail, and your capture will resume at the camera's native resolution.
         // In this case, the Update loop will print an error with the expected frame resolution.
-        videoCapture->set(cv::CAP_PROP_FRAME_WIDTH, FRAME_WIDTH);
-        videoCapture->set(cv::CAP_PROP_FRAME_HEIGHT, FRAME_HEIGHT);
+        videoCapture->set(cv::CAP_PROP_FRAME_WIDTH, FrameProviderStaticConfig::width);
+        videoCapture->set(cv::CAP_PROP_FRAME_HEIGHT, FrameProviderStaticConfig::height);
 
         if (IsEnabled())
         {
@@ -108,16 +110,16 @@ void OpenCVFrameProvider::Update(int compositeFrameIndex)
                 double width = videoCapture->get(cv::CAP_PROP_FRAME_WIDTH);
                 double height = videoCapture->get(cv::CAP_PROP_FRAME_HEIGHT);
 
-                if (width != FRAME_WIDTH)
+                if (width != FrameProviderStaticConfig::width)
                 {
-                    OutputDebugString(L"ERROR: captured width does not equal FRAME_WIDTH.  Expecting: ");
+                    OutputDebugString(L"ERROR: captured width does not equal FrameProviderStaticConfig::width.  Expecting: ");
                     OutputDebugString(std::to_wstring(width).c_str());
                     OutputDebugString(L"\n");
                 }
 
-                if (height != FRAME_HEIGHT)
+                if (height != FrameProviderStaticConfig::height)
                 {
-                    OutputDebugString(L"ERROR: captured height does not equal FRAME_HEIGHT.  Expecting: ");
+                    OutputDebugString(L"ERROR: captured height does not equal FrameProviderStaticConfig::height.  Expecting: ");
                     OutputDebugString(std::to_wstring(height).c_str());
                     OutputDebugString(L"\n");
                 }
@@ -127,7 +129,7 @@ void OpenCVFrameProvider::Update(int compositeFrameIndex)
 
                 captureFrameIndex++;
                 BYTE* buffer = bufferCache[captureFrameIndex % MAX_NUM_CACHED_BUFFERS].buffer;
-                memcpy(buffer, rgbaFrame.data, FRAME_BUFSIZE);
+                memcpy(buffer, rgbaFrame.data, FrameProviderStaticConfig::getFrameBuffSize());
                 bufferCache[captureFrameIndex % MAX_NUM_CACHED_BUFFERS].timeStamp = (latestTimeStamp * S2HNS) / freq.QuadPart;
             }
         }
@@ -136,7 +138,7 @@ void OpenCVFrameProvider::Update(int compositeFrameIndex)
     const BufferCache& buffer = bufferCache[compositeFrameIndex % MAX_NUM_CACHED_BUFFERS];
     if (buffer.buffer != nullptr)
     {
-        DirectXHelper::UpdateSRV(_device, _colorSRV, buffer.buffer, FRAME_WIDTH * FRAME_BPP);
+        DirectXHelper::UpdateSRV(_device, _colorSRV, buffer.buffer, FrameProviderStaticConfig::width * FRAME_BPP);
     }
 }
 
diff --git a/SpectatorView/Compositor/SharedHeaders/CameraConfigurationFile.h b/SpectatorView/Compositor/SharedHeaders/CameraConfigurationFile.h
new file mode 100644
index 00000000..f02a7232
--- /dev/null
+++ b/SpectatorView/Compositor/SharedHeaders/CameraConfigurationFile.h
@@ -0,0 +1,115 @@
+#pragma once
+
+#include <fstream>
+#include <sstream>
+#include <string>
+#include <unordered_map>
+#include <Windows.h>
+
+class CameraConfigurationFile
+{
+
+	std::string path;
+	std::unordered_map<std::string, std::string> content{};
+
+	std::string getValue(const std::string& key)
+	{
+		const auto v = content.find(key);
+		if (v != std::end(content))
+			return v->second;
+
+		throw std::runtime_error("Value " + key + " doesn't exist in loaded config.");
+	}
+
+	double get_double(const std::string& key)
+	{
+		return strtod(getValue(key).c_str(), nullptr);
+	}
+
+	size_t get_size_t(const std::string& key)
+	{
+		return static_cast<size_t>(strtoul(getValue(key).c_str(), nullptr, 10));
+	}
+
+	void loadFile()
+	{
+		std::ifstream file(path);
+		if (!file)
+			throw std::runtime_error("Could not open file " + path);
+
+		static std::string buffer, key, val;
+		static const std::string whitespace{ " \t\r\n\v\f" };
+
+		while (std::getline(file, buffer))
+		{
+			if (buffer.empty()) continue; //Dont evaluate empty lines
+
+			const auto firstNotWhitespace = buffer.find_first_not_of(whitespace);
+			if (firstNotWhitespace == std::string::npos) continue; //don't evaluate lines that contains only whitespace
+
+			if (buffer[firstNotWhitespace] == '#') continue; //comments starts with #
+
+			//Load the key=value in the map
+			std::stringstream loadStream(buffer);
+			std::getline(loadStream, key, '=');
+			std::getline(loadStream, val);
+			content[key] = val;
+		}
+
+	}
+
+public:
+
+	static std::string getMyDocumentPath()
+	{
+		//Get Win32 string path to "My Documents"
+		TCHAR tchar_string[MAX_PATH];
+		const auto result = SHGetFolderPath(nullptr, CSIDL_MYDOCUMENTS, nullptr, SHGFP_TYPE_CURRENT, tchar_string);
+		if (result != S_OK) return "";
+
+		//Handle the bytestring convertion if we are using wide characters
+#ifdef UNICODE
+		//Create an empty string with the right size reserved
+		auto string_string = std::string(static_cast<size_t>(WideCharToMultiByte(CP_UTF8, 0, tchar_string, lstrlen(tchar_string), nullptr, 0, nullptr,
+																		nullptr)), 0);
+		//Fill in the string 
+		WideCharToMultiByte(CP_UTF8, 0, tchar_string, lstrlen(tchar_string), &string_string[0], static_cast<int>(string_string.size()), nullptr, nullptr);
+		return string_string;
+#else
+return { tchar_string };
+#endif
+
+	}
+
+	size_t width, height;
+	double fps;
+
+	CameraConfigurationFile(const std::string& filePath) : path{filePath}
+	{
+		loadFile();
+	}
+
+	size_t getWidth()
+	{
+		return get_size_t("width");
+	}
+
+	size_t getHeight()
+	{
+		return get_size_t("height");
+	}
+
+	double getFrameRate()
+	{
+		return get_double("FPS");
+	}
+
+	void readConfig()
+	{
+		width = getWidth();
+		height = getHeight();
+		fps = getFrameRate();
+	}
+};
+
+
diff --git a/SpectatorView/Compositor/SharedHeaders/DirectXHelper.h b/SpectatorView/Compositor/SharedHeaders/DirectXHelper.h
index 3d49572c..1f2dd234 100644
--- a/SpectatorView/Compositor/SharedHeaders/DirectXHelper.h
+++ b/SpectatorView/Compositor/SharedHeaders/DirectXHelper.h
@@ -8,6 +8,8 @@
 #include <d3d11_1.h>
 #include "CompositorConstants.h"
 #include <ppltasks.h>
+#include "FrameProviderStaticConfig.h"
+
 
 class DirectXHelper
 {
@@ -202,7 +204,7 @@ class DirectXHelper
         D3D11_MAPPED_SUBRESOURCE  mapResource;
         d3d11DevCon->Map(tmpBuf, 0, D3D11_MAP_READ, NULL, &mapResource);
 
-        memcpy(bytes, mapResource.pData, (size_t)(FRAME_WIDTH * FRAME_HEIGHT * bpp));
+        memcpy(bytes, mapResource.pData, (size_t)(FrameProviderStaticConfig::width * FrameProviderStaticConfig::height * bpp));
 
         d3d11DevCon->Unmap(tmpBuf, 0);
         if (tmpBuf != nullptr)
diff --git a/SpectatorView/Compositor/SharedHeaders/FrameProviderStaticConfig.h b/SpectatorView/Compositor/SharedHeaders/FrameProviderStaticConfig.h
new file mode 100644
index 00000000..e008c0a9
--- /dev/null
+++ b/SpectatorView/Compositor/SharedHeaders/FrameProviderStaticConfig.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "CompositorConstants.h"
+
+#ifdef COMPOSITORDLL_EXPORTS
+#define EXPORT_STATIC_CONFIG __declspec(dllexport)
+#else
+#define EXPORT_STATIC_CONFIG __declspec(dllimport)
+#endif
+
+struct  FrameProviderStaticConfig
+{
+	EXPORT_STATIC_CONFIG static int width;
+	EXPORT_STATIC_CONFIG static int height;
+	EXPORT_STATIC_CONFIG static float fps;
+
+	static size_t getFrameBuffSize()
+	{
+		return width * height * FRAME_BPP;
+	}
+
+	static size_t getFrameBuffSizeRaw()
+	{
+		return width * height * FRAME_BPP_RAW;
+	}
+};
\ No newline at end of file
diff --git a/SpectatorView/Compositor/SharedHeaders/SharedHeaders.vcxitems b/SpectatorView/Compositor/SharedHeaders/SharedHeaders.vcxitems
index 782c214e..4683984e 100644
--- a/SpectatorView/Compositor/SharedHeaders/SharedHeaders.vcxitems
+++ b/SpectatorView/Compositor/SharedHeaders/SharedHeaders.vcxitems
@@ -14,9 +14,11 @@
     <ProjectCapability Include="SourceItemsFromImports" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="$(MSBuildThisFileDirectory)CameraConfigurationFile.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)CompositorConstants.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)DirectoryHelper.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)DirectXHelper.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)FrameProviderStaticConfig.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)Network.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)NetworkPacketStructure.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)StringHelper.h" />
diff --git a/SpectatorView/Compositor/UnityCompositorInterface/UnityCompositorInterface.cpp b/SpectatorView/Compositor/UnityCompositorInterface/UnityCompositorInterface.cpp
index 3fca595c85677a1bcd49fbd902d739fdf06be055..60546d59f0f27d3ff0818cf90182b8d25b4e3eb1 100644
GIT binary patch
delta 1125
zcmbtTJxjw-6g{?rRMABcQN)@-8<ci%Q=BRef>7+>;!={dsnkYl>jzSTyO1H1_!D#}
z6lZ^sQgCtAb6=W%NDT#fg!gjaz4x4Z?|Gfq*vnh2)r$LHu?4+=b6BXMfGiwTQA8Of
zG?b;zv)B%}SNz9`HUGm~TFIkMZ@DvuV$!gowV&fo)1AdM5_GBI7Qy+hyC)bVDKB}O
zWSRzdho`_AfGaqX$|)F|w|o4u{2P<1%itZZ68AceNMfHL2Eimjm9{W-3OZA7^3!n2
zWek9%`B!8P4ZA(^<B@Q~3P#tJimX;2fE(47G`nh%ra9DnDI}oDeowOb3IE+&F8?(v
z>CQDLXtEb!gUhNjqsgVay*%l~2w(`=MRTLjY?2mb*+dKm`Y$|cQZy^`%<<&l3T6M>
zn~LO6#07;HpcheLl;}9R;y%u?^0w$dSb4Ln4N*=VhRXs|O5LWCpoJSw+ahrInAS<a
zVv67IBE=FM)n1+VeaU5zfwaBCmBblE9K0RbEm~xNvfCt3!>XyoWzuBQctvA{Ar_q#
lp#Ql&-`4IAXZ()0s7DQ~FOMxGMNAt}-UH)pKRx8<egLu_(AWR~

delta 76
zcmZ3ppXuFJrVSgIH~X+;)lNPTz_Gcf)r(s{h{2J;m%)`Go*|sUlfi`{gu#PBhe3hC
WjR7I!0hIS-a0kkSY>u25%m)B;*%KrH

diff --git a/SpectatorView/Compositor/UnityCompositorInterface/UnityCompositorInterface.vcxproj b/SpectatorView/Compositor/UnityCompositorInterface/UnityCompositorInterface.vcxproj
index d6a42fe1..672cf7f1 100644
--- a/SpectatorView/Compositor/UnityCompositorInterface/UnityCompositorInterface.vcxproj
+++ b/SpectatorView/Compositor/UnityCompositorInterface/UnityCompositorInterface.vcxproj
@@ -108,8 +108,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
+      <AdditionalDependencies>Shell32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)$(TargetName)$(TargetExt)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
@@ -134,8 +133,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
+      <AdditionalDependencies>Shell32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)$(TargetName)$(TargetExt)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
@@ -164,8 +162,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
+      <AdditionalDependencies>Shell32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)$(TargetName)$(TargetExt)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
@@ -194,8 +191,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
+      <AdditionalDependencies>Shell32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)$(TargetName)$(TargetExt)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>

From 076eefb48654f86e3c83e21f9c4aeadbf771054e Mon Sep 17 00:00:00 2001
From: Arthur <arthur.brainville@eonreality.com>
Date: Thu, 14 Jun 2018 14:58:25 +0200
Subject: [PATCH 2/8] Add loading of configuration variables to the calibration
 program

Also, update teh configuration so that we can actually access the
exported static variables from CompositorDLL
---
 .../Calibration/Calibration/Calibration.vcxproj        | 10 ++++++----
 SpectatorView/Calibration/Calibration/Main.cpp         |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/SpectatorView/Calibration/Calibration/Calibration.vcxproj b/SpectatorView/Calibration/Calibration/Calibration.vcxproj
index 66f9c90f..3f6507ce 100644
--- a/SpectatorView/Calibration/Calibration/Calibration.vcxproj
+++ b/SpectatorView/Calibration/Calibration/Calibration.vcxproj
@@ -78,8 +78,8 @@
     <Link>
       <SubSystem>NotSet</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>d3d11.lib;dxgi.lib;dxguid.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)\</AdditionalLibraryDirectories>
+      <AdditionalDependencies>d3d11.lib;dxgi.lib;dxguid.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;CompositorDLL.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)\;$(ProjectDir)\..\..\Compositor\x64\$(Configuration)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
       <Command>xcopy /y "$(OpenCV_vc14)\bin\*.dll" "$(OutDir)"</Command>
@@ -87,6 +87,7 @@
     <PreBuildEvent>
       <Command>if EXIST "$(decklink_inc)" xcopy /y "$(decklink_inc)"
 xcopy /y "$(OpenCV_vc14)\bin\*.dll"
+xcopy /y "$(ProjectDir)\..\..\Compositor\x64\$(Configuration)\CompositorDLL.dll"
 if EXIST "$(Elgato_Filter)" xcopy /y "$(Elgato_Filter)" ..\..\Compositor\CompositorDLL\</Command>
     </PreBuildEvent>
     <PreLinkEvent>
@@ -117,8 +118,8 @@ if EXIST "$(Elgato_Filter)" xcopy /y "$(Elgato_Filter)" ..\..\Compositor\Composi
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>d3d11.lib;dxgi.lib;dxguid.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)\</AdditionalLibraryDirectories>
+      <AdditionalDependencies>d3d11.lib;dxgi.lib;dxguid.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;odbc32.lib;odbccp32.lib;CompositorDLL.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)\;$(ProjectDir)\..\..\Compositor\x64\$(Configuration)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
       <Command>xcopy /y "$(OpenCV_vc14)\bin\*.dll" "$(OutDir)"</Command>
@@ -126,6 +127,7 @@ if EXIST "$(Elgato_Filter)" xcopy /y "$(Elgato_Filter)" ..\..\Compositor\Composi
     <PreBuildEvent>
       <Command>if EXIST "$(decklink_inc)" xcopy /y "$(decklink_inc)"
 xcopy /y "$(OpenCV_vc14)\bin\*.dll"
+xcopy /y "$(ProjectDir)\..\..\Compositor\x64\$(Configuration)\CompositorDLL.dll"
 if EXIST "$(Elgato_Filter)" xcopy /y "$(Elgato_Filter)" ..\..\Compositor\CompositorDLL\</Command>
     </PreBuildEvent>
     <PreLinkEvent>
diff --git a/SpectatorView/Calibration/Calibration/Main.cpp b/SpectatorView/Calibration/Calibration/Main.cpp
index f94f917c..05066bb6 100644
--- a/SpectatorView/Calibration/Calibration/Main.cpp
+++ b/SpectatorView/Calibration/Calibration/Main.cpp
@@ -30,6 +30,10 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
 	{
 		CameraConfigurationFile cfg(filePath);
 		cfg.readConfig();
+
+		FrameProviderStaticConfig::width = int(cfg.getWidth());
+		FrameProviderStaticConfig::height = int(cfg.getHeight());
+		FrameProviderStaticConfig::fps = float(cfg.getFrameRate());
 	}
 	catch(const std::exception& e)
 	{

From 256cb6b7acef661ffcf26a64742a2eef33ccb8f2 Mon Sep 17 00:00:00 2001
From: Arthur <arthur.brainville@eonreality.com>
Date: Thu, 14 Jun 2018 15:04:27 +0200
Subject: [PATCH 3/8] Add project build dependencies

Calibration is using things exported from CompositorDLL. This permit to
set build dependencies between the two projects
---
 SpectatorView/Calibration/Calibration.sln | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/SpectatorView/Calibration/Calibration.sln b/SpectatorView/Calibration/Calibration.sln
index d9b80fd2..4cd285cf 100644
--- a/SpectatorView/Calibration/Calibration.sln
+++ b/SpectatorView/Calibration/Calibration.sln
@@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 15.0.26430.14
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Calibration", "Calibration\Calibration.vcxproj", "{70239410-43FF-4F2B-ACBB-E640437F7289}"
+	ProjectSection(ProjectDependencies) = postProject
+		{16FA1D9F-8C62-4A94-9A47-EE2E153DC625} = {16FA1D9F-8C62-4A94-9A47-EE2E153DC625}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CA8BAF72-3FE7-4F0C-B0E0-0C53C4CB5CD5}"
 	ProjectSection(SolutionItems) = preProject
@@ -12,9 +15,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SharedHeaders", "..\Compositor\SharedHeaders\SharedHeaders.vcxitems", "{0C2DFF51-C769-460F-B9D6-05C82FC60F56}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CompositorDLL", "..\Compositor\CompositorDLL\CompositorDLL.vcxproj", "{16FA1D9F-8C62-4A94-9A47-EE2E153DC625}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		..\Compositor\SharedHeaders\SharedHeaders.vcxitems*{0c2dff51-c769-460f-b9d6-05c82fc60f56}*SharedItemsImports = 9
+		..\Compositor\SharedHeaders\SharedHeaders.vcxitems*{16fa1d9f-8c62-4a94-9a47-ee2e153dc625}*SharedItemsImports = 4
 		..\Compositor\SharedHeaders\SharedHeaders.vcxitems*{70239410-43ff-4f2b-acbb-e640437f7289}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -30,6 +36,14 @@ Global
 		{70239410-43FF-4F2B-ACBB-E640437F7289}.Release|x64.ActiveCfg = Release|x64
 		{70239410-43FF-4F2B-ACBB-E640437F7289}.Release|x64.Build.0 = Release|x64
 		{70239410-43FF-4F2B-ACBB-E640437F7289}.Release|x86.ActiveCfg = Release|x64
+		{16FA1D9F-8C62-4A94-9A47-EE2E153DC625}.Debug|x64.ActiveCfg = Debug|x64
+		{16FA1D9F-8C62-4A94-9A47-EE2E153DC625}.Debug|x64.Build.0 = Debug|x64
+		{16FA1D9F-8C62-4A94-9A47-EE2E153DC625}.Debug|x86.ActiveCfg = Debug|Win32
+		{16FA1D9F-8C62-4A94-9A47-EE2E153DC625}.Debug|x86.Build.0 = Debug|Win32
+		{16FA1D9F-8C62-4A94-9A47-EE2E153DC625}.Release|x64.ActiveCfg = Release|x64
+		{16FA1D9F-8C62-4A94-9A47-EE2E153DC625}.Release|x64.Build.0 = Release|x64
+		{16FA1D9F-8C62-4A94-9A47-EE2E153DC625}.Release|x86.ActiveCfg = Release|Win32
+		{16FA1D9F-8C62-4A94-9A47-EE2E153DC625}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From edd30d8bb372f97caf57f532b13794b789f572ff Mon Sep 17 00:00:00 2001
From: Arthur <arthur.brainville@eonreality.com>
Date: Thu, 14 Jun 2018 16:23:07 +0200
Subject: [PATCH 4/8] Fix iniitaliazation variable. Fix bad file encoding

---
 .../UnityCompositorInterface.cpp              | Bin 40876 -> 20013 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/SpectatorView/Compositor/UnityCompositorInterface/UnityCompositorInterface.cpp b/SpectatorView/Compositor/UnityCompositorInterface/UnityCompositorInterface.cpp
index 60546d59f0f27d3ff0818cf90182b8d25b4e3eb1..c02928ac9ed6d2a072ab499ecae7751938a207e6 100644
GIT binary patch
literal 20013
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
US4`bJaO3G>^{5UsQvBBXHzQLRi~s-t

literal 40876
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
SETXZ3eQajOBBzK;)c*r=7u0$H


From 73e5a674447290202ef439d0615e8c0f79bd74f1 Mon Sep 17 00:00:00 2001
From: Arthur <arthur.brainville@eonreality.com>
Date: Fri, 15 Jun 2018 09:37:53 +0200
Subject: [PATCH 5/8] Add explicit fallback to default values in case of
 problem with loading camera.cfg

---
 .gitignore                                     | 1 +
 SpectatorView/Calibration/Calibration/Main.cpp | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 2cb497fc..9c23f634 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.TMP
 # git ignore file
 AppPackages/
 BundleArtifacts/
diff --git a/SpectatorView/Calibration/Calibration/Main.cpp b/SpectatorView/Calibration/Calibration/Main.cpp
index 05066bb6..f058fbaa 100644
--- a/SpectatorView/Calibration/Calibration/Main.cpp
+++ b/SpectatorView/Calibration/Calibration/Main.cpp
@@ -38,6 +38,11 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
 	catch(const std::exception& e)
 	{
 		OutputDebugStringA(e.what());
+
+		//fallback to default values
+		FrameProviderStaticConfig::width = FRAME_WIDTH;
+		FrameProviderStaticConfig::height = FRAME_HEIGHT;
+		FrameProviderStaticConfig::fps = VIDEO_FPS;
 	}
 
     UNREFERENCED_PARAMETER(hPrevInstance);

From 19d194f259b6f99ce9f24f80412394802e60a117 Mon Sep 17 00:00:00 2001
From: Arthur <arthur.brainville@eonreality.com>
Date: Fri, 15 Jun 2018 09:39:22 +0200
Subject: [PATCH 6/8] Remove 32bit Configuration from Calibration.sln

OpenCV is 64bit only here. The 32bit version will not link.
---
 SpectatorView/Calibration/Calibration.sln | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/SpectatorView/Calibration/Calibration.sln b/SpectatorView/Calibration/Calibration.sln
index 4cd285cf..2110c723 100644
--- a/SpectatorView/Calibration/Calibration.sln
+++ b/SpectatorView/Calibration/Calibration.sln
@@ -25,25 +25,17 @@ Global
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{70239410-43FF-4F2B-ACBB-E640437F7289}.Debug|x64.ActiveCfg = Debug|x64
 		{70239410-43FF-4F2B-ACBB-E640437F7289}.Debug|x64.Build.0 = Debug|x64
-		{70239410-43FF-4F2B-ACBB-E640437F7289}.Debug|x86.ActiveCfg = Release|x64
 		{70239410-43FF-4F2B-ACBB-E640437F7289}.Release|x64.ActiveCfg = Release|x64
 		{70239410-43FF-4F2B-ACBB-E640437F7289}.Release|x64.Build.0 = Release|x64
-		{70239410-43FF-4F2B-ACBB-E640437F7289}.Release|x86.ActiveCfg = Release|x64
 		{16FA1D9F-8C62-4A94-9A47-EE2E153DC625}.Debug|x64.ActiveCfg = Debug|x64
 		{16FA1D9F-8C62-4A94-9A47-EE2E153DC625}.Debug|x64.Build.0 = Debug|x64
-		{16FA1D9F-8C62-4A94-9A47-EE2E153DC625}.Debug|x86.ActiveCfg = Debug|Win32
-		{16FA1D9F-8C62-4A94-9A47-EE2E153DC625}.Debug|x86.Build.0 = Debug|Win32
 		{16FA1D9F-8C62-4A94-9A47-EE2E153DC625}.Release|x64.ActiveCfg = Release|x64
 		{16FA1D9F-8C62-4A94-9A47-EE2E153DC625}.Release|x64.Build.0 = Release|x64
-		{16FA1D9F-8C62-4A94-9A47-EE2E153DC625}.Release|x86.ActiveCfg = Release|Win32
-		{16FA1D9F-8C62-4A94-9A47-EE2E153DC625}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From 0f6cd563f0a7bec1b18dd23a62bafbc3ee711d93 Mon Sep 17 00:00:00 2001
From: Arthur <arthur.brainville@eonreality.com>
Date: Fri, 15 Jun 2018 10:01:55 +0200
Subject: [PATCH 7/8] Replace some missing FRAME_WIDTH/HEIGHT/BUFFSIZE

---
 .../Calibration/CalibrationApp.cpp            | 26 +++++++++----------
 .../Calibration/DeviceResources.cpp           |  5 ++--
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/SpectatorView/Calibration/Calibration/CalibrationApp.cpp b/SpectatorView/Calibration/Calibration/CalibrationApp.cpp
index 45eaec5f..a493faba 100644
--- a/SpectatorView/Calibration/Calibration/CalibrationApp.cpp
+++ b/SpectatorView/Calibration/Calibration/CalibrationApp.cpp
@@ -21,7 +21,7 @@ CalibrationApp::CalibrationApp() :
     InitializeCriticalSection(&calibrationPictureCriticalSection);
 
     boardDimensions = cv::Size(GRID_CELLS_X - 1, GRID_CELLS_Y - 1);
-    colorBytes = new BYTE[FRAME_BUFSIZE];
+    colorBytes = new BYTE[FrameProviderStaticConfig::getFrameBuffSize()];
 
     // Force 60fps
     timer.SetFixedTimeStep(true);
@@ -79,11 +79,11 @@ void CalibrationApp::Initialize(HWND window, int width, int height)
     CreateWindowSizeDependentResources();
 
     // Calibration Images.
-    colorImage_cam = cv::Mat(FRAME_HEIGHT, FRAME_WIDTH, CV_8UC4);
+    colorImage_cam = cv::Mat(FrameProviderStaticConfig::height, FrameProviderStaticConfig::width, CV_8UC4);
     resizedColorImage_cam = cv::Mat(HOLO_HEIGHT, HOLO_WIDTH, CV_8UC4);
     colorImage_holo = cv::Mat(HOLO_HEIGHT, HOLO_WIDTH, CV_8UC4);
-    latestColorMat = cv::Mat(FRAME_HEIGHT, FRAME_WIDTH, CV_8UC4);
-    cachedColorMat = cv::Mat(FRAME_HEIGHT, FRAME_WIDTH, CV_8UC4);
+    latestColorMat = cv::Mat(FrameProviderStaticConfig::height, FrameProviderStaticConfig::width, CV_8UC4);
+    cachedColorMat = cv::Mat(FrameProviderStaticConfig::height, FrameProviderStaticConfig::width, CV_8UC4);
 
     // Create an http_client to use REST APIs on the Hololens.
     http_client_config client_config;
@@ -97,7 +97,7 @@ void CalibrationApp::Initialize(HWND window, int width, int height)
 
     // Create textures, RT's and SRV's
     auto device = deviceResources->GetD3DDevice();
-    CD3D11_TEXTURE2D_DESC rtDesc(DXGI_FORMAT_R8G8B8A8_UNORM, FRAME_WIDTH, FRAME_HEIGHT,
+    CD3D11_TEXTURE2D_DESC rtDesc(DXGI_FORMAT_R8G8B8A8_UNORM, FrameProviderStaticConfig::width, FrameProviderStaticConfig::height,
         1, 1, D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE);
     
     device->CreateTexture2D(&rtDesc, nullptr, &colorTexture);
@@ -134,8 +134,8 @@ void CalibrationApp::Initialize(HWND window, int width, int height)
         }
     }
 
-    yuv2rgbParameters.width = FRAME_WIDTH;
-    yuv2rgbParameters.height = FRAME_HEIGHT;
+    yuv2rgbParameters.width = FrameProviderStaticConfig::width;
+    yuv2rgbParameters.height = FrameProviderStaticConfig::height;
 
     CD3D11_BUFFER_DESC cbDesc(sizeof(CONVERSION_PARAMETERS), D3D11_BIND_CONSTANT_BUFFER);
     device->CreateBuffer(&cbDesc, nullptr, conversionParamBuffer.ReleaseAndGetAddressOf());
@@ -218,7 +218,7 @@ void CalibrationApp::TakeCalibrationPicture()
     
     // Cache the latest color frame so we do not stall the UI thread while checking if there is a chess board in frame.
     EnterCriticalSection(&photoTextureCriticalSection);
-    memcpy(cachedColorMat.data, latestColorMat.data, FRAME_BUFSIZE);
+    memcpy(cachedColorMat.data, latestColorMat.data, FrameProviderStaticConfig::getFrameBuffSize());
     LeaveCriticalSection(&photoTextureCriticalSection);
 
     if (!HasChessBoard(cachedColorMat, grayscaleImage, corners))
@@ -232,7 +232,7 @@ void CalibrationApp::TakeCalibrationPicture()
 
     // Lock the latest camera image immediately after the hololens picture has been taken.
     EnterCriticalSection(&photoTextureCriticalSection);
-    memcpy(cachedColorMat.data, latestColorMat.data, FRAME_BUFSIZE);
+    memcpy(cachedColorMat.data, latestColorMat.data, FrameProviderStaticConfig::getFrameBuffSize());
     LeaveCriticalSection(&photoTextureCriticalSection);
 
     cv::imwrite(cv::String(StringHelper::ws2s(camPath)), cachedColorMat);
@@ -653,8 +653,8 @@ void CalibrationApp::OnWindowSizeChanged(int width, int height)
 // Properties
 void CalibrationApp::GetDefaultSize(int& width, int& height) const
 {
-    width = FRAME_WIDTH;
-    height = FRAME_HEIGHT;
+    width = FrameProviderStaticConfig::width;
+    height = FrameProviderStaticConfig::height;
 }
 
 // These are the resources that depend on the device.
@@ -667,8 +667,8 @@ void CalibrationApp::CreateDeviceDependentResources()
     // Camera
     colorSourceRect.left = 0;
     colorSourceRect.top = 0;
-    colorSourceRect.right = FRAME_WIDTH;
-    colorSourceRect.bottom = FRAME_HEIGHT;
+    colorSourceRect.right = FrameProviderStaticConfig::width;
+    colorSourceRect.bottom = FrameProviderStaticConfig::height;
 
     auto device = deviceResources->GetD3DDevice();
     auto blob = DX::ReadData(L"YUV2RGB.cso");
diff --git a/SpectatorView/Calibration/Calibration/DeviceResources.cpp b/SpectatorView/Calibration/Calibration/DeviceResources.cpp
index e47b6d7f..bbe7ddf5 100644
--- a/SpectatorView/Calibration/Calibration/DeviceResources.cpp
+++ b/SpectatorView/Calibration/Calibration/DeviceResources.cpp
@@ -3,6 +3,7 @@
 
 #include "stdafx.h"
 #include "DeviceResources.h"
+#include "FrameProviderStaticConfig.h"
 
 using namespace DirectX;
 
@@ -226,8 +227,8 @@ void DX::DeviceResources::CreateWindowSizeDependentResources()
 
     // Determine the render target size in pixels.
     // Force backbuffer to captured image dimensions.
-    UINT backBufferWidth = FRAME_WIDTH;// std::max<UINT>(m_outputSize.right - m_outputSize.left, 1);
-    UINT backBufferHeight = FRAME_HEIGHT;// std::max<UINT>(m_outputSize.bottom - m_outputSize.top, 1);
+    UINT backBufferWidth = FrameProviderStaticConfig::width;// std::max<UINT>(m_outputSize.right - m_outputSize.left, 1);
+    UINT backBufferHeight = FrameProviderStaticConfig::height;// std::max<UINT>(m_outputSize.bottom - m_outputSize.top, 1);
 
     if (m_swapChain)
     {

From 397faffd2ddd120433fdea5333d03f342f81b13d Mon Sep 17 00:00:00 2001
From: Arthur Brainville <ybalrid@ybalrid.info>
Date: Fri, 15 Jun 2018 10:09:37 +0200
Subject: [PATCH 8/8] Update "Camera Setup" README section

---
 SpectatorView/README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/SpectatorView/README.md b/SpectatorView/README.md
index c728874e..885471ef 100644
--- a/SpectatorView/README.md
+++ b/SpectatorView/README.md
@@ -213,7 +213,13 @@ If using a camera with a capture card, you must configure the camera to output c
 + Optionally plug an hdmi cable from the hdmi out port to a television or preview monitor.
     + This is the center port on the Blackmagic capture card.
 
-Note: if you would like to capture images or video at a resolution other than 1080P (eg: Photo Mode, 720P, or 4K) update CompositorConstants.h to match the new resolution.
+Note: if you would like to capture images or video at a resolution other than 1080P (eg: Photo Mode, 720P, or 4K) you can either update CompositorConstants.h to match the new resolution, or for more flexibility, create a file you your "Documents" folder called **`camera.cfg`** containing the following configuration values and sytax:
+
+```ini
+width=1920
+height=1080
+FPS=30
+```
 
 ## Network Setup
 + Some networking stacks require UDP broadcast to be enabled on your network.