Initial support for 4k.

diff --git a/common/common.vcxproj b/common/common.vcxproj
index 9dbc3db9a859c78f42d69207daa32056c437d106..9e1b21e50e85ba34d6cd81f7daa59a1e05458b00 100644 (file)
--- a/common/common.vcxproj
+++ b/common/common.vcxproj
@@ -107,7 +107,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
     </Link>\r
     <PreBuildEvent>\r
-      <Command>"SubWCRev.exe" "$(SolutionDir)." "$(SolutionDir).\version.tmpl" "$(SolutionDir).\version.h"</Command>\r
+      <Command>\r
+      </Command>\r
     </PreBuildEvent>\r
     <Lib />\r
   </ItemDefinitionGroup>\r
@@ -138,7 +139,8 @@
       <OptimizeReferences>true</OptimizeReferences>\r
     </Link>\r
     <PreBuildEvent>\r
-      <Command>"SubWCRev.exe" "$(SolutionDir)." "$(SolutionDir).\version.tmpl" "$(SolutionDir).\version.h"</Command>\r
+      <Command>\r
+      </Command>\r
     </PreBuildEvent>\r
     <Lib>\r
       <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>\r
@@ -171,7 +173,8 @@
       <OptimizeReferences>true</OptimizeReferences>\r
     </Link>\r
     <PreBuildEvent>\r
-      <Command>"SubWCRev.exe" "$(SolutionDir)." "$(SolutionDir).\version.tmpl" "$(SolutionDir).\version.h"</Command>\r
+      <Command>\r
+      </Command>\r
     </PreBuildEvent>\r
     <Lib />\r
   </ItemDefinitionGroup>\r
@@ -203,7 +206,8 @@
       <OptimizeReferences>true</OptimizeReferences>\r
     </Link>\r
     <PreBuildEvent>\r
-      <Command>"SubWCRev.exe" "$(SolutionDir)." "$(SolutionDir).\version.tmpl" "$(SolutionDir).\version.h"</Command>\r
+      <Command>\r
+      </Command>\r
     </PreBuildEvent>\r
     <Lib />\r
   </ItemDefinitionGroup>\r

diff --git a/core/video_format.cpp b/core/video_format.cpp
index 1e1bff1a198648dcce22b06f4256fccd619d2345..0674d693251d2dfede3da0a1e3f2bae9305acc8a 100644 (file)
--- 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"),\r
        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"),\r
        DEFINE_VIDEOFORMATDESC(video_format::x1080p6000 ,1920, 1080, 1920, 1080, field_mode::progressive,       60,             1,               boost::assign::list_of(1600),                                                  L"1080p6000"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::invalid    ,0,             0,   0,         0,   field_mode::progressive,   1,              1,               boost::assign::list_of(1),                                                             L"invalid")\r
+       DEFINE_VIDEOFORMATDESC(video_format::x2k2398    ,2048, 1556, 2048, 1556, field_mode::progressive,        24000, 1001,    boost::assign::list_of(4004),                                                  L"2k2398"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x2k2400    ,2048, 1556, 2048, 1556, field_mode::progressive,        24,    1,               boost::assign::list_of(4000),                                                  L"2k2400"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x2k2500    ,2048, 1556, 2048, 1556, field_mode::progressive,        25,    1,               boost::assign::list_of(3840),                                                  L"2k2500"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::invalid    ,0,             0,   0,         0,   field_mode::progressive,    1,             1,               boost::assign::list_of(1),                                                             L"invalid")\r
 };\r
 \r
 const video_format_desc& video_format_desc::get(video_format::type format)     \r

diff --git a/core/video_format.h b/core/video_format.h
index 48bbc1ed214ddbe749da7cce39edaa386eb5fcea..60375ddbab55ccc243b302d705a54bdf5cd65bdc 100644 (file)
--- a/core/video_format.h
+++ b/core/video_format.h
@@ -52,6 +52,9 @@ struct video_format
                x1080p5000,\r
                x1080p5994,\r
                x1080p6000,\r
+               x2k2398,\r
+               x2k2400,\r
+               x2k2500,\r
                invalid,\r
                count\r
        };\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 3208e1f6bf00fd8377374a75e8373eee737a5e93..a65542e34fd6f788ccdbcca5d2c6aaad02344cb2 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -9,7 +9,7 @@
   </paths>\r
   <channels>\r
     <channel>\r
-        <video-mode>PAL</video-mode>\r
+        <video-mode>2k2400</video-mode>\r
         <consumers>\r
           <screen>\r
             <device>1</device>\r