2.0. Fixed rendering stalls caused by ogl frame allocation delays.

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

diff --git a/core/mixer/gpu/ogl_device.cpp b/core/mixer/gpu/ogl_device.cpp
index ba7db7ea09cddd89d066145584038999c299057e..9f83317d91f2645e33e13530e6c354d93c549ee5 100644 (file)
--- a/core/mixer/gpu/ogl_device.cpp
+++ b/core/mixer/gpu/ogl_device.cpp
@@ -75,6 +75,32 @@ ogl_device::~ogl_device()
                glDeleteFramebuffersEXT(1, &fbo_);\r
        });\r
 }\r
+\r
+safe_ptr<device_buffer> ogl_device::allocate_device_buffer(size_t width, size_t height, size_t stride)\r
+{\r
+       std::shared_ptr<device_buffer> buffer;\r
+       try\r
+       {\r
+               buffer.reset(new device_buffer(width, height, stride));\r
+       }\r
+       catch(...)\r
+       {\r
+               try\r
+               {\r
+                       yield();\r
+                       gc().wait();\r
+                                       \r
+                       // Try again\r
+                       buffer.reset(new device_buffer(width, height, stride));\r
+               }\r
+               catch(...)\r
+               {\r
+                       CASPAR_LOG(error) << L"ogl: create_device_buffer failed!";\r
+                       throw;\r
+               }\r
+       }\r
+       return make_safe(buffer);\r
+}\r
                                \r
 safe_ptr<device_buffer> ogl_device::create_device_buffer(size_t width, size_t height, size_t stride)\r
 {\r
@@ -83,39 +109,51 @@ safe_ptr<device_buffer> ogl_device::create_device_buffer(size_t width, size_t he
        auto& pool = device_pools_[stride-1][((width << 16) & 0xFFFF0000) | (height & 0x0000FFFF)];\r
        std::shared_ptr<device_buffer> buffer;\r
        if(!pool->items.try_pop(buffer))                \r
-       {\r
-               executor_.invoke([&]\r
-               {       \r
-                       try\r
-                       {\r
-                               buffer.reset(new device_buffer(width, height, stride));\r
-                       }\r
-                       catch(...)\r
-                       {\r
-                               try\r
-                               {\r
-                                       yield();\r
-                                       gc().wait();\r
-                                       \r
-                                       // Try again\r
-                                       buffer.reset(new device_buffer(width, height, stride));\r
-                               }\r
-                               catch(...)\r
-                               {\r
-                                       CASPAR_LOG(error) << L"ogl: create_device_buffer failed!";\r
-                                       throw;\r
-                               }\r
-                       }\r
-               }, high_priority);      \r
-       }\r
+               buffer = executor_.invoke([&]{return allocate_device_buffer(width, height, stride);}, high_priority);                   \r
        \r
-       ++pool->usage_count;\r
+       //++pool->usage_count;\r
 \r
        return safe_ptr<device_buffer>(buffer.get(), [=](device_buffer*) mutable\r
        {               \r
                pool->items.push(buffer);       \r
        });\r
 }\r
+\r
+safe_ptr<host_buffer> ogl_device::allocate_host_buffer(size_t size, host_buffer::usage_t usage)\r
+{\r
+       std::shared_ptr<host_buffer> buffer;\r
+\r
+       try\r
+       {\r
+               buffer.reset(new host_buffer(size, usage));\r
+               if(usage == host_buffer::write_only)\r
+                       buffer->map();\r
+               else\r
+                       buffer->unmap();                        \r
+       }\r
+       catch(...)\r
+       {\r
+               try\r
+               {\r
+                       yield();\r
+                       gc().wait();\r
+\r
+                       // Try again\r
+                       buffer.reset(new host_buffer(size, usage));\r
+                       if(usage == host_buffer::write_only)\r
+                               buffer->map();\r
+                       else\r
+                               buffer->unmap();        \r
+               }\r
+               catch(...)\r
+               {\r
+                       CASPAR_LOG(error) << L"ogl: create_host_buffer failed!";\r
+                       throw;          \r
+               }\r
+       }\r
+\r
+       return make_safe(buffer);\r
+}\r
        \r
 safe_ptr<host_buffer> ogl_device::create_host_buffer(size_t size, host_buffer::usage_t usage)\r
 {\r
@@ -123,42 +161,10 @@ safe_ptr<host_buffer> ogl_device::create_host_buffer(size_t size, host_buffer::u
        CASPAR_VERIFY(size > 0);\r
        auto& pool = host_pools_[usage][size];\r
        std::shared_ptr<host_buffer> buffer;\r
-       if(!pool->items.try_pop(buffer))\r
-       {\r
-               executor_.invoke([&]\r
-               {\r
-                       try\r
-                       {\r
-                               buffer.reset(new host_buffer(size, usage));\r
-                               if(usage == host_buffer::write_only)\r
-                                       buffer->map();\r
-                               else\r
-                                       buffer->unmap();                        \r
-                       }\r
-                       catch(...)\r
-                       {\r
-                               try\r
-                               {\r
-                                       yield();\r
-                                       gc().wait();\r
-\r
-                                       // Try again\r
-                                       buffer.reset(new host_buffer(size, usage));\r
-                                       if(usage == host_buffer::write_only)\r
-                                               buffer->map();\r
-                                       else\r
-                                               buffer->unmap();        \r
-                               }\r
-                               catch(...)\r
-                               {\r
-                                       CASPAR_LOG(error) << L"ogl: create_host_buffer failed!";\r
-                                       throw;          \r
-                               }\r
-                       }\r
-               }, high_priority);      \r
-       }\r
+       if(!pool->items.try_pop(buffer))        \r
+               buffer = executor_.invoke([=]{return allocate_host_buffer(size, usage);}, high_priority);       \r
        \r
-       ++pool->usage_count;\r
+       //++pool->usage_count;\r
 \r
        return safe_ptr<host_buffer>(buffer.get(), [=](host_buffer*) mutable\r
        {\r
@@ -174,43 +180,43 @@ safe_ptr<host_buffer> ogl_device::create_host_buffer(size_t size, host_buffer::u
        });\r
 }\r
 \r
-template<typename T>\r
-void flush_pool(buffer_pool<T>& pool)\r
-{      \r
-       if(pool.flush_count.fetch_and_increment() < 16)\r
-               return;\r
-\r
-       if(pool.usage_count.fetch_and_store(0) < pool.items.size())\r
-       {\r
-               std::shared_ptr<T> buffer;\r
-               pool.items.try_pop(buffer);\r
-       }\r
-\r
-       pool.flush_count = 0;\r
-       pool.usage_count = 0;\r
-}\r
+//template<typename T>\r
+//void flush_pool(buffer_pool<T>& pool)\r
+//{    \r
+//     if(pool.flush_count.fetch_and_increment() < 16)\r
+//             return;\r
+//\r
+//     if(pool.usage_count.fetch_and_store(0) < pool.items.size())\r
+//     {\r
+//             std::shared_ptr<T> buffer;\r
+//             pool.items.try_pop(buffer);\r
+//     }\r
+//\r
+//     pool.flush_count = 0;\r
+//     pool.usage_count = 0;\r
+//}\r
 \r
 void ogl_device::flush()\r
 {\r
        GL(glFlush());  \r
                \r
-       try\r
-       {\r
-               BOOST_FOREACH(auto& pools, device_pools_)\r
-               {\r
-                       BOOST_FOREACH(auto& pool, pools)\r
-                               flush_pool(*pool.second);\r
-               }\r
-               BOOST_FOREACH(auto& pools, host_pools_)\r
-               {\r
-                       BOOST_FOREACH(auto& pool, pools)\r
-                               flush_pool(*pool.second);\r
-               }\r
-       }\r
-       catch(...)\r
-       {\r
-               CASPAR_LOG_CURRENT_EXCEPTION();\r
-       }\r
+       //try\r
+       //{\r
+       //      BOOST_FOREACH(auto& pools, device_pools_)\r
+       //      {\r
+       //              BOOST_FOREACH(auto& pool, pools)\r
+       //                      flush_pool(*pool.second);\r
+       //      }\r
+       //      BOOST_FOREACH(auto& pools, host_pools_)\r
+       //      {\r
+       //              BOOST_FOREACH(auto& pool, pools)\r
+       //                      flush_pool(*pool.second);\r
+       //      }\r
+       //}\r
+       //catch(...)\r
+       //{\r
+       //      CASPAR_LOG_CURRENT_EXCEPTION();\r
+       //}\r
 }\r
 \r
 void ogl_device::yield()\r

diff --git a/core/mixer/gpu/ogl_device.h b/core/mixer/gpu/ogl_device.h
index d1fb65b2dae6e442bd4220c2387b7a904e8d75c7..872046c0b3b46072f26ef5cd782750622af8c3f2 100644 (file)
--- a/core/mixer/gpu/ogl_device.h
+++ b/core/mixer/gpu/ogl_device.h
@@ -115,10 +115,15 @@ public:
                \r
        safe_ptr<device_buffer> create_device_buffer(size_t width, size_t height, size_t stride);\r
        safe_ptr<host_buffer> create_host_buffer(size_t size, host_buffer::usage_t usage);\r
+       \r
        void yield();\r
        boost::unique_future<void> gc();\r
 \r
        static std::wstring get_version();\r
+\r
+private:\r
+       safe_ptr<device_buffer> allocate_device_buffer(size_t width, size_t height, size_t stride);\r
+       safe_ptr<host_buffer> allocate_host_buffer(size_t size, host_buffer::usage_t usage);\r
 };\r
 \r
 }}
\ No newline at end of file

diff --git a/core/mixer/image/image_kernel.cpp b/core/mixer/image/image_kernel.cpp
index 9e5e4de0cb56cc6faf00240f6c680ba145f7bb65..1eeb50bd334ecb71c55460b96d4408a0e99a0485 100644 (file)
--- a/core/mixer/image/image_kernel.cpp
+++ b/core/mixer/image/image_kernel.cpp
@@ -65,6 +65,8 @@ struct image_kernel::implementation : boost::noncopyable
        {\r
                static const double epsilon = 0.001;\r
 \r
+               ogl.yield();\r
+\r
                CASPAR_ASSERT(params.pix_desc.planes.size() == params.textures.size());\r
 \r
                if(params.textures.empty() || !params.background)\r
@@ -204,6 +206,7 @@ struct image_kernel::implementation : boost::noncopyable
                \r
                // Set render target\r
                \r
+               ogl.yield();\r
                ogl.attach(*params.background);\r
                \r
                // Draw\r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 8d0c81d25d1f3ac72809961e2b318728413f544f..d1ca8c0295a97d0f420c87ef472398903f3f0778 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -99,8 +99,22 @@ public:
                graph_->set_color("frame-time", diagnostics::color(0.1f, 1.0f, 0.1f));\r
                graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f));   \r
                \r
-               for(int n = 0; n < 32 && muxer_.empty(); ++n)\r
-                       decode_frame(0);\r
+               // Do some pre-work in order to not block rendering thread for initialization and allocations.\r
+\r
+               push_packets();\r
+               auto video_frames = video_decoder_.poll();\r
+               if(!video_frames.empty())\r
+               {\r
+                       auto& video_frame = video_frames.front();\r
+                       auto  desc                = get_pixel_format_desc(static_cast<PixelFormat>(video_frame->format), video_frame->width, video_frame->height);\r
+                       if(desc.pix_fmt == core::pixel_format::invalid)\r
+                               get_pixel_format_desc(PIX_FMT_BGRA, video_frame->width, video_frame->height);\r
+                       \r
+                       for(int n = 0; n < 3; ++n)\r
+                               frame_factory->create_frame(this, desc);\r
+               }\r
+               BOOST_FOREACH(auto& video, video_frames)                        \r
+                       muxer_.push(video, 0);  \r
        }\r
                        \r
        virtual safe_ptr<core::basic_frame> receive(int hints)\r
@@ -132,7 +146,7 @@ public:
                return disable_audio(last_frame_);\r
        }\r
 \r
-       void decode_frame(int hints)\r
+       void push_packets()\r
        {\r
                for(int n = 0; n < 16 && ((!muxer_.video_ready() && !video_decoder_.ready()) || (!muxer_.audio_ready() && !audio_decoder_.ready())); ++n) \r
                {\r
@@ -143,6 +157,11 @@ public:
                                audio_decoder_.push(pkt);\r
                        }\r
                }\r
+       }\r
+\r
+       void decode_frame(int hints)\r
+       {\r
+               push_packets();\r
                \r
                tbb::parallel_invoke(\r
                [&]\r

diff --git a/modules/ffmpeg/producer/util.cpp b/modules/ffmpeg/producer/util.cpp
index 81148d6146884c8f00276366c316b40146d9911d..2a2595680536ea0097dcf1aa7c3a40291f229087 100644 (file)
--- a/modules/ffmpeg/producer/util.cpp
+++ b/modules/ffmpeg/producer/util.cpp
@@ -140,7 +140,7 @@ safe_ptr<core::write_frame> make_write_frame(const void* tag, const safe_ptr<AVF
        {\r
                auto pix_fmt = static_cast<PixelFormat>(decoded_frame->format);\r
 \r
-               auto write = frame_factory->create_frame(tag, desc.pix_fmt != core::pixel_format::invalid ? desc : get_pixel_format_desc(PIX_FMT_BGRA, width, height));\r
+               auto write = frame_factory->create_frame(tag, get_pixel_format_desc(PIX_FMT_BGRA, width, height));\r
                write->set_type(get_mode(*decoded_frame));\r
 \r
                std::shared_ptr<SwsContext> sws_context;\r