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
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
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
});\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
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
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
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