From cac1e82b597a3df724fb9ca596cf5e7afb548c34 Mon Sep 17 00:00:00 2001 From: niklaspandersson Date: Fri, 30 Aug 2013 11:54:14 +0200 Subject: [PATCH] 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) --- core/video_format.cpp | 10 +++++++++- core/video_format.h | 8 ++++++++ modules/decklink/decklink.vcxproj | 18 ------------------ modules/decklink/decklink.vcxproj.filters | 14 -------------- modules/decklink/interop/DeckLinkAPIVersion.h | 6 +++--- modules/decklink/util/util.h | 16 ++++++++++++++++ shell/casparcg.config | 2 +- 7 files changed, 37 insertions(+), 37 deletions(-) diff --git a/core/video_format.cpp b/core/video_format.cpp index d16b3b1e9..b9f59e928 100644 --- a/core/video_format.cpp +++ b/core/video_format.cpp @@ -51,7 +51,15 @@ const std::vector 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(1920) )) (video_format_desc(video_format::x1080p5994, 1920, 1080, 1920, 1080, field_mode::progressive, 60000, 1001, L"1080p5994", boost::assign::list_of(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(1600) )) - (video_format_desc(video_format::invalid, 0, 0, 0, 0, field_mode::progressive, 1, 1, L"invalid", boost::assign::list_of(1) )); + (video_format_desc(video_format::x2k2398, 2048, 1556, 2048, 1556, field_mode::progressive, 24000, 1001, L"2k2398", boost::assign::list_of(4004) )) + (video_format_desc(video_format::x2k2400, 2048, 1556, 2048, 1556, field_mode::progressive, 24, 1, L"2k2400", boost::assign::list_of(4000) )) + (video_format_desc(video_format::x2k2500, 2048, 1556, 2048, 1556, field_mode::progressive, 25, 1, L"2k2500", boost::assign::list_of(3840) )) + (video_format_desc(video_format::x4k2398, 3840, 2160, 3840, 2160, field_mode::progressive, 24000, 1001, L"4k2398", boost::assign::list_of(4004) )) + (video_format_desc(video_format::x4k2400, 3840, 2160, 3840, 2160, field_mode::progressive, 24, 1, L"4k2400", boost::assign::list_of(4000) )) + (video_format_desc(video_format::x4k2500, 3840, 2160, 3840, 2160, field_mode::progressive, 25, 1, L"4k2500", boost::assign::list_of(3840) )) + (video_format_desc(video_format::x4k2997, 3840, 2160, 3840, 2160, field_mode::progressive, 30000, 1001, L"4k2398", boost::assign::list_of(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(3200) )) + (video_format_desc(video_format::invalid, 0, 0, 0, 0, field_mode::progressive, 1, 1, L"invalid", boost::assign::list_of(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 377309f91..0d9eee871 100644 --- 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 c2c493b1b..1d91d979d 100644 --- a/modules/decklink/decklink.vcxproj +++ b/modules/decklink/decklink.vcxproj @@ -150,24 +150,6 @@ - - - interop\ - interop\ - - - true - true - - - true - true - - - true - true - - {02308602-7fe0-4253-b96e-22134919f56a} diff --git a/modules/decklink/decklink.vcxproj.filters b/modules/decklink/decklink.vcxproj.filters index 7a7b1d706..68346ef94 100644 --- a/modules/decklink/decklink.vcxproj.filters +++ b/modules/decklink/decklink.vcxproj.filters @@ -53,18 +53,4 @@ source - - - source\interop - - - source\interop - - - source\interop - - - source\interop - - \ No newline at end of file diff --git a/modules/decklink/interop/DeckLinkAPIVersion.h b/modules/decklink/interop/DeckLinkAPIVersion.h index e79957064..8c4c3eddf 100644 --- 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 182f372c7..dbe22acd3 100644 --- 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 d65391b3b..4f47df501 100644 --- a/shell/casparcg.config +++ b/shell/casparcg.config @@ -60,7 +60,7 @@ - PAL [PAL|NTSC|576p2500|720p2398|720p2400|720p2500|720p5000|720p2997|720p5994|720p3000|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000|1080p5994|1080p6000] + 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] [1..] -- 2.39.2