Add video modes 2160p5000, 2160p5994 and 2160p6000

diff --git a/core/video_format.cpp b/core/video_format.cpp
index 30db1e3fc259b1896e458c68c5ceb0a9f9c566e1..120b1ee44d3a3a339039044e569d3363b9c4b505 100644 (file)
--- a/core/video_format.cpp
+++ b/core/video_format.cpp
@@ -61,6 +61,9 @@ namespace caspar { namespace core {
                { video_format::x2160p2500,   3840, 2160, 3840, 2160, field_mode::progressive, 25000, 1000, L"2160p2500",    { 1920                         } },
                { video_format::x2160p2997,   3840, 2160, 3840, 2160, field_mode::progressive, 30000, 1001, L"2160p2997",    { 1602, 1601, 1602, 1601, 1602 } },
                { video_format::x2160p3000,   3840, 2160, 3840, 2160, field_mode::progressive, 30000, 1000, L"2160p3000",    { 1600                         } },
+               { video_format::x2160p5000,   3840, 2160, 3840, 2160, field_mode::progressive, 50,    1,    L"2160p5000",    { 960                          } },
+               { video_format::x2160p5994,   3840, 2160, 3840, 2160, field_mode::progressive, 60000, 1001, L"2160p5994",    { 801,  800,  801,  801,  801  } },
+               { video_format::x2160p6000,   3840, 2160, 3840, 2160, field_mode::progressive, 60,    1,    L"2160p6000",    { 800                          } },
                { video_format::dci2160p2398, 4096, 2160, 4096, 2160, field_mode::progressive, 24000, 1001, L"dci2160p2398", { 2002                         } },
                { video_format::dci2160p2400, 4096, 2160, 4096, 2160, field_mode::progressive, 24000, 1000, L"dci2160p2400", { 2000                         } },
                { video_format::dci2160p2500, 4096, 2160, 4096, 2160, field_mode::progressive, 25000, 1000, L"dci2160p2500", { 1920                         } },

diff --git a/core/video_format.h b/core/video_format.h
index 0016f2d24b47449a20db02b235e498d9066775ee..42777242697bb07d528fceedabcf183acc939da1 100644 (file)
--- a/core/video_format.h
+++ b/core/video_format.h
@@ -66,6 +66,9 @@ enum class video_format
        x2160p2500,
        x2160p2997,
        x2160p3000,
+       x2160p5000,
+       x2160p5994,
+       x2160p6000,
        dci2160p2398,
        dci2160p2400,
        dci2160p2500,

diff --git a/deploy/general/server/cg20.fth.2160p5000 b/deploy/general/server/cg20.fth.2160p5000
new file mode 100644 (file)
index 0000000..ce185e1
Binary files /dev/null and b/deploy/general/server/cg20.fth.2160p5000 differ

diff --git a/deploy/general/server/cg20.fth.2160p5994 b/deploy/general/server/cg20.fth.2160p5994
new file mode 100644 (file)
index 0000000..01b9960
Binary files /dev/null and b/deploy/general/server/cg20.fth.2160p5994 differ

diff --git a/deploy/general/server/cg20.fth.2160p6000 b/deploy/general/server/cg20.fth.2160p6000
new file mode 100644 (file)
index 0000000..b5c9b5c
Binary files /dev/null and b/deploy/general/server/cg20.fth.2160p6000 differ

diff --git a/modules/decklink/util/util.h b/modules/decklink/util/util.h
index e91a42e2babe374a80b68442305ca315c7940ae9..b6aab14618bf2b899eb68011266d581866aa58f4 100644 (file)
--- a/modules/decklink/util/util.h
+++ b/modules/decklink/util/util.h
@@ -70,6 +70,9 @@ static BMDDisplayMode get_decklink_video_format(core::video_format fmt)
        case core::video_format::x2160p2500:    return bmdMode4K2160p25;
        case core::video_format::x2160p2997:    return bmdMode4K2160p2997;
        case core::video_format::x2160p3000:    return bmdMode4K2160p30;
+       case core::video_format::x2160p5000:    return bmdMode4K2160p50;
+       case core::video_format::x2160p5994:    return bmdMode4K2160p5994;
+       case core::video_format::x2160p6000:    return bmdMode4K2160p60;
        case core::video_format::dci2160p2398:  return bmdMode4kDCI2398;
        case core::video_format::dci2160p2400:  return bmdMode4kDCI24;
        case core::video_format::dci2160p2500:  return bmdMode4kDCI25;
@@ -108,6 +111,9 @@ static core::video_format get_caspar_video_format(BMDDisplayMode fmt)
        case bmdMode4K2160p25:                                  return core::video_format::x2160p2500;
        case bmdMode4K2160p2997:                                return core::video_format::x2160p2997;
        case bmdMode4K2160p30:                                  return core::video_format::x2160p3000;
+       case bmdMode4K2160p50:                                  return core::video_format::x2160p5000;
+       case bmdMode4K2160p5994:                                return core::video_format::x2160p5994;
+       case bmdMode4K2160p60:                                  return core::video_format::x2160p6000;
        case bmdMode4kDCI2398:                                  return core::video_format::dci2160p2398;
        case bmdMode4kDCI24:                                    return core::video_format::dci2160p2400;
        case bmdMode4kDCI25:                                    return core::video_format::dci2160p2500;

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 1734424857b28495cb910ffc73a49a53c6779484..c549e44aa130cf0ce449d7d9aa52bae7000e153b 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -71,7 +71,7 @@
 </thumbnails>\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|1556p2398|1556p2400|1556p2500|dci1080p2398|dci1080p2400|dci1080p2500|2160p2398|2160p2400|2160p2500|2160p2997|2160p3000|dci2160p2398|dci2160p2400|dci2160p2500] </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|1556p2398|1556p2400|1556p2500|dci1080p2398|dci1080p2400|dci1080p2500|2160p2398|2160p2400|2160p2500|2160p2997|2160p3000|2160p5000|2160p5994|2160p6000|dci2160p2398|dci2160p2400|dci2160p2500] </video-mode>\r
         <straight-alpha-output>false [true|false]</straight-alpha-output>\r
         <channel-layout>stereo [mono|stereo|matrix|film|smpte|ebu_r123_8a|ebu_r123_8b|8ch|16ch]</channel-layout>\r
         <consumers>\r

diff --git a/shell/shell.rc b/shell/shell.rc
index 9c14de5b26cc7925d721ee10fd782af3ab3badab..9d4367974a9dafe9bc851b2b0e9572c6cc18842b 100644 (file)
Binary files a/shell/shell.rc and b/shell/shell.rc differ