From: Peter Karlsson <peter.p.karlsson@svt.se>
Date: Wed, 3 Apr 2013 18:09:53 +0000 (+0200)
Subject: Initial support for 4k.
X-Git-Tag: 2.0.6~126^2~6
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=77fbc02f77a29d25759dbec1f477a898a5c2f94e;p=casparcg

Initial support for 4k.
---

diff --git a/common/common.vcxproj b/common/common.vcxproj
index 9dbc3db9a..9e1b21e50 100644
--- a/common/common.vcxproj
+++ b/common/common.vcxproj
@@ -107,7 +107,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <PreBuildEvent>
-      <Command>"SubWCRev.exe" "$(SolutionDir)." "$(SolutionDir).\version.tmpl" "$(SolutionDir).\version.h"</Command>
+      <Command>
+      </Command>
     </PreBuildEvent>
     <Lib />
   </ItemDefinitionGroup>
@@ -138,7 +139,8 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <PreBuildEvent>
-      <Command>"SubWCRev.exe" "$(SolutionDir)." "$(SolutionDir).\version.tmpl" "$(SolutionDir).\version.h"</Command>
+      <Command>
+      </Command>
     </PreBuildEvent>
     <Lib>
       <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
@@ -171,7 +173,8 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <PreBuildEvent>
-      <Command>"SubWCRev.exe" "$(SolutionDir)." "$(SolutionDir).\version.tmpl" "$(SolutionDir).\version.h"</Command>
+      <Command>
+      </Command>
     </PreBuildEvent>
     <Lib />
   </ItemDefinitionGroup>
@@ -203,7 +206,8 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <PreBuildEvent>
-      <Command>"SubWCRev.exe" "$(SolutionDir)." "$(SolutionDir).\version.tmpl" "$(SolutionDir).\version.h"</Command>
+      <Command>
+      </Command>
     </PreBuildEvent>
     <Lib />
   </ItemDefinitionGroup>
diff --git a/core/video_format.cpp b/core/video_format.cpp
index 1e1bff1a1..0674d6932 100644
--- a/core/video_format.cpp
+++ b/core/video_format.cpp
@@ -72,7 +72,10 @@ const video_format_desc format_descs[video_format::count] =
 	DEFINE_VIDEOFORMATDESC(video_format::x1080p5000	,1920, 1080, 1920, 1080, field_mode::progressive,	50,		1,		 boost::assign::list_of(1920),							L"1080p5000"),
 	DEFINE_VIDEOFORMATDESC(video_format::x1080p5994	,1920, 1080, 1920, 1080, field_mode::progressive,	60000,	1001,	 boost::assign::list_of(1602)(1601)(1602)(1601)(1602),	L"1080p5994"),
 	DEFINE_VIDEOFORMATDESC(video_format::x1080p6000	,1920, 1080, 1920, 1080, field_mode::progressive,	60,		1,		 boost::assign::list_of(1600),							L"1080p6000"),
-	DEFINE_VIDEOFORMATDESC(video_format::invalid	,0,		0,   0,		0,   field_mode::progressive,	1,		1,		 boost::assign::list_of(1),								L"invalid")
+	DEFINE_VIDEOFORMATDESC(video_format::x2k2398	,2048, 1556, 2048, 1556, field_mode::progressive,	 24000,	1001,	 boost::assign::list_of(4004),							L"2k2398"),
+	DEFINE_VIDEOFORMATDESC(video_format::x2k2400	,2048, 1556, 2048, 1556, field_mode::progressive,	 24,	1,		 boost::assign::list_of(4000),							L"2k2400"),
+	DEFINE_VIDEOFORMATDESC(video_format::x2k2500	,2048, 1556, 2048, 1556, field_mode::progressive,	 25,	1,		 boost::assign::list_of(3840),							L"2k2500"),
+	DEFINE_VIDEOFORMATDESC(video_format::invalid	,0,		0,   0,		0,   field_mode::progressive,	 1,		1,		 boost::assign::list_of(1),								L"invalid")
 };
 
 const video_format_desc& video_format_desc::get(video_format::type format)	
diff --git a/core/video_format.h b/core/video_format.h
index 48bbc1ed2..60375ddba 100644
--- a/core/video_format.h
+++ b/core/video_format.h
@@ -52,6 +52,9 @@ struct video_format
 		x1080p5000,
 		x1080p5994,
 		x1080p6000,
+		x2k2398,
+		x2k2400,
+		x2k2500,
 		invalid,
 		count
 	};
diff --git a/shell/casparcg.config b/shell/casparcg.config
index 3208e1f6b..a65542e34 100644
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -9,7 +9,7 @@
   </paths>
   <channels>
     <channel>
-        <video-mode>PAL</video-mode>
+        <video-mode>2k2400</video-mode>
         <consumers>
           <screen>
             <device>1</device>