2.0. ogl_consumer: Refactored

     decklink_consumer: Added more logging.
     output: Unitialize existing consumer before initializing and adding new.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1289 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/consumer/output.cpp b/core/consumer/output.cpp
index ad8d51003a58f5f1fa969f83b0558999b73ed50b..fce751112bad59671f656f4563f77b262b5df331 100644 (file)
--- a/core/consumer/output.cpp
+++ b/core/consumer/output.cpp
@@ -90,10 +90,15 @@ public:
        \r
        void add(int index, safe_ptr<frame_consumer>&& consumer)\r
        {               \r
-               consumer->initialize(channel_.get_format_desc());\r
                channel_.execution().invoke([&]\r
                {\r
                        consumers_.erase(index);\r
+               });\r
+\r
+               consumer->initialize(channel_.get_format_desc());\r
+\r
+               channel_.execution().invoke([&]\r
+               {\r
                        consumers_.insert(std::make_pair(index, consumer));\r
 \r
                        CASPAR_LOG(info) << print() << L" " << consumer->print() << L" Added.";\r

diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp
index 9ead7d9bbf1ace07d8975cb2e7591d27ad60a771..601d875175c1a61da4864983787a1f73d062de1b 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.cpp
+++ b/modules/decklink/consumer/decklink_consumer.cpp
@@ -169,8 +169,6 @@ public:
 \r
                if(!config.embedded_audio)\r
                        start_playback();\r
-                               \r
-               CASPAR_LOG(info) << print() << L" Successfully Initialized.";   \r
        }\r
 \r
        ~decklink_consumer()\r
@@ -395,11 +393,20 @@ public:
                , fail_count_(0)\r
        {\r
        }\r
+\r
+       ~decklink_consumer_proxy()\r
+       {\r
+               auto str = print();\r
+               context_.reset();\r
+               CASPAR_LOG(info) << str << L" Successfully Uninitialized.";     \r
+       }\r
        \r
        virtual void initialize(const core::video_format_desc& format_desc)\r
        {\r
                format_desc_ = format_desc;\r
-               context_.reset([&]{return new decklink_consumer(config_, format_desc_);});\r
+               context_.reset([&]{return new decklink_consumer(config_, format_desc_);});              \r
+                               \r
+               CASPAR_LOG(info) << print() << L" Successfully Initialized.";   \r
        }\r
        \r
        virtual bool send(const safe_ptr<core::read_frame>& frame)\r
@@ -427,7 +434,7 @@ public:
        \r
        virtual std::wstring print() const\r
        {\r
-               return context_->print();\r
+               return context_ ? context_->print() : L"decklink_consumer";\r
        }\r
 \r
        virtual bool key_only() const\r

diff --git a/modules/ogl/consumer/ogl_consumer.cpp b/modules/ogl/consumer/ogl_consumer.cpp
index 2b15a49757a6f26ee5aad4bc28b50550d884f40c..76c06055c46b9847f3f6e908c845260b33beb6da 100644 (file)
--- a/modules/ogl/consumer/ogl_consumer.cpp
+++ b/modules/ogl/consumer/ogl_consumer.cpp
@@ -18,21 +18,18 @@
 *\r
 */\r
 \r
-#define NOMINMAX\r
-#define WIN32_LEAN_AND_MEAN\r
+#include "ogl_consumer.h"\r
 \r
-#include <windows.h>\r
 #include <GL/glew.h>\r
 #include <SFML/Window.hpp>\r
 \r
-#include "ogl_consumer.h"\r
-\r
+#include <common/diagnostics/graph.h>\r
 #include <common/gl/gl_check.h>\r
-#include <common/concurrency/executor.h>\r
+#include <common/log/log.h>\r
 #include <common/memory/safe_ptr.h>\r
 #include <common/memory/memcpy.h>\r
-#include <common/diagnostics/graph.h>\r
 #include <common/utility/timer.h>\r
+#include <common/utility/string.h>\r
 \r
 #include <core/video_format.h>\r
 #include <core/mixer/read_frame.h>\r
@@ -40,6 +37,11 @@
 \r
 #include <boost/timer.hpp>\r
 #include <boost/circular_buffer.hpp>\r
+#include <boost/foreach.hpp>\r
+#include <boost/thread.hpp>\r
+\r
+#include <tbb/atomic.h>\r
+#include <tbb/concurrent_queue.h>\r
 \r
 #include <algorithm>\r
 #include <array>\r
@@ -56,68 +58,66 @@ enum stretch
 \r
 struct ogl_consumer : boost::noncopyable\r
 {              \r
+       core::video_format_desc format_desc_;\r
+       \r
+       GLuint                                  texture_;\r
+       \r
        float                                   width_;\r
        float                                   height_;\r
-\r
-       GLuint                                  texture_;\r
-       std::array<GLuint, 2>   pbos_;\r
+       \r
+       const stretch                   stretch_;\r
 \r
        const bool                              windowed_;\r
+       unsigned int                    screen_x_;\r
+       unsigned int                    screen_y_;\r
        unsigned int                    screen_width_;\r
        unsigned int                    screen_height_;\r
        const unsigned int              screen_index_;\r
-                               \r
-       const stretch                   stretch_;\r
-       core::video_format_desc format_desc_;\r
+\r
+       size_t                                  square_width_;\r
+       size_t                                  square_height_;                         \r
        \r
        sf::Window                              window_;\r
        \r
        safe_ptr<diagnostics::graph> graph_;\r
        boost::timer                    perf_timer_;\r
 \r
-       size_t                                  square_width_;\r
-       size_t                                  square_height_;\r
-\r
        boost::circular_buffer<safe_ptr<core::read_frame>>                      input_buffer_;\r
        tbb::concurrent_bounded_queue<safe_ptr<core::read_frame>>       frame_buffer_;\r
 \r
-       executor                                executor_;\r
+       boost::thread                   thread_;\r
+       tbb::atomic<bool>               is_running_;\r
 public:\r
        ogl_consumer(unsigned int screen_index, stretch stretch, bool windowed, const core::video_format_desc& format_desc) \r
-               : stretch_(stretch)\r
-               , windowed_(windowed)\r
+               : format_desc_(format_desc)\r
                , texture_(0)\r
-               , screen_index_(screen_index)\r
-               , format_desc_(format_desc_)\r
+               , stretch_(stretch)\r
+               , windowed_(windowed)\r
+               , screen_index_(screen_index)           \r
+               , screen_width_(format_desc.width)\r
+               , screen_height_(format_desc.height)\r
+               , square_width_(format_desc.width)\r
+               , square_height_(format_desc.height)\r
                , graph_(diagnostics::create_graph(narrow(print())))\r
                , input_buffer_(core::consumer_buffer_depth()-1)\r
-               , executor_(print())\r
        {               \r
                frame_buffer_.set_capacity(2);\r
 \r
                graph_->add_guide("frame-time", 0.5);\r
                graph_->set_color("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
                graph_->set_color("dropped-frame", diagnostics::color(0.3f, 0.6f, 0.3f));\r
-               \r
-               format_desc_ = format_desc;\r
-\r
-               square_width_ = format_desc_.width;\r
-               square_height_ = format_desc_.height;\r
-                                               \r
+                                                                               \r
                if(format_desc_.format == core::video_format::pal)\r
                {\r
-                       square_width_ = 768;\r
-                       square_height_ = 576;\r
+                       square_width_   = 768;\r
+                       square_height_  = 576;\r
                }\r
                else if(format_desc_.format == core::video_format::ntsc)\r
                {\r
-                       square_width_ = 720;\r
-                       square_height_ = 547;\r
+                       square_width_   = 720;\r
+                       square_height_  = 547;\r
                }\r
-\r
-               screen_width_ = format_desc.width;\r
-               screen_height_ = format_desc.height;\r
-#ifdef _WIN32\r
+               \r
                DISPLAY_DEVICE d_device;                        \r
                memset(&d_device, 0, sizeof(d_device));\r
                d_device.cb = sizeof(d_device);\r
@@ -139,59 +139,100 @@ public:
                if(!EnumDisplaySettings(displayDevices[screen_index_].DeviceName, ENUM_CURRENT_SETTINGS, &devmode))\r
                        BOOST_THROW_EXCEPTION(invalid_operation() << arg_name_info("screen_index") << msg_info(narrow(print()) + " EnumDisplaySettings"));\r
                \r
-               screen_width_ = windowed_ ? square_width_ : devmode.dmPelsWidth;\r
-               screen_height_ = windowed_ ? square_height_ : devmode.dmPelsHeight;\r
-#else\r
-               if(!windowed)\r
-                       BOOST_THROW_EXCEPTION(not_supported() << msg_info(narrow(print() + " doesn't support non-Win32 fullscreen"));\r
-\r
-               if(screen_index != 0)\r
-                       CASPAR_LOG(warning) << print() << " only supports screen_index=0 for non-Win32";\r
-#endif         \r
-               executor_.invoke([=]\r
-               {\r
-                       if(!GLEW_VERSION_2_1)\r
-                               BOOST_THROW_EXCEPTION(not_supported() << msg_info("Missing OpenGL 2.1 support."));\r
-\r
-                       window_.Create(sf::VideoMode(screen_width_, screen_height_, 32), narrow(print()), windowed_ ? sf::Style::Resize : sf::Style::Fullscreen);\r
-                       window_.ShowMouseCursor(false);\r
-                       window_.SetPosition(devmode.dmPosition.x, devmode.dmPosition.y);\r
-                       window_.SetSize(screen_width_, screen_height_);\r
-                       window_.SetActive();\r
-                       GL(glEnable(GL_TEXTURE_2D));\r
-                       GL(glDisable(GL_DEPTH_TEST));           \r
-                       GL(glClearColor(0.0, 0.0, 0.0, 0.0));\r
-                       GL(glViewport(0, 0, format_desc_.width, format_desc_.height));\r
-                       glLoadIdentity();\r
+               screen_x_               = devmode.dmPosition.x;\r
+               screen_y_               = devmode.dmPosition.y;\r
+               screen_width_   = windowed_ ? square_width_ : devmode.dmPelsWidth;\r
+               screen_height_  = windowed_ ? square_height_ : devmode.dmPelsHeight;\r
+               \r
+               is_running_ = true;\r
+               thread_ = boost::thread([this]{run();});\r
+       }\r
+       \r
+       ~ogl_consumer()\r
+       {\r
+               is_running_ = false;\r
+               frame_buffer_.try_push(make_safe<core::read_frame>());\r
+               thread_.join();\r
+       }\r
+\r
+       void init()\r
+       {\r
+               if(!GLEW_VERSION_2_1)\r
+                       BOOST_THROW_EXCEPTION(not_supported() << msg_info("Missing OpenGL 2.1 support."));\r
+\r
+               window_.Create(sf::VideoMode(screen_width_, screen_height_, 32), narrow(print()), windowed_ ? sf::Style::Resize : sf::Style::Fullscreen);\r
+               window_.ShowMouseCursor(false);\r
+               window_.SetPosition(screen_x_, screen_y_);\r
+               window_.SetSize(screen_width_, screen_height_);\r
+               window_.SetActive();\r
+               GL(glEnable(GL_TEXTURE_2D));\r
+               GL(glDisable(GL_DEPTH_TEST));           \r
+               GL(glClearColor(0.0, 0.0, 0.0, 0.0));\r
+               GL(glViewport(0, 0, format_desc_.width, format_desc_.height));\r
+               GL(glLoadIdentity());\r
                                \r
-                       calculate_aspect();\r
+               calculate_aspect();\r
                        \r
-                       glGenTextures(1, &texture_);\r
-                       glBindTexture(GL_TEXTURE_2D, texture_);\r
-                       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);\r
-                       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);\r
-                       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);\r
-                       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);\r
-                       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, format_desc_.width, format_desc_.height, 0, GL_BGRA, GL_UNSIGNED_BYTE, 0);\r
-                       glBindTexture(GL_TEXTURE_2D, 0);\r
+               GL(glGenTextures(1, &texture_));\r
+               GL(glBindTexture(GL_TEXTURE_2D, texture_));\r
+               GL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST));\r
+               GL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST));\r
+               GL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP));\r
+               GL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP));\r
+               GL(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, format_desc_.width, format_desc_.height, 0, GL_BGRA, GL_UNSIGNED_BYTE, 0));\r
+               GL(glBindTexture(GL_TEXTURE_2D, 0));\r
                        \r
-                       GL(glGenBuffers(2, pbos_.data()));\r
-                       \r
-                       glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, pbos_[0]);\r
-                       glBufferDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, format_desc_.size, 0, GL_STREAM_DRAW_ARB);\r
-                       glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, pbos_[1]);\r
-                       glBufferDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, format_desc_.size, 0, GL_STREAM_DRAW_ARB);\r
-                       glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0);\r
-               });\r
                CASPAR_LOG(info) << print() << " Sucessfully Initialized.";\r
+       }\r
 \r
-               executor_.begin_invoke([this]{tick();});\r
+       void uninit()\r
+       {               \r
+               if(texture_)\r
+                       glDeleteTextures(1, &texture_);\r
+\r
+               CASPAR_LOG(info) << print() << " Sucessfully Uninitialized.";\r
        }\r
 \r
-       ~ogl_consumer()\r
+       void run()\r
        {\r
-               executor_.stop();\r
-               frame_buffer_.push(make_safe<core::read_frame>());\r
+               try\r
+               {\r
+                       init();\r
+\r
+                       while(is_running_)\r
+                       {                       \r
+                               try\r
+                               {\r
+                                       perf_timer_.restart();\r
+\r
+                                       sf::Event e;            \r
+                                       while(window_.GetEvent(e))\r
+                                       {\r
+                                               if(e.Type == sf::Event::Resized)\r
+                                                       calculate_aspect();\r
+                                       }\r
+                       \r
+                                       safe_ptr<core::read_frame> frame;\r
+                                       frame_buffer_.pop(frame);\r
+                                       render(frame);\r
+\r
+                                       window_.Display();\r
+\r
+                                       graph_->update_value("frame-time", static_cast<float>(perf_timer_.elapsed()*format_desc_.fps*0.5));     \r
+                               }\r
+                               catch(...)\r
+                               {\r
+                                       CASPAR_LOG_CURRENT_EXCEPTION();\r
+                                       is_running_ = false;\r
+                               }\r
+                       }\r
+\r
+                       uninit();\r
+               }\r
+               catch(...)\r
+               {\r
+                       CASPAR_LOG_CURRENT_EXCEPTION();\r
+               }\r
        }\r
        \r
        const core::video_format_desc& get_video_format_desc() const\r
@@ -199,6 +240,42 @@ public:
                return format_desc_;\r
        }\r
 \r
+       void render(const safe_ptr<core::read_frame>& frame)\r
+       {                       \r
+               if(frame->image_data().empty())\r
+                       return;\r
+\r
+               GL(glBindTexture(GL_TEXTURE_2D, texture_));\r
+\r
+               GL(glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, format_desc_.width, format_desc_.height, GL_BGRA, GL_UNSIGNED_BYTE, frame->image_data().begin()));\r
+                                               \r
+               GL(glClear(GL_COLOR_BUFFER_BIT));                       \r
+               glBegin(GL_QUADS);\r
+                               glTexCoord2f(0.0f,        1.0f);        glVertex2f(-width_, -height_);\r
+                               glTexCoord2f(1.0f,        1.0f);        glVertex2f( width_, -height_);\r
+                               glTexCoord2f(1.0f,        0.0f);        glVertex2f( width_,  height_);\r
+                               glTexCoord2f(0.0f,        0.0f);        glVertex2f(-width_,  height_);\r
+               glEnd();\r
+               \r
+               glBindTexture(GL_TEXTURE_2D, 0);\r
+       }\r
+\r
+       void send(const safe_ptr<core::read_frame>& frame)\r
+       {\r
+               input_buffer_.push_back(frame);\r
+\r
+               if(input_buffer_.full())\r
+               {\r
+                       if(!frame_buffer_.try_push(input_buffer_.front()))\r
+                               graph_->add_tag("dropped-frame");\r
+               }\r
+       }\r
+               \r
+       std::wstring print() const\r
+       {       \r
+               return  L"ogl[" + boost::lexical_cast<std::wstring>(screen_index_) + L"|" + format_desc_.name + L"]";\r
+       }\r
+       \r
        void calculate_aspect()\r
        {\r
                if(windowed_)\r
@@ -254,84 +331,6 @@ public:
 \r
                return std::make_pair(width, height);\r
        }\r
-\r
-       void render(const safe_ptr<core::read_frame>& frame)\r
-       {                       \r
-               glBindTexture(GL_TEXTURE_2D, texture_);\r
-\r
-               glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pbos_[0]);\r
-               glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, format_desc_.width, format_desc_.height, GL_BGRA, GL_UNSIGNED_BYTE, 0);\r
-\r
-               glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pbos_[1]);\r
-               glBufferData(GL_PIXEL_UNPACK_BUFFER, format_desc_.size, 0, GL_STREAM_DRAW);\r
-\r
-               auto ptr = glMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);\r
-               if(ptr)\r
-               {\r
-                       fast_memcpy(reinterpret_cast<char*>(ptr), frame->image_data().begin(), frame->image_data().size());\r
-                       glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER); // release the mapped buffer\r
-               }\r
-\r
-               glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);\r
-                               \r
-               GL(glClear(GL_COLOR_BUFFER_BIT));                       \r
-               glBegin(GL_QUADS);\r
-                               glTexCoord2f(0.0f,        1.0f);        glVertex2f(-width_, -height_);\r
-                               glTexCoord2f(1.0f,        1.0f);        glVertex2f( width_, -height_);\r
-                               glTexCoord2f(1.0f,        0.0f);        glVertex2f( width_,  height_);\r
-                               glTexCoord2f(0.0f,        0.0f);        glVertex2f(-width_,  height_);\r
-               glEnd();\r
-               \r
-               glBindTexture(GL_TEXTURE_2D, 0);\r
-\r
-               std::rotate(pbos_.begin(), pbos_.begin() + 1, pbos_.end());\r
-       }\r
-\r
-       void send(const safe_ptr<core::read_frame>& frame)\r
-       {\r
-               input_buffer_.push_back(frame);\r
-\r
-               if(input_buffer_.full())\r
-               {\r
-                       if(!frame_buffer_.try_push(input_buffer_.front()))\r
-                               graph_->add_tag("dropped-frame");\r
-               }\r
-       }\r
-               \r
-       std::wstring print() const\r
-       {       \r
-               return  L"ogl[" + boost::lexical_cast<std::wstring>(screen_index_) + L"|" + format_desc_.name + L"]";\r
-       }\r
-\r
-       void tick()\r
-       {\r
-               try\r
-               {\r
-                       perf_timer_.restart();\r
-                       sf::Event e;\r
-               \r
-                       safe_ptr<core::read_frame> frame;\r
-\r
-                       while(window_.GetEvent(e))\r
-                       {\r
-                               if(e.Type == sf::Event::Resized)\r
-                                       calculate_aspect();\r
-                       }\r
-\r
-                       frame_buffer_.pop(frame);\r
-\r
-                       if(!frame->image_data().empty())\r
-                               render(frame);\r
-\r
-                       window_.Display();\r
-                       graph_->update_value("frame-time", static_cast<float>(perf_timer_.elapsed()*format_desc_.fps*0.5));     \r
-               }\r
-               catch(...)\r
-               {\r
-                       CASPAR_LOG_CURRENT_EXCEPTION();\r
-               }\r
-               executor_.begin_invoke([=]{tick();});\r
-       }\r
 };\r
 \r
 \r