*/\r
\r
#define NOMINMAX\r
+#define WIN32_LEAN_AND_MEAN\r
\r
#include <windows.h>\r
-#include <Glee.h>\r
+#include <GL/glew.h>\r
#include <SFML/Window.hpp>\r
\r
#include "ogl_consumer.h"\r
\r
-#include <core/video_format.h>\r
-#include <core/consumer/frame/read_frame.h>\r
-\r
#include <common/gl/gl_check.h>\r
#include <common/concurrency/executor.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
\r
-#include <boost/thread.hpp>\r
+#include <core/video_format.h>\r
+#include <core/mixer/read_frame.h>\r
+#include <core/consumer/frame_consumer.h>\r
+\r
+#include <boost/timer.hpp>\r
+#include <boost/circular_buffer.hpp>\r
\r
#include <algorithm>\r
#include <array>\r
\r
namespace caspar {\r
+ \r
+enum stretch\r
+{\r
+ none,\r
+ uniform,\r
+ fill,\r
+ uniform_to_fill\r
+};\r
\r
-struct ogl_consumer::implementation : boost::noncopyable\r
+struct ogl_consumer : boost::noncopyable\r
{ \r
- timer clock_;\r
- printer parent_printer_;\r
- boost::unique_future<void> active_;\r
+ float width_;\r
+ float height_;\r
\r
- float wratio_;\r
- float hratio_;\r
- \r
- float wSize_;\r
- float hSize_;\r
-\r
- GLuint texture_;\r
- std::array<GLuint, 2> pbos_;\r
-\r
- const bool windowed_;\r
- unsigned int screen_width_;\r
- unsigned int screen_height_;\r
- unsigned int screen_x_;\r
- unsigned int screen_y_;\r
- const unsigned int screen_index_;\r
+ GLuint texture_;\r
+ std::array<GLuint, 2> pbos_;\r
+\r
+ const bool windowed_;\r
+ unsigned int screen_width_;\r
+ unsigned int screen_height_;\r
+ const unsigned int screen_index_;\r
\r
- const stretch stretch_;\r
+ const stretch stretch_;\r
core::video_format_desc format_desc_;\r
\r
- sf::Window window_;\r
+ sf::Window window_;\r
\r
safe_ptr<diagnostics::graph> graph_;\r
- timer perf_timer_;\r
+ boost::timer perf_timer_;\r
\r
- executor executor_;\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
public:\r
- implementation(unsigned int screen_index, stretch stretch, bool windowed) \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
, texture_(0)\r
- , screen_x_(0)\r
- , screen_y_(0)\r
, screen_index_(screen_index)\r
+ , format_desc_(format_desc_)\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
- }\r
-\r
- ~implementation()\r
- {\r
- CASPAR_LOG(info) << print() << L" Shutting down."; \r
- }\r
-\r
- void initialize(const core::video_format_desc& format_desc, const printer& parent_printer)\r
- {\r
- if(!GLEE_VERSION_2_1)\r
- BOOST_THROW_EXCEPTION(not_supported() << msg_info("Missing OpenGL 2.1 support."));\r
+ graph_->set_color("dropped-frame", diagnostics::color(0.3f, 0.6f, 0.3f));\r
\r
format_desc_ = format_desc;\r
- parent_printer_ = parent_printer;\r
+\r
+ square_width_ = format_desc_.width;\r
+ square_height_ = format_desc_.height;\r
+ \r
+ if(format_desc_.format == core::video_format::pal)\r
+ {\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
+ }\r
\r
screen_width_ = format_desc.width;\r
screen_height_ = format_desc.height;\r
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_ ? format_desc_.width : devmode.dmPelsWidth;\r
- screen_height_ = windowed_ ? format_desc_.height : devmode.dmPelsHeight;\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
#else\r
if(!windowed)\r
BOOST_THROW_EXCEPTION(not_supported() << msg_info(narrow(print() + " doesn't support non-Win32 fullscreen"));\r
if(screen_index != 0)\r
CASPAR_LOG(warning) << print() << " only supports screen_index=0 for non-Win32";\r
#endif \r
- executor_.start();\r
executor_.invoke([=]\r
{\r
- window_.Create(sf::VideoMode(format_desc_.width, format_desc_.height, 32), narrow(print()), windowed_ ? sf::Style::Titlebar : sf::Style::Fullscreen);\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_.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(glViewport(0, 0, format_desc_.width, format_desc_.height));\r
glLoadIdentity();\r
\r
- wratio_ = static_cast<float>(format_desc_.width)/static_cast<float>(format_desc_.width);\r
- hratio_ = static_cast<float>(format_desc_.height)/static_cast<float>(format_desc_.height);\r
-\r
- std::pair<float, float> target_ratio = None();\r
- if(stretch_ == fill)\r
- target_ratio = Fill();\r
- else if(stretch_ == uniform)\r
- target_ratio = Uniform();\r
- else if(stretch_ == uniform_to_fill)\r
- target_ratio = UniformToFill();\r
-\r
- wSize_ = target_ratio.first;\r
- hSize_ = target_ratio.second;\r
+ calculate_aspect();\r
\r
glGenTextures(1, &texture_);\r
glBindTexture(GL_TEXTURE_2D, texture_);\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
- active_ = executor_.begin_invoke([]{});\r
- CASPAR_LOG(info) << print() << " Sucessfully initialized.";\r
+ CASPAR_LOG(info) << print() << " Sucessfully Initialized.";\r
+\r
+ executor_.begin_invoke([this]{tick();});\r
+ }\r
+\r
+ ~ogl_consumer()\r
+ {\r
+ executor_.stop();\r
+ frame_buffer_.push(make_safe<core::read_frame>());\r
+ }\r
+ \r
+ const core::video_format_desc& get_video_format_desc() const\r
+ {\r
+ return format_desc_;\r
+ }\r
+\r
+ void calculate_aspect()\r
+ {\r
+ if(windowed_)\r
+ {\r
+ screen_height_ = window_.GetHeight();\r
+ screen_width_ = window_.GetWidth();\r
+ }\r
+ \r
+ GL(glViewport(0, 0, screen_width_, screen_height_));\r
+\r
+ std::pair<float, float> target_ratio = None();\r
+ if(stretch_ == fill)\r
+ target_ratio = Fill();\r
+ else if(stretch_ == uniform)\r
+ target_ratio = Uniform();\r
+ else if(stretch_ == uniform_to_fill)\r
+ target_ratio = UniformToFill();\r
+\r
+ width_ = target_ratio.first;\r
+ height_ = target_ratio.second;\r
}\r
\r
std::pair<float, float> None()\r
{\r
- float width = static_cast<float>(format_desc_.width)/static_cast<float>(screen_width_);\r
- float height = static_cast<float>(format_desc_.height)/static_cast<float>(screen_height_);\r
+ float width = static_cast<float>(square_width_)/static_cast<float>(screen_width_);\r
+ float height = static_cast<float>(square_height_)/static_cast<float>(screen_height_);\r
\r
return std::make_pair(width, height);\r
}\r
\r
std::pair<float, float> Uniform()\r
{\r
- float aspect = static_cast<float>(format_desc_.width)/static_cast<float>(format_desc_.height);\r
+ float aspect = static_cast<float>(square_width_)/static_cast<float>(square_height_);\r
float width = std::min(1.0f, static_cast<float>(screen_height_)*aspect/static_cast<float>(screen_width_));\r
float height = static_cast<float>(screen_width_*width)/static_cast<float>(screen_height_*aspect);\r
\r
\r
std::pair<float, float> UniformToFill()\r
{\r
- float wr = static_cast<float>(format_desc_.width)/static_cast<float>(screen_width_);\r
- float hr = static_cast<float>(format_desc_.height)/static_cast<float>(screen_height_);\r
+ float wr = static_cast<float>(square_width_)/static_cast<float>(screen_width_);\r
+ float hr = static_cast<float>(square_height_)/static_cast<float>(screen_height_);\r
float r_inv = 1.0f/std::min(wr, hr);\r
\r
float width = wr*r_inv;\r
return std::make_pair(width, height);\r
}\r
\r
- void render(const safe_ptr<const core::read_frame>& frame)\r
+ void render(const safe_ptr<core::read_frame>& frame)\r
{ \r
glBindTexture(GL_TEXTURE_2D, texture_);\r
- glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pbos_[0]);\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
-\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
- std::copy(frame->image_data().begin(), frame->image_data().end(), reinterpret_cast<char*>(ptr));\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
\r
GL(glClear(GL_COLOR_BUFFER_BIT)); \r
glBegin(GL_QUADS);\r
- glTexCoord2f(0.0f, hratio_); glVertex2f(-wSize_, -hSize_);\r
- glTexCoord2f(wratio_, hratio_); glVertex2f( wSize_, -hSize_);\r
- glTexCoord2f(wratio_, 0.0f); glVertex2f( wSize_, hSize_);\r
- glTexCoord2f(0.0f, 0.0f); glVertex2f(-wSize_, hSize_);\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
- clock_.tick(1.0/format_desc_.fps);\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
- void send(const safe_ptr<const core::read_frame>& frame)\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
- active_.get();\r
- active_ = executor_.begin_invoke([=]\r
+ try\r
{\r
- perf_timer_.reset();\r
+ perf_timer_.restart();\r
sf::Event e;\r
- while(window_.GetEvent(e)){}\r
- render(frame);\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_.interval*0.5));\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
+ }\r
+ executor_.begin_invoke([=]{tick();});\r
}\r
+};\r
\r
- std::wstring print() const\r
+\r
+struct ogl_consumer_proxy : public core::frame_consumer\r
+{\r
+ size_t screen_index_;\r
+ caspar::stretch stretch_;\r
+ bool windowed_;\r
+ bool key_only_;\r
+\r
+ std::unique_ptr<ogl_consumer> consumer_;\r
+\r
+public:\r
+\r
+ ogl_consumer_proxy(size_t screen_index, stretch stretch, bool windowed, bool key_only)\r
+ : screen_index_(screen_index)\r
+ , stretch_(stretch)\r
+ , windowed_(windowed)\r
+ , key_only_(key_only){}\r
+ \r
+ virtual void initialize(const core::video_format_desc& format_desc)\r
{\r
- return (parent_printer_ ? parent_printer_() + L"/" : L"") + L"ogl[" + boost::lexical_cast<std::wstring>(screen_index_) + L"]";\r
+ consumer_.reset(new ogl_consumer(screen_index_, stretch_, windowed_, format_desc));\r
+ }\r
+ \r
+ virtual bool send(const safe_ptr<core::read_frame>& frame)\r
+ {\r
+ consumer_->send(frame);\r
+ return true;\r
+ }\r
+ \r
+ virtual std::wstring print() const\r
+ {\r
+ return consumer_->print();\r
}\r
\r
- size_t buffer_depth() const{return 2;}\r
-};\r
+ virtual bool key_only() const\r
+ {\r
+ return key_only_;\r
+ }\r
+\r
+ virtual bool has_synchronization_clock() const \r
+ {\r
+ return false;\r
+ }\r
\r
-ogl_consumer::ogl_consumer(ogl_consumer&& other) : impl_(std::move(other.impl_)){}\r
-ogl_consumer::ogl_consumer(unsigned int screen_index, stretch stretch, bool windowed) : impl_(new implementation(screen_index, stretch, windowed)){}\r
-void ogl_consumer::send(const safe_ptr<const core::read_frame>& frame){impl_->send(frame);}\r
-size_t ogl_consumer::buffer_depth() const{return impl_->buffer_depth();}\r
-void ogl_consumer::initialize(const core::video_format_desc& format_desc, const printer& parent_printer){impl_->initialize(format_desc, parent_printer);}\r
-std::wstring ogl_consumer::print() const {return impl_->print();}\r
+ virtual const core::video_format_desc& get_video_format_desc() const\r
+ {\r
+ return consumer_->get_video_format_desc();\r
+ }\r
+}; \r
\r
safe_ptr<core::frame_consumer> create_ogl_consumer(const std::vector<std::wstring>& params)\r
{\r
- if(params.size() < 1 || params[0] != L"OGL")\r
+ if(params.size() < 1 || params[0] != L"SCREEN")\r
return core::frame_consumer::empty();\r
\r
- unsigned int screen_index = 0;\r
+ size_t screen_index = 0;\r
stretch stretch = stretch::fill;\r
bool windowed = true;\r
\r
if(params.size() > 2) \r
windowed = lexical_cast_or_default<bool>(params[3], windowed);\r
\r
- return make_safe<ogl_consumer>(screen_index, stretch, windowed);\r
+ bool key_only = std::find(params.begin(), params.end(), L"KEY_ONLY") != params.end();\r
+\r
+ return make_safe<ogl_consumer_proxy>(screen_index, stretch, windowed, key_only);\r
+}\r
+\r
+safe_ptr<core::frame_consumer> create_ogl_consumer(const boost::property_tree::ptree& ptree) \r
+{\r
+ size_t screen_index = ptree.get("device", 0);\r
+ bool windowed =ptree.get("windowed", true);\r
+ \r
+ stretch stretch = stretch::fill;\r
+ auto key_str = ptree.get("stretch", "default");\r
+ if(key_str == "uniform")\r
+ stretch = stretch::uniform;\r
+ else if(key_str == "uniform_to_fill")\r
+ stretch = stretch::uniform_to_fill;\r
+\r
+ bool key_only = ptree.get("key-only", false);\r
+\r
+ return make_safe<ogl_consumer_proxy>(screen_index, stretch, windowed, key_only);\r
}\r
\r
}
\ No newline at end of file
projects / casparcg / blobdiff