Color management's "Gamma" option replaced with "Ambient Light"

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2456 10f7b99b-c216-0410-bff0-8a66a9350fd8

3 files changed, 15 insertions, 21 deletions

diff --git a/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp b/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp
index 098718599..df2951284 100644
--- a/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp
+++ b/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp
@@ -1001,7 +1001,7 @@ HRESULT CDX9RenderingEngine::InitFinalPass()
 	bool bFullFloatingPointProcessing = settings.m_RenderSettings.iVMR9FullFloatingPointProcessing;

 	bool bColorManagement = settings.m_RenderSettings.iVMR9ColorManagementEnable;

 	VideoSystem inputVideoSystem = static_cast<VideoSystem>(settings.m_RenderSettings.iVMR9ColorManagementInput);

-	GammaCurve gamma = static_cast<GammaCurve>(settings.m_RenderSettings.iVMR9ColorManagementGamma);

+	AmbientLight ambientLight = static_cast<AmbientLight>(settings.m_RenderSettings.iVMR9ColorManagementAmbientLight);

 	ColorRenderingIntent renderingIntent = static_cast<ColorRenderingIntent>(settings.m_RenderSettings.iVMR9ColorManagementIntent);

 

 	bool bInitRequired = false;

@@ -1016,7 +1016,7 @@ HRESULT CDX9RenderingEngine::InitFinalPass()
 	{

 		if ((m_InputVideoSystem != inputVideoSystem) ||

 			(m_RenderingIntent != renderingIntent) ||

-			(m_Gamma != gamma))

+			(m_AmbientLight != ambientLight))

 		{

 			bInitRequired = true;

 		}

@@ -1037,7 +1037,7 @@ HRESULT CDX9RenderingEngine::InitFinalPass()
 	m_bFullFloatingPointProcessing = bFullFloatingPointProcessing;

 	m_bColorManagement = bColorManagement;

 	m_InputVideoSystem = inputVideoSystem;

-	m_Gamma = gamma;

+	m_AmbientLight = ambientLight;

 	m_RenderingIntent = renderingIntent;

 

 	// Check whether the final pass is required

@@ -1283,22 +1283,17 @@ HRESULT CDX9RenderingEngine::CreateIccProfileLut(TCHAR* profilePath, float* lut3
 	// Get the gamma

 	double gamma;

 

-	switch (m_Gamma)

+	switch (m_AmbientLight)

 	{

-	case GAMMA_CURVE_2_2:

+	case AMBIENT_LIGHT_BRIGHT:

 		gamma = 2.2;

 		break;

 

-	case GAMMA_CURVE_2_3:

-		gamma = 2.3;

-		break;

-

-	// Recommended by many (e.g., EBU, Poynton)

-	case GAMMA_CURVE_2_35:

+	case AMBIENT_LIGHT_DIM:

 		gamma = 2.35;

 		break;

 

-	case GAMMA_CURVE_2_4:

+	case AMBIENT_LIGHT_DARK:

 		gamma = 2.4;

 		break;

 

diff --git a/src/filters/renderer/VideoRenderers/DX9RenderingEngine.h b/src/filters/renderer/VideoRenderers/DX9RenderingEngine.h
index 6496cc8e0..d2afd3cf4 100644
--- a/src/filters/renderer/VideoRenderers/DX9RenderingEngine.h
+++ b/src/filters/renderer/VideoRenderers/DX9RenderingEngine.h
@@ -114,7 +114,7 @@ private:
 

 	// Settings

 	VideoSystem                      m_InputVideoSystem;

-	GammaCurve                       m_Gamma;

+	AmbientLight                     m_AmbientLight;

 	ColorRenderingIntent             m_RenderingIntent;

 

 	// Custom pixel shaders

diff --git a/src/filters/renderer/VideoRenderers/RenderersSettings.h b/src/filters/renderer/VideoRenderers/RenderersSettings.h
index 37ae4b246..214c198f6 100644
--- a/src/filters/renderer/VideoRenderers/RenderersSettings.h
+++ b/src/filters/renderer/VideoRenderers/RenderersSettings.h
@@ -60,12 +60,11 @@ enum VideoSystem
 	VIDEO_SYSTEM_SDTV_PAL,

 };

 

-enum GammaCurve

+enum AmbientLight

 {

-	GAMMA_CURVE_2_2,

-	GAMMA_CURVE_2_3,

-	GAMMA_CURVE_2_35, // recommended

-	GAMMA_CURVE_2_4,

+	AMBIENT_LIGHT_BRIGHT,

+	AMBIENT_LIGHT_DIM,

+	AMBIENT_LIGHT_DARK,

 };

 

 enum ColorRenderingIntent

@@ -97,7 +96,7 @@ public:
 		bool iVMR9FullFloatingPointProcessing;

 		bool iVMR9ColorManagementEnable;

 		int iVMR9ColorManagementInput;

-		int iVMR9ColorManagementGamma;

+		int iVMR9ColorManagementAmbientLight;

 		int iVMR9ColorManagementIntent;

 		bool iVMRDisableDesktopComposition;

 		int iVMRFlushGPUBeforeVSync;

@@ -124,7 +123,7 @@ public:
 			iVMR9FullFloatingPointProcessing = 0;

 			iVMR9ColorManagementEnable = 0;

 			iVMR9ColorManagementInput = VIDEO_SYSTEM_UNKNOWN;

-			iVMR9ColorManagementGamma = GAMMA_CURVE_2_35;

+			iVMR9ColorManagementAmbientLight = AMBIENT_LIGHT_BRIGHT;

 			iVMR9ColorManagementIntent = COLOR_RENDERING_INTENT_PERCEPTUAL;

 			iVMRDisableDesktopComposition = 0;

 			iVMRFlushGPUBeforeVSync = 1;

@@ -147,7 +146,7 @@ public:
 			iVMR9FullFloatingPointProcessing = 1;

 			iVMR9ColorManagementEnable = 0;

 			iVMR9ColorManagementInput = VIDEO_SYSTEM_UNKNOWN;

-			iVMR9ColorManagementGamma = GAMMA_CURVE_2_35;

+			iVMR9ColorManagementAmbientLight = AMBIENT_LIGHT_BRIGHT;

 			iVMR9ColorManagementIntent = COLOR_RENDERING_INTENT_PERCEPTUAL;

 			iVMRDisableDesktopComposition = 1;

 			iVMRFlushGPUBeforeVSync = 1;