Manually merged 77fbc02 from master

Manually merged 597805e from master
Manually merged 78c8a30 from master
Manually merged 306459b from master
Manually merged 55a287b from master
Manually merged 50fa7a3 from master
Manually merged 0f3ee44 from master
Manually merged 1cdee8b from master

(all have to do with 4k support)

diff --git a/core/video_format.cpp b/core/video_format.cpp
index d16b3b1e97ce6e4edf9188081b620c8b4e266164..b9f59e9283e33cc571a802a0663d7360ca19fc3e 100644 (file)
--- a/core/video_format.cpp
+++ b/core/video_format.cpp
@@ -51,7 +51,15 @@ const std::vector<video_format_desc> format_descs = boost::assign::list_of
        (video_format_desc(video_format::x1080p5000,    1920, 1080, 1920, 1080, field_mode::progressive,           50,     1, L"1080p5000",     boost::assign::list_of<int>(1920)                        ))
        (video_format_desc(video_format::x1080p5994,    1920, 1080, 1920, 1080, field_mode::progressive,        60000,  1001, L"1080p5994",     boost::assign::list_of<int>(1602)(1601)(1602)(1601)(1602)))
        (video_format_desc(video_format::x1080p6000,    1920, 1080, 1920, 1080, field_mode::progressive,           60,     1, L"1080p6000",     boost::assign::list_of<int>(1600)                        ))
-       (video_format_desc(video_format::invalid,                  0,    0,    0,        0, field_mode::progressive,        1,     1, L"invalid",       boost::assign::list_of<int>(1)                           ));
+       (video_format_desc(video_format::x2k2398,               2048, 1556, 2048, 1556, field_mode::progressive,    24000,  1001, L"2k2398",    boost::assign::list_of<int>(4004)                                                ))
+       (video_format_desc(video_format::x2k2400,               2048, 1556, 2048, 1556, field_mode::progressive,           24,     1, L"2k2400",        boost::assign::list_of<int>(4000)                                                ))
+       (video_format_desc(video_format::x2k2500,               2048, 1556, 2048, 1556, field_mode::progressive,       25,     1, L"2k2500",    boost::assign::list_of<int>(3840)                                                ))
+       (video_format_desc(video_format::x4k2398,               3840, 2160, 3840, 2160, field_mode::progressive,   24000,   1001, L"4k2398",    boost::assign::list_of<int>(4004)                                    ))
+       (video_format_desc(video_format::x4k2400,               3840, 2160, 3840, 2160, field_mode::progressive,      24,      1, L"4k2400",    boost::assign::list_of<int>(4000)                                                ))
+       (video_format_desc(video_format::x4k2500,               3840, 2160, 3840, 2160, field_mode::progressive,      25,      1, L"4k2500",    boost::assign::list_of<int>(3840)                                                ))
+       (video_format_desc(video_format::x4k2997,               3840, 2160, 3840, 2160, field_mode::progressive,   30000,   1001, L"4k2398",    boost::assign::list_of<int>(3204)(3202)(3204)(3202)(3204)))
+       (video_format_desc(video_format::x4k3000,               3840, 2160, 3840, 2160, field_mode::progressive,      30,      1, L"4k3000",    boost::assign::list_of<int>(3200)                                                ))
+       (video_format_desc(video_format::invalid,                  0,    0,    0,        0, field_mode::progressive,       1,      1, L"invalid",       boost::assign::list_of<int>(1)                           ));
 
 video_format_desc::video_format_desc(video_format format,
                                        int width,

diff --git a/core/video_format.h b/core/video_format.h
index 377309f91fdee4c6133b94da6b3a4b1458a68c10..0d9eee8718b85c155f9ab78b083d845561962ad3 100644 (file)
--- a/core/video_format.h
+++ b/core/video_format.h
@@ -55,6 +55,14 @@ struct video_format_def
                x1080p5000,
                x1080p5994,
                x1080p6000,
+               x2k2398,
+               x2k2400,
+               x2k2500,
+               x4k2398,
+               x4k2400,
+               x4k2500,
+               x4k2997,
+               x4k3000,
                invalid,
                count
        };

diff --git a/modules/decklink/decklink.vcxproj b/modules/decklink/decklink.vcxproj
index c2c493b1b638ae3e1fbdfa673ab3811a9a8cdc99..1d91d979d78293bc9e6af02bcc134d553d58d1d9 100644 (file)
--- a/modules/decklink/decklink.vcxproj
+++ b/modules/decklink/decklink.vcxproj
@@ -150,24 +150,6 @@
     <ClInclude Include="StdAfx.h" />\r
     <ClInclude Include="util\util.h" />\r
   </ItemGroup>\r
-  <ItemGroup>\r
-    <Midl Include="interop\DeckLinkAPI.idl">\r
-      <OutputDirectory Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">interop\</OutputDirectory>\r
-      <OutputDirectory Condition="'$(Configuration)|$(Platform)'=='Release|x64'">interop\</OutputDirectory>\r
-    </Midl>\r
-    <Midl Include="interop\DeckLinkAPI_v7_1.idl">\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>\r
-    </Midl>\r
-    <Midl Include="interop\DeckLinkAPI_v7_3.idl">\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>\r
-    </Midl>\r
-    <Midl Include="interop\DeckLinkAPI_v7_6.idl">\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>\r
-    </Midl>\r
-  </ItemGroup>\r
   <ItemGroup>\r
     <ProjectReference Include="..\..\common\common.vcxproj">\r
       <Project>{02308602-7fe0-4253-b96e-22134919f56a}</Project>\r

diff --git a/modules/decklink/decklink.vcxproj.filters b/modules/decklink/decklink.vcxproj.filters
index 7a7b1d706a86905484db934783848eb71aab1caa..68346ef9462545fc4a3057367c7e1b6f4b606260 100644 (file)
--- a/modules/decklink/decklink.vcxproj.filters
+++ b/modules/decklink/decklink.vcxproj.filters
@@ -53,18 +53,4 @@
       <Filter>source</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r
-  <ItemGroup>\r
-    <Midl Include="interop\DeckLinkAPI_v7_1.idl">\r
-      <Filter>source\interop</Filter>\r
-    </Midl>\r
-    <Midl Include="interop\DeckLinkAPI_v7_3.idl">\r
-      <Filter>source\interop</Filter>\r
-    </Midl>\r
-    <Midl Include="interop\DeckLinkAPI_v7_6.idl">\r
-      <Filter>source\interop</Filter>\r
-    </Midl>\r
-    <Midl Include="interop\DeckLinkAPI.idl">\r
-      <Filter>source\interop</Filter>\r
-    </Midl>\r
-  </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/modules/decklink/interop/DeckLinkAPIVersion.h b/modules/decklink/interop/DeckLinkAPIVersion.h
index e79957064061655baa0c3f0693d09086ce9b668e..8c4c3eddf9f81087ff074da9cc1b0d0098f06c89 100644 (file)
--- a/modules/decklink/interop/DeckLinkAPIVersion.h
+++ b/modules/decklink/interop/DeckLinkAPIVersion.h
@@ -1,5 +1,5 @@
 /* -LICENSE-START-
- * ** Copyright (c) 2011 Blackmagic Design
+ * ** Copyright (c) 2013 Blackmagic Design
  * **
  * ** Permission is hereby granted, free of charge, to any person or organization
  * ** obtaining a copy of the software and accompanying documentation covered by
@@ -30,8 +30,8 @@
 #ifndef __DeckLink_API_Verison_h__
 #define __DeckLink_API_Version_h__
 
-#define BLACKMAGIC_DECKLINK_API_VERSION                                        0x08000000
-#define BLACKMAGIC_DECKLINK_API_VERSION_STRING                 "8.0"
+#define BLACKMAGIC_DECKLINK_API_VERSION                                        0x09070100
+#define BLACKMAGIC_DECKLINK_API_VERSION_STRING                 "9.7.1"
 
 #endif // __DeckLink_API_Version_h__
 

diff --git a/modules/decklink/util/util.h b/modules/decklink/util/util.h
index 182f372c7c1bde999ed5f97eccc06f8d56ce8e04..dbe22acd3f755f1dbdeda4e2f0a3b234a69cd0a5 100644 (file)
--- a/modules/decklink/util/util.h
+++ b/modules/decklink/util/util.h
@@ -61,6 +61,14 @@ static BMDDisplayMode get_decklink_video_format(core::video_format fmt)
        case core::video_format::x1080p5000:    return bmdModeHD1080p50;
        case core::video_format::x1080p5994:    return bmdModeHD1080p5994;
        case core::video_format::x1080p6000:    return bmdModeHD1080p6000;
+       case core::video_format::x2k2398:               return bmdMode2k2398;
+       case core::video_format::x2k2400:               return bmdMode2k24;
+       case core::video_format::x2k2500:               return bmdMode2k25;
+       case core::video_format::x4k2398:               return bmdMode4K2160p2398;
+       case core::video_format::x4k2400:               return bmdMode4K2160p24;
+       case core::video_format::x4k2500:               return bmdMode4K2160p25;
+       case core::video_format::x4k2997:               return bmdMode4K2160p2997;
+       case core::video_format::x4k3000:               return bmdMode4K2160p30;
        default:                                                                return (BMDDisplayMode)ULONG_MAX;
        }
 }
@@ -85,6 +93,14 @@ static core::video_format get_caspar_video_format(BMDDisplayMode fmt)
        case bmdModeHD1080p50:                                  return core::video_format::x1080p5000;
        case bmdModeHD1080p5994:                                return core::video_format::x1080p5994;
        case bmdModeHD1080p6000:                                return core::video_format::x1080p6000;
+       case bmdMode2k2398:                                             return core::video_format::x2k2398;  
+       case bmdMode2k24:                                               return core::video_format::x2k2400;  
+       case bmdMode2k25:                                               return core::video_format::x2k2500;  
+       case bmdMode4K2160p2398:                                return core::video_format::x4k2398;  
+       case bmdMode4K2160p24:                                  return core::video_format::x4k2400;  
+       case bmdMode4K2160p25:                                  return core::video_format::x4k2500;  
+       case bmdMode4K2160p2997:                                return core::video_format::x4k2997;  
+       case bmdMode4K2160p30:                                  return core::video_format::x4k3000;  
        default:                                                                return core::video_format::invalid;     
        }
 }

diff --git a/shell/casparcg.config b/shell/casparcg.config
index d65391b3be910e99223785d5d7f70cdc26d48ac9..4f47df501c7f393b094a4421fbcef14b7055a5e5 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -60,7 +60,7 @@
 </flash>\r
 <channels>\r
     <channel>\r
-        <video-mode> PAL [PAL|NTSC|576p2500|720p2398|720p2400|720p2500|720p5000|720p2997|720p5994|720p3000|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000|1080p5994|1080p6000] </video-mode>\r
+        <video-mode> PAL [PAL|NTSC|576p2500|720p2398|720p2400|720p2500|720p5000|720p2997|720p5994|720p3000|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000|1080p5994|1080p6000|2k2398|2k2400|2k2500|4k2398|4k2400|4k2500|4k2997|4k3000] </video-mode>\r
         <consumers>\r
             <decklink>\r
                 <device>[1..]</device>\r