]> git.sesse.net Git - casparcg/commitdiff
Added missing display modes.
authorPeter Karlsson <peter.p.karlsson@svt.se>
Thu, 4 Apr 2013 07:01:24 +0000 (09:01 +0200)
committerPeter Karlsson <peter.p.karlsson@svt.se>
Thu, 4 Apr 2013 07:01:24 +0000 (09:01 +0200)
modules/decklink/util/util.h
shell/casparcg.config

index e8b432932e2abea491001c5650b315c286bc96ae..5373562a66f47da4ee25ed8fcc204bfe68bbb1bc 100644 (file)
@@ -61,6 +61,9 @@ static BMDDisplayMode get_decklink_video_format(core::video_format::type fmt)
        case core::video_format::x1080p5000:    return bmdModeHD1080p50;\r
        case core::video_format::x1080p5994:    return bmdModeHD1080p5994;\r
        case core::video_format::x1080p6000:    return bmdModeHD1080p6000;\r
+       case core::video_format::x2k2398:               return bmdMode2k2398;\r
+       case core::video_format::x2k2400:               return bmdMode2k24;\r
+       case core::video_format::x2k2500:               return bmdMode2k25;\r
        default:                                                                return (BMDDisplayMode)ULONG_MAX;\r
        }\r
 }\r
@@ -85,6 +88,9 @@ static core::video_format::type get_caspar_video_format(BMDDisplayMode fmt)
        case bmdModeHD1080p50:                                  return core::video_format::x1080p5000;  \r
        case bmdModeHD1080p5994:                                return core::video_format::x1080p5994;  \r
        case bmdModeHD1080p6000:                                return core::video_format::x1080p6000;  \r
+       case bmdMode2k2398:                                             return core::video_format::x2k2398;     \r
+       case bmdMode2k24:                                               return core::video_format::x2k2400;     \r
+       case bmdMode2k25:                                               return core::video_format::x2k2500;     \r
        default:                                                                return core::video_format::invalid;     \r
        }\r
 }\r
index a65542e34fd6f788ccdbcca5d2c6aaad02344cb2..4c97187270f67408d928e21ebe12fc054dfb28c9 100644 (file)
@@ -55,7 +55,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] </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|2k2398|2k2400|2k2500] </video-mode>\r
         <consumers>\r
             <decklink>\r
                 <device>[1..]</device>\r