3569308: added 720p30 and 720p29.976 as supported output resolutions (not supported...

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

diff --git a/core/video_format.cpp b/core/video_format.cpp
index 6922aa0f95a42490c4ec448cc326f4115e3d305a..5e85a419cd70a8274069d0f7db88d63e1bd100ed 100644 (file)
--- a/core/video_format.cpp
+++ b/core/video_format.cpp
@@ -55,9 +55,11 @@ const video_format_desc format_descs[video_format::count] =
        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::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
        DEFINE_VIDEOFORMATDESC(video_format::x720p5994  ,1280, 720,  1280, 720,  field_mode::progressive,       60000,  1001,    boost::assign::list_of(1602)(1601)(1602)(1601)(1602),  L"720p5994"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x720p3000  ,1280, 720,  1280, 720,  field_mode::progressive,       30,             1,               boost::assign::list_of(3200),                                                  L"720p3000"),\r
        DEFINE_VIDEOFORMATDESC(video_format::x720p6000  ,1280, 720,  1280, 720,  field_mode::progressive,       60,             1,               boost::assign::list_of(1600),                                                  L"720p6000"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x1080p2397 ,1920, 1080, 1920, 1080, field_mode::progressive,       24000,  1001,    boost::assign::list_of(4004),                                                  L"1080p2398"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x1080p2398 ,1920, 1080, 1920, 1080, field_mode::progressive,       24000,  1001,    boost::assign::list_of(4004),                                                  L"1080p2398"),\r
        DEFINE_VIDEOFORMATDESC(video_format::x1080p2400 ,1920, 1080, 1920, 1080, field_mode::progressive,       24,             1,               boost::assign::list_of(4000),                                                  L"1080p2400"),\r
        DEFINE_VIDEOFORMATDESC(video_format::x1080i5000 ,1920, 1080, 1920, 1080, field_mode::upper,                     25,             1,               boost::assign::list_of(3840),                                                  L"1080i5000"),\r
        DEFINE_VIDEOFORMATDESC(video_format::x1080i5994 ,1920, 1080, 1920, 1080, field_mode::upper,                     30000,  1001,    boost::assign::list_of(3204)(3202)(3204)(3202)(3204),  L"1080i5994"),\r

diff --git a/core/video_format.h b/core/video_format.h
index 593671540f613f0efab44333f116bd1545ad0027..acf40a71eaabadf90625c5d8b2534ffd2d3a9916 100644 (file)
--- a/core/video_format.h
+++ b/core/video_format.h
@@ -35,9 +35,11 @@ struct video_format
                x576p2500,\r
                x720p2500,\r
                x720p5000,\r
+               x720p2997,\r
                x720p5994,\r
+               x720p3000,\r
                x720p6000,\r
-               x1080p2397,\r
+               x1080p2398,\r
                x1080p2400,\r
                x1080i5000,\r
                x1080i5994,\r

diff --git a/modules/bluefish/util/blue_velvet.cpp b/modules/bluefish/util/blue_velvet.cpp
index d6771ab37f1dba0b94513d03c6a8cbdeca219001..1195822494359a0798b01f95dba3421bb14c0ffd 100644 (file)
--- a/modules/bluefish/util/blue_velvet.cpp
+++ b/modules/bluefish/util/blue_velvet.cpp
@@ -91,9 +91,11 @@ EVideoMode vid_fmt_from_video_format(const core::video_format::type& fmt)
        case core::video_format::x576p2500:             return VID_FMT_INVALID; //not supported\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
        case core::video_format::x720p5994:             return VID_FMT_720P_5994;\r
+       case core::video_format::x720p3000:             return VID_FMT_720P_3000;\r
        case core::video_format::x720p6000:             return VID_FMT_720P_6000;\r
-       case core::video_format::x1080p2397:    return VID_FMT_1080P_2397;\r
+       case core::video_format::x1080p2398:    return VID_FMT_1080P_2397;\r
        case core::video_format::x1080p2400:    return VID_FMT_1080P_2400;\r
        case core::video_format::x1080i5000:    return VID_FMT_1080I_5000;\r
        case core::video_format::x1080i5994:    return VID_FMT_1080I_5994;\r

diff --git a/modules/decklink/util/util.h b/modules/decklink/util/util.h
index 504d46d2dd399a309d6502c7c73cc8de4bd40e95..58bb591bd81dd0c6e0e17ef46438f7a4a029f2b9 100644 (file)
--- a/modules/decklink/util/util.h
+++ b/modules/decklink/util/util.h
@@ -44,9 +44,11 @@ static BMDDisplayMode get_decklink_video_format(core::video_format::type fmt)
        case core::video_format::x576p2500:             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
        case core::video_format::x720p5994:             return bmdModeHD720p5994;\r
+       case core::video_format::x720p3000:             return (BMDDisplayMode)ULONG_MAX;\r
        case core::video_format::x720p6000:             return bmdModeHD720p60;\r
-       case core::video_format::x1080p2397:    return bmdModeHD1080p2398;\r
+       case core::video_format::x1080p2398:    return bmdModeHD1080p2398;\r
        case core::video_format::x1080p2400:    return bmdModeHD1080p24;\r
        case core::video_format::x1080i5000:    return bmdModeHD1080i50;\r
        case core::video_format::x1080i5994:    return bmdModeHD1080i5994;\r
@@ -68,7 +70,7 @@ static core::video_format::type get_caspar_video_format(BMDDisplayMode fmt)
        case bmdModeHD720p50:                                   return core::video_format::x720p5000;   \r
        case bmdModeHD720p5994:                                 return core::video_format::x720p5994;   \r
        case bmdModeHD720p60:                                   return core::video_format::x720p6000;   \r
-       case bmdModeHD1080p2398:                                return core::video_format::x1080p2397;  \r
+       case bmdModeHD1080p2398:                                return core::video_format::x1080p2398;  \r
        case bmdModeHD1080p24:                                  return core::video_format::x1080p2400;  \r
        case bmdModeHD1080i50:                                  return core::video_format::x1080i5000;  \r
        case bmdModeHD1080i5994:                                return core::video_format::x1080i5994;  \r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 417ce1e86a3ecd260c9a3d1a92a0e9ec8718629c..69daab1d40389f8d4a316a04dda405fc1ed7d3b7 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|1080i5000|576p2500|720p2500|720p5000|720p5994|720p6000|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000] </video-mode>\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
         <consumers>\r
             <decklink>\r
                 <device>[1..]</device>\r
@@ -68,7 +68,7 @@
                 <windowed>false [true|false]</windowed>\r
                 <key-only>false [true|false]</key-only>\r
                 <auto-deinterlace>true [true|false]</auto-deinterlace>\r
-                <vsync>fasle [true|false]</vsync>\r
+                <vsync>false [true|false]</vsync>\r
             </screen>\r
             <file>\r
                 <path></path>\r