3569308: added 720p2398 and 720p2400 as supported output resolutions (not supported...

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3319 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/video_format.cpp b/core/video_format.cpp
index 5e85a419cd70a8274069d0f7db88d63e1bd100ed..1e1bff1a198648dcce22b06f4256fccd619d2345 100644 (file)
--- a/core/video_format.cpp
+++ b/core/video_format.cpp
@@ -53,6 +53,8 @@ const video_format_desc format_descs[video_format::count] =
        DEFINE_VIDEOFORMATDESC(video_format::pal                ,720,  576,  1024, 576,  field_mode::upper,                     25,             1,               boost::assign::list_of(3840),                                                  L"PAL"), \r
        DEFINE_VIDEOFORMATDESC(video_format::ntsc               ,720,  486,  720,  540,  field_mode::lower,                     30000,  1001,    boost::assign::list_of(3204)(3202)(3204)(3202)(3204),  L"NTSC"), \r
        DEFINE_VIDEOFORMATDESC(video_format::x576p2500  ,1024, 576,  1024, 576,  field_mode::progressive,       25,             1,               boost::assign::list_of(3840),                                                  L"576p2500"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x720p2398  ,1280, 720,  1280, 720,  field_mode::progressive,       24000,  1001,    boost::assign::list_of(4004),                                                  L"720p2398"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x720p2400  ,1280, 720,  1280, 720,  field_mode::progressive,       24,             1,               boost::assign::list_of(4000),                                                  L"720p2400"),\r
        DEFINE_VIDEOFORMATDESC(video_format::x720p2500  ,1280, 720,  1280, 720,  field_mode::progressive,       25,             1,               boost::assign::list_of(3840),                                                  L"720p2500"), \r
        DEFINE_VIDEOFORMATDESC(video_format::x720p5000  ,1280, 720,  1280, 720,  field_mode::progressive,       50,             1,               boost::assign::list_of(1920),                                                  L"720p5000"), \r
        DEFINE_VIDEOFORMATDESC(video_format::x720p2997  ,1280, 720,  1280, 720,  field_mode::progressive,       30000,  1001,    boost::assign::list_of(3204)(3202)(3204)(3202)(3204),  L"720p2997"),\r
@@ -68,6 +70,8 @@ const video_format_desc format_descs[video_format::count] =
        DEFINE_VIDEOFORMATDESC(video_format::x1080p2997 ,1920, 1080, 1920, 1080, field_mode::progressive,       30000,  1001,    boost::assign::list_of(3204)(3202)(3204)(3202)(3204),  L"1080p2997"),\r
        DEFINE_VIDEOFORMATDESC(video_format::x1080p3000 ,1920, 1080, 1920, 1080, field_mode::progressive,       30,             1,               boost::assign::list_of(3200),                                                  L"1080p3000"),\r
        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
 };\r
 \r

diff --git a/core/video_format.h b/core/video_format.h
index acf40a71eaabadf90625c5d8b2534ffd2d3a9916..48bbc1ed214ddbe749da7cce39edaa386eb5fcea 100644 (file)
--- a/core/video_format.h
+++ b/core/video_format.h
@@ -35,6 +35,8 @@ struct video_format
                x576p2500,\r
                x720p2500,\r
                x720p5000,\r
+               x720p2398,\r
+               x720p2400,\r
                x720p2997,\r
                x720p5994,\r
                x720p3000,\r
@@ -48,6 +50,8 @@ struct video_format
                x1080p2997,\r
                x1080p3000,\r
                x1080p5000,\r
+               x1080p5994,\r
+               x1080p6000,\r
                invalid,\r
                count\r
        };\r

diff --git a/modules/bluefish/util/blue_velvet.cpp b/modules/bluefish/util/blue_velvet.cpp
index 1195822494359a0798b01f95dba3421bb14c0ffd..0eefd390ab1d11b3fd2cc05be3ed5a9ae0b428e1 100644 (file)
--- a/modules/bluefish/util/blue_velvet.cpp
+++ b/modules/bluefish/util/blue_velvet.cpp
@@ -89,6 +89,8 @@ EVideoMode vid_fmt_from_video_format(const core::video_format::type& fmt)
        case core::video_format::pal:                   return VID_FMT_PAL;\r
        case core::video_format::ntsc:                  return VID_FMT_NTSC;\r
        case core::video_format::x576p2500:             return VID_FMT_INVALID; //not supported\r
+       case core::video_format::x720p2398:             return VID_FMT_720P_2398;\r
+       case core::video_format::x720p2400:             return VID_FMT_720P_2400;\r
        case core::video_format::x720p2500:             return VID_FMT_720P_2500;\r
        case core::video_format::x720p5000:             return VID_FMT_720P_5000;\r
        case core::video_format::x720p2997:             return VID_FMT_720P_2997;\r
@@ -104,6 +106,8 @@ EVideoMode vid_fmt_from_video_format(const core::video_format::type& fmt)
        case core::video_format::x1080p2997:    return VID_FMT_1080P_2997;\r
        case core::video_format::x1080p3000:    return VID_FMT_1080P_3000;\r
        case core::video_format::x1080p5000:    return VID_FMT_1080P_5000;\r
+       case core::video_format::x1080p5994:    return VID_FMT_1080P_5994;\r
+       case core::video_format::x1080p6000:    return VID_FMT_1080P_6000;\r
        default:                                                                return VID_FMT_INVALID;\r
        }\r
 }\r

diff --git a/modules/decklink/util/util.h b/modules/decklink/util/util.h
index 58bb591bd81dd0c6e0e17ef46438f7a4a029f2b9..e8b432932e2abea491001c5650b315c286bc96ae 100644 (file)
--- a/modules/decklink/util/util.h
+++ b/modules/decklink/util/util.h
@@ -42,6 +42,8 @@ static BMDDisplayMode get_decklink_video_format(core::video_format::type fmt)
        case core::video_format::pal:                   return bmdModePAL;\r
        case core::video_format::ntsc:                  return bmdModeNTSC;\r
        case core::video_format::x576p2500:             return (BMDDisplayMode)ULONG_MAX;\r
+       case core::video_format::x720p2398:             return (BMDDisplayMode)ULONG_MAX;\r
+       case core::video_format::x720p2400:             return (BMDDisplayMode)ULONG_MAX;\r
        case core::video_format::x720p2500:             return (BMDDisplayMode)ULONG_MAX;\r
        case core::video_format::x720p5000:             return bmdModeHD720p50;\r
        case core::video_format::x720p2997:             return (BMDDisplayMode)ULONG_MAX;\r
@@ -57,6 +59,8 @@ static BMDDisplayMode get_decklink_video_format(core::video_format::type fmt)
        case core::video_format::x1080p2997:    return bmdModeHD1080p2997;\r
        case core::video_format::x1080p3000:    return bmdModeHD1080p30;\r
        case core::video_format::x1080p5000:    return bmdModeHD1080p50;\r
+       case core::video_format::x1080p5994:    return bmdModeHD1080p5994;\r
+       case core::video_format::x1080p6000:    return bmdModeHD1080p6000;\r
        default:                                                                return (BMDDisplayMode)ULONG_MAX;\r
        }\r
 }\r
@@ -79,6 +83,8 @@ static core::video_format::type get_caspar_video_format(BMDDisplayMode fmt)
        case bmdModeHD1080p2997:                                return core::video_format::x1080p2997;  \r
        case bmdModeHD1080p30:                                  return core::video_format::x1080p3000;  \r
        case bmdModeHD1080p50:                                  return core::video_format::x1080p5000;  \r
+       case bmdModeHD1080p5994:                                return core::video_format::x1080p5994;  \r
+       case bmdModeHD1080p6000:                                return core::video_format::x1080p6000;  \r
        default:                                                                return core::video_format::invalid;     \r
        }\r
 }\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 69daab1d40389f8d4a316a04dda405fc1ed7d3b7..aa73ab5bce7b3dc09a32fa7cb4ea815f0a9b589d 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -45,7 +45,7 @@
 </flash>\r
 <channels>\r
     <channel>\r
-        <video-mode> PAL [PAL|NTSC|576p2500|720p2500|720p5000|720p2997|720p5994|720p3000|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000] </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] </video-mode>\r
         <consumers>\r
             <decklink>\r
                 <device>[1..]</device>\r