2.0. Updated namespaces.

[casparcg] / modules / decklink / util / util.h

diff --git a/modules/decklink/util/util.h b/modules/decklink/util/util.h
index 4425dece494696a7810f766a794765f077122a44..09bca51967ca77e19e1f19d2e0c71570f3bdc3da 100644 (file)
--- a/modules/decklink/util/util.h
+++ b/modules/decklink/util/util.h
@@ -20,13 +20,18 @@
 #pragma once\r
 \r
 #include <common/exception/exceptions.h>\r
+#include <common/log/log.h>\r
 #include <core/video_format.h>\r
 \r
 #include "../interop/DeckLinkAPI_h.h"\r
 \r
+#include <boost/lexical_cast.hpp>\r
+\r
 #include <atlbase.h>\r
 \r
-namespace caspar { \r
+#include <string>\r
+\r
+namespace caspar { namespace decklink {\r
        \r
 static BMDDisplayMode get_decklink_video_format(core::video_format::type fmt) \r
 {\r
@@ -47,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
@@ -68,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
@@ -92,9 +99,10 @@ BMDDisplayMode get_display_mode(const T& device, BMDDisplayMode format, BMDPixel
                \r
        BMDDisplayModeSupport displayModeSupport;\r
        if(FAILED(device->DoesSupportVideoMode(mode->GetDisplayMode(), pix_fmt, flag, &displayModeSupport, nullptr)) || displayModeSupport == bmdDisplayModeNotSupported)\r
-               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Device does not support requested video-format.")\r
-                                                                                                << arg_value_info(boost::lexical_cast<std::string>(format))\r
-                                                                                                << arg_name_info("format"));\r
+               CASPAR_LOG(warning) << L"Device does not support video-format.";\r
+               //BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Device does not support requested video-format.")\r
+               //                                                                               << arg_value_info(boost::lexical_cast<std::string>(format))\r
+               //                                                                               << arg_name_info("format"));\r
        else if(displayModeSupport == bmdDisplayModeSupportedWithConversion)\r
                CASPAR_LOG(warning) << L"Device supports video-format with conversion.";\r
 \r
@@ -144,4 +152,4 @@ static std::wstring get_model_name(const T& device)
        return std::wstring(pModelName);\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file