From: hellgore Date: Wed, 19 Sep 2012 11:01:46 +0000 (+0000) Subject: 3569308: added 720p30 and 720p29.976 as supported output resolutions (not supported... X-Git-Tag: 2.0.4-UNSTABLE~38 X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=ad4032d32c978b07130ea3105ee149da5378336c 3569308: added 720p30 and 720p29.976 as supported output resolutions (not supported by decklink) 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 6922aa0f9..5e85a419c 100644 --- 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"), DEFINE_VIDEOFORMATDESC(video_format::x720p2500 ,1280, 720, 1280, 720, field_mode::progressive, 25, 1, boost::assign::list_of(3840), L"720p2500"), DEFINE_VIDEOFORMATDESC(video_format::x720p5000 ,1280, 720, 1280, 720, field_mode::progressive, 50, 1, boost::assign::list_of(1920), L"720p5000"), + 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"), 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"), + DEFINE_VIDEOFORMATDESC(video_format::x720p3000 ,1280, 720, 1280, 720, field_mode::progressive, 30, 1, boost::assign::list_of(3200), L"720p3000"), DEFINE_VIDEOFORMATDESC(video_format::x720p6000 ,1280, 720, 1280, 720, field_mode::progressive, 60, 1, boost::assign::list_of(1600), L"720p6000"), - DEFINE_VIDEOFORMATDESC(video_format::x1080p2397 ,1920, 1080, 1920, 1080, field_mode::progressive, 24000, 1001, boost::assign::list_of(4004), L"1080p2398"), + DEFINE_VIDEOFORMATDESC(video_format::x1080p2398 ,1920, 1080, 1920, 1080, field_mode::progressive, 24000, 1001, boost::assign::list_of(4004), L"1080p2398"), DEFINE_VIDEOFORMATDESC(video_format::x1080p2400 ,1920, 1080, 1920, 1080, field_mode::progressive, 24, 1, boost::assign::list_of(4000), L"1080p2400"), DEFINE_VIDEOFORMATDESC(video_format::x1080i5000 ,1920, 1080, 1920, 1080, field_mode::upper, 25, 1, boost::assign::list_of(3840), L"1080i5000"), 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"), diff --git a/core/video_format.h b/core/video_format.h index 593671540..acf40a71e 100644 --- a/core/video_format.h +++ b/core/video_format.h @@ -35,9 +35,11 @@ struct video_format x576p2500, x720p2500, x720p5000, + x720p2997, x720p5994, + x720p3000, x720p6000, - x1080p2397, + x1080p2398, x1080p2400, x1080i5000, x1080i5994, diff --git a/modules/bluefish/util/blue_velvet.cpp b/modules/bluefish/util/blue_velvet.cpp index d6771ab37..119582249 100644 --- 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 case core::video_format::x720p2500: return VID_FMT_720P_2500; case core::video_format::x720p5000: return VID_FMT_720P_5000; + case core::video_format::x720p2997: return VID_FMT_720P_2997; case core::video_format::x720p5994: return VID_FMT_720P_5994; + case core::video_format::x720p3000: return VID_FMT_720P_3000; case core::video_format::x720p6000: return VID_FMT_720P_6000; - case core::video_format::x1080p2397: return VID_FMT_1080P_2397; + case core::video_format::x1080p2398: return VID_FMT_1080P_2397; case core::video_format::x1080p2400: return VID_FMT_1080P_2400; case core::video_format::x1080i5000: return VID_FMT_1080I_5000; case core::video_format::x1080i5994: return VID_FMT_1080I_5994; diff --git a/modules/decklink/util/util.h b/modules/decklink/util/util.h index 504d46d2d..58bb591bd 100644 --- 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; case core::video_format::x720p2500: return (BMDDisplayMode)ULONG_MAX; case core::video_format::x720p5000: return bmdModeHD720p50; + case core::video_format::x720p2997: return (BMDDisplayMode)ULONG_MAX; case core::video_format::x720p5994: return bmdModeHD720p5994; + case core::video_format::x720p3000: return (BMDDisplayMode)ULONG_MAX; case core::video_format::x720p6000: return bmdModeHD720p60; - case core::video_format::x1080p2397: return bmdModeHD1080p2398; + case core::video_format::x1080p2398: return bmdModeHD1080p2398; case core::video_format::x1080p2400: return bmdModeHD1080p24; case core::video_format::x1080i5000: return bmdModeHD1080i50; case core::video_format::x1080i5994: return bmdModeHD1080i5994; @@ -68,7 +70,7 @@ static core::video_format::type get_caspar_video_format(BMDDisplayMode fmt) case bmdModeHD720p50: return core::video_format::x720p5000; case bmdModeHD720p5994: return core::video_format::x720p5994; case bmdModeHD720p60: return core::video_format::x720p6000; - case bmdModeHD1080p2398: return core::video_format::x1080p2397; + case bmdModeHD1080p2398: return core::video_format::x1080p2398; case bmdModeHD1080p24: return core::video_format::x1080p2400; case bmdModeHD1080i50: return core::video_format::x1080i5000; case bmdModeHD1080i5994: return core::video_format::x1080i5994; diff --git a/shell/casparcg.config b/shell/casparcg.config index 417ce1e86..69daab1d4 100644 --- a/shell/casparcg.config +++ b/shell/casparcg.config @@ -45,7 +45,7 @@ - PAL [PAL|NTSC|1080i5000|576p2500|720p2500|720p5000|720p5994|720p6000|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000] + PAL [PAL|NTSC|576p2500|720p2500|720p5000|720p2997|720p5994|720p3000|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000] [1..] @@ -68,7 +68,7 @@ false [true|false] false [true|false] true [true|false] - fasle [true|false] + false [true|false]