]> git.sesse.net Git - casparcg/commitdiff
2.0. Added support for 1080p5000.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Wed, 10 Aug 2011 12:23:18 +0000 (12:23 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Wed, 10 Aug 2011 12:23:18 +0000 (12:23 +0000)
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1124 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

modules/bluefish/util/blue_velvet.cpp
modules/decklink/util/util.h

index eb9f3a429ea7e9aae2a661b83e6da8b539afd130..b4c5651d30b7478c5f393560345c6c41245ce39e 100644 (file)
@@ -68,6 +68,7 @@ EVideoMode vid_fmt_from_video_format(const core::video_format::type& fmt)
        case core::video_format::x1080p2500:    return VID_FMT_1080P_2500;\r
        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
        default:                                                                return VID_FMT_INVALID;\r
        }\r
 }\r
index 349ca14ff818138061577875ed31602431b2daec..37006c9d1e5fa0ed7fc78ea5323d802af600ba8b 100644 (file)
@@ -52,6 +52,7 @@ static BMDDisplayMode get_decklink_video_format(core::video_format::type fmt)
        case core::video_format::x1080p2500:    return bmdModeHD1080p25;\r
        case core::video_format::x1080p2997:    return bmdModeHD1080p2997;\r
        case core::video_format::x1080p3000:    return bmdModeHD1080p30;\r
+       case core::video_format::x1080p5000:    return bmdModeHD1080p50;\r
        default:                                                                return (BMDDisplayMode)ULONG_MAX;\r
        }\r
 }\r
@@ -73,6 +74,7 @@ static core::video_format::type get_caspar_video_format(BMDDisplayMode fmt)
        case bmdModeHD1080p25:                                  return core::video_format::x1080p2500;  \r
        case bmdModeHD1080p2997:                                return core::video_format::x1080p2997;  \r
        case bmdModeHD1080p30:                                  return core::video_format::x1080p3000;  \r
+       case bmdModeHD1080p50:                                  return core::video_format::x1080p5000;  \r
        default:                                                                return core::video_format::invalid;     \r
        }\r
 }\r