git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

[casparcg] / core / producer / color / color_producer.cpp

diff --git a/core/producer/color/color_producer.cpp b/core/producer/color/color_producer.cpp
index ff527d489ee10b1283ccf43f22ece272142a2226..a6793b2dec052cb64e382853ed381ecc2d198f75 100644 (file)
--- a/core/producer/color/color_producer.cpp
+++ b/core/producer/color/color_producer.cpp
@@ -16,13 +16,18 @@
 *    You should have received a copy of the GNU General Public License\r
 *    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
 *\r
-*/\r
- \r
+*/ \r
 #include "../../stdafx.h"\r
 \r
 #include "color_producer.h"\r
 \r
-#include <core/producer/frame/write_frame.h>\r
+#include "../frame/basic_frame.h"\r
+#include "../frame/frame_factory.h"\r
+#include "../../mixer/write_frame.h"\r
+\r
+#include <common/exception/exceptions.h>\r
+\r
+#include <boost/algorithm/string.hpp>\r
 \r
 #include <sstream>\r
 \r
@@ -31,33 +36,91 @@ namespace caspar { namespace core {
 class color_producer : public frame_producer\r
 {\r
        safe_ptr<basic_frame> frame_;\r
-       std::wstring color_str_;\r
+       const std::wstring color_str_;\r
 \r
 public:\r
        explicit color_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& color) \r
                : color_str_(color)\r
-               , frame_(basic_frame::empty())\r
-       {\r
-               if(color.length() != 9 || color[0] != '#')\r
-                       BOOST_THROW_EXCEPTION(invalid_argument() << arg_name_info("color") << arg_value_info(narrow(color)) << msg_info("Invalid color code"));\r
-\r
-               auto frame = frame_factory->create_frame(1, 1, pixel_format::bgra);\r
-               auto& value = *reinterpret_cast<unsigned long*>(frame->image_data().begin());\r
-               std::wstringstream str(color_str_.substr(1));\r
-               str >> std::hex >> value;       \r
-               frame_ = std::move(frame);\r
-       }\r
+               , frame_(create_color_frame(this, frame_factory, color))\r
+       {}\r
+\r
+       // frame_producer\r
                        \r
-       virtual safe_ptr<basic_frame> receive() { return frame_; }\r
-       \r
+       virtual safe_ptr<basic_frame> receive(int) { return frame_; }   \r
+       virtual safe_ptr<basic_frame> last_frame() const { return frame_; }     \r
        virtual std::wstring print() const { return L"color[" + color_str_ + L"]"; }\r
 };\r
 \r
+std::wstring get_hex_color(const std::wstring& str)\r
+{\r
+       if(str.at(0) == '#')\r
+               return str.length() == 7 ? L"#FF" + str.substr(1) : str;\r
+       \r
+       if(boost::iequals(str, L"EMPTY"))\r
+               return L"#00000000";\r
+\r
+       if(boost::iequals(str, L"BLACK"))\r
+               return L"#FF000000";\r
+       \r
+       if(boost::iequals(str, L"WHITE"))\r
+               return L"#FFFFFFFF";\r
+       \r
+       if(boost::iequals(str, L"RED"))\r
+               return L"#FFFF0000";\r
+       \r
+       if(boost::iequals(str, L"GREEN"))\r
+               return L"#FF00FF00";\r
+       \r
+       if(boost::iequals(str, L"BLUE"))\r
+               return L"#FF0000FF";    \r
+       \r
+       if(boost::iequals(str, L"ORANGE"))\r
+               return L"#FFFFA500";    \r
+       \r
+       if(boost::iequals(str, L"YELLOW"))\r
+               return L"#FFFFFF00";\r
+       \r
+       if(boost::iequals(str, L"BROWN"))\r
+               return L"#FFA52A2A";\r
+       \r
+       if(boost::iequals(str, L"GRAY"))\r
+               return L"#FF808080";\r
+       \r
+       if(boost::iequals(str, L"TEAL"))\r
+               return L"#FF008080";\r
+       \r
+       return str;\r
+}\r
+\r
 safe_ptr<frame_producer> create_color_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
 {\r
-       if(params.empty() || params[0].at(0) != '#')\r
-               return frame_producer::empty();\r
-       return make_safe<color_producer>(frame_factory, params[0]);\r
+       if(params.size() < 0)\r
+               return core::frame_producer::empty();\r
+\r
+       auto color2 = get_hex_color(params[0]);\r
+       if(color2.length() != 9 || color2[0] != '#')\r
+               return core::frame_producer::empty();\r
+\r
+       return make_safe<color_producer>(frame_factory, color2);\r
+}\r
+safe_ptr<core::write_frame> create_color_frame(void* tag, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& color)\r
+{\r
+       auto color2 = get_hex_color(color);\r
+       if(color2.length() != 9 || color2[0] != '#')\r
+               BOOST_THROW_EXCEPTION(invalid_argument() << arg_name_info("color") << arg_value_info(narrow(color2)) << msg_info("Invalid color."));\r
+\r
+       auto frame = frame_factory->create_frame(tag, 1, 1, pixel_format::bgra);\r
+               \r
+       // Read color from hex-string and write to frame pixel.\r
+\r
+       auto& value = *reinterpret_cast<uint32_t*>(frame->image_data().begin());\r
+       std::wstringstream str(color2.substr(1));\r
+       if(!(str >> std::hex >> value) || !str.eof())\r
+               BOOST_THROW_EXCEPTION(invalid_argument() << arg_name_info("color") << arg_value_info(narrow(color2)) << msg_info("Invalid color."));\r
+\r
+       frame->commit();\r
+               \r
+       return frame;\r
 }\r
 \r
 }}
\ No newline at end of file