<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
<IntDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
<IntDir Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">$(ProjectDir)tmp\$(Configuration)\</IntDir>\r
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\;..\dependencies\boost_1_44_0\;..\dependencies\tbb\include\;..\dependencies\SFML-1.6\include;..\dependencies\GLee5_4;$(IncludePath)</IncludePath>\r
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\;..\dependencies\boost_1_44_0\;..\dependencies\tbb\include\;..\dependencies\SFML-1.6\include;..\dependencies\GLee5_4;$(IncludePath)</IncludePath>\r
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\;..\dependencies\boost_1_44_0\;..\dependencies\tbb\include\;..\dependencies\SFML-1.6\include;..\dependencies\glew-1.6.0\include;$(IncludePath)</IncludePath>\r
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\;..\dependencies\boost_1_44_0\;..\dependencies\tbb\include\;..\dependencies\SFML-1.6\include;..\dependencies\glew-1.6.0\include;$(IncludePath)</IncludePath>\r
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\;..\dependencies\boost_1_44_0\;..\dependencies\tbb\include\;..\dependencies\SFML-1.6\include;..\dependencies\glew-1.6.0\include;$(IncludePath)</IncludePath>\r
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\;..\dependencies\boost_1_44_0\;..\dependencies\tbb\include\;..\dependencies\SFML-1.6\include;..\dependencies\GLee5_4;$(IncludePath)</IncludePath>\r
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\dependencies\boost_1_44_0\stage\lib\;..\dependencies\ffmpeg 0.6\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\GLee5_4\;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\dependencies\boost_1_44_0\stage\lib\;..\dependencies\ffmpeg 0.6\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\GLee5_4\;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+ <IncludePath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\;..\dependencies\boost_1_44_0\;..\dependencies\tbb\include\;..\dependencies\SFML-1.6\include;..\dependencies\glew-1.6.0\include;$(IncludePath)</IncludePath>\r
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\dependencies\boost_1_44_0\stage\lib\;..\dependencies\ffmpeg 0.6\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\dependencies\boost_1_44_0\stage\lib\;..\dependencies\ffmpeg 0.6\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\dependencies\boost_1_44_0\stage\lib\;..\dependencies\ffmpeg 0.6\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\dependencies\boost_1_44_0\stage\lib\;..\dependencies\ffmpeg 0.6\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\GLee5_4\;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+ <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\dependencies\boost_1_44_0\stage\lib\;..\dependencies\ffmpeg 0.6\lib\;..\dependencies\FreeImage\Dist\;..\dependencies\glew-1.6.0\lib;..\dependencies\SFML-1.6\lib\;..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r
<OutDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(ProjectDir)bin\$(Configuration)\</OutDir>\r
source.unbind();\r
unbind();\r
fence_.set();\r
- GL(glFlush());\r
+ //GL(glFlush());\r
}\r
\r
void attach(int index)\r
return;\r
\r
if(!shader_)\r
+ {\r
shader_.reset(new shader(vertex_, fragment_));\r
-\r
- GL(glEnable(GL_TEXTURE_2D));\r
- GL(glEnable(GL_POLYGON_STIPPLE));\r
- \r
+ GL(glEnable(GL_TEXTURE_2D));\r
+ GL(glEnable(GL_SCISSOR_TEST));\r
+ }\r
+ \r
if(item.mode == core::video_mode::upper)\r
+ {\r
+ GL(glEnable(GL_POLYGON_STIPPLE));\r
glPolygonStipple(upper_pattern);\r
+ }\r
else if(item.mode == core::video_mode::lower)\r
+ {\r
+ GL(glEnable(GL_POLYGON_STIPPLE));\r
glPolygonStipple(lower_pattern);\r
+ }\r
else\r
GL(glDisable(GL_POLYGON_STIPPLE));\r
\r
double w = static_cast<double>(background->width());\r
double h = static_cast<double>(background->height());\r
\r
- GL(glEnable(GL_SCISSOR_TEST));\r
GL(glScissor(static_cast<size_t>(m_p[0]*w), static_cast<size_t>(m_p[1]*h), static_cast<size_t>(m_s[0]*w), static_cast<size_t>(m_s[1]*h)));\r
\r
auto f_p = item.transform.get_fill_translation();\r
glMultiTexCoord2d(GL_TEXTURE0, 1.0, 1.0); glMultiTexCoord2d(GL_TEXTURE1, (f_p[0]+f_s[0]), (f_p[1]+f_s[1])); glVertex2d((f_p[0]+f_s[0])*2.0-1.0, (f_p[1]+f_s[1])*2.0-1.0);\r
glMultiTexCoord2d(GL_TEXTURE0, 0.0, 1.0); glMultiTexCoord2d(GL_TEXTURE1, f_p[0] , (f_p[1]+f_s[1])); glVertex2d( f_p[0] *2.0-1.0, (f_p[1]+f_s[1])*2.0-1.0);\r
glEnd();\r
-\r
- GL(glDisable(GL_SCISSOR_TEST)); \r
- GL(glDisable(GL_POLYGON_STIPPLE));\r
}\r
};\r
\r
std::vector<image_transform> transform_stack_;\r
std::vector<video_mode::type> mode_stack_;\r
\r
- std::queue<std::deque<render_item>> layers_; // layer/stream/items\r
+ std::deque<std::deque<render_item>> layers_; // layer/stream/items\r
\r
image_kernel kernel_;\r
\r
std::array<std::shared_ptr<device_buffer>,2> draw_buffer_;\r
std::shared_ptr<device_buffer> write_buffer_;\r
\r
- std::array<std::shared_ptr<device_buffer>,2> stream_key_buffer_;\r
+ std::array<std::shared_ptr<device_buffer>,2> local_key_buffer_;\r
std::shared_ptr<device_buffer> layer_key_buffer_;\r
\r
public:\r
layer_key_buffer_ = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);\r
draw_buffer_[0] = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4);\r
draw_buffer_[1] = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 4);\r
- stream_key_buffer_[0] = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);\r
- stream_key_buffer_[1] = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);\r
+ local_key_buffer_[0] = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);\r
+ local_key_buffer_[1] = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, 1);\r
channel_.ogl().gc();\r
}\r
\r
\r
void begin_layer()\r
{\r
- layers_.push(layer());\r
+ layers_.push_back(layer());\r
}\r
\r
void end_layer()\r
boost::unique_future<safe_ptr<host_buffer>> render()\r
{ \r
auto layers = std::move(layers_);\r
-\r
- return channel_.ogl().begin_invoke([=]() mutable -> safe_ptr<host_buffer>\r
- { \r
- if(channel_.get_format_desc().width != write_buffer_->width() || channel_.get_format_desc().height != write_buffer_->height())\r
- initialize_buffers();\r
-\r
- return do_render(std::move(layers));\r
- });\r
+ return channel_.ogl().begin_invoke([=]()mutable{return render(std::move(layers));});\r
}\r
\r
- safe_ptr<host_buffer> do_render(std::queue<layer>&& layers)\r
+ safe_ptr<host_buffer> render(std::deque<layer>&& layers)\r
{\r
+ if(channel_.get_format_desc().width != write_buffer_->width() || channel_.get_format_desc().height != write_buffer_->height())\r
+ initialize_buffers();\r
+\r
auto read_buffer = channel_.ogl().create_host_buffer(channel_.get_format_desc().size, host_buffer::read_only);\r
\r
layer_key_buffer_->clear();\r
draw_buffer_[0]->clear();\r
draw_buffer_[1]->clear();\r
- stream_key_buffer_[0]->clear();\r
- stream_key_buffer_[1]->clear();\r
+ local_key_buffer_[0]->clear();\r
+ local_key_buffer_[1]->clear();\r
\r
bool local_key = false;\r
bool layer_key = false;\r
\r
- while(!layers.empty())\r
- { \r
- stream_key_buffer_[0]->clear();\r
-\r
- auto layer = std::move(layers.front());\r
- layers.pop();\r
- \r
- while(!layer.empty())\r
- {\r
- auto item = std::move(layer.front());\r
- layer.pop_front();\r
- \r
- if(item.transform.get_is_key())\r
- {\r
- render_item(stream_key_buffer_, std::move(item), nullptr, nullptr);\r
- local_key = true;\r
- }\r
- else\r
- {\r
- render_item(draw_buffer_, std::move(item), local_key ? stream_key_buffer_[0] : nullptr, layer_key ? layer_key_buffer_ : nullptr); \r
- stream_key_buffer_[0]->clear();\r
- local_key = false;\r
- }\r
- channel_.ogl().yield(); // Return resources to pool as early as possible.\r
- }\r
-\r
- layer_key = local_key;\r
- local_key = false;\r
- std::swap(stream_key_buffer_[0], layer_key_buffer_);\r
- }\r
+ BOOST_FOREACH(auto& layer, layers)\r
+ draw(std::move(layer), local_key, layer_key);\r
\r
std::swap(draw_buffer_[0], write_buffer_);\r
\r
\r
return read_buffer;\r
}\r
+\r
+ void draw(layer&& layer, bool& local_key, bool& layer_key)\r
+ { \r
+ local_key_buffer_[0]->clear();\r
+\r
+ BOOST_FOREACH(auto& item, layer)\r
+ draw(std::move(item), local_key, layer_key);\r
+ \r
+ layer_key = local_key;\r
+ local_key = false;\r
+ std::swap(local_key_buffer_[0], layer_key_buffer_);\r
+ }\r
+\r
+ void draw(render_item&& item, bool& local_key, bool& layer_key)\r
+ { \r
+ if(item.transform.get_is_key())\r
+ {\r
+ draw(local_key_buffer_, std::move(item), nullptr, nullptr);\r
+ local_key = true;\r
+ }\r
+ else\r
+ {\r
+ draw(draw_buffer_, std::move(item), local_key ? local_key_buffer_[0] : nullptr, layer_key ? layer_key_buffer_ : nullptr); \r
+ local_key_buffer_[0]->clear();\r
+ local_key = false;\r
+ }\r
+ channel_.ogl().yield(); // Return resources to pool as early as possible.\r
+ }\r
\r
- void render_item(std::array<std::shared_ptr<device_buffer>,2>& targets, render_item&& item, const std::shared_ptr<device_buffer>& local_key, const std::shared_ptr<device_buffer>& layer_key)\r
+ void draw(std::array<std::shared_ptr<device_buffer>,2>& targets, render_item&& item, const std::shared_ptr<device_buffer>& local_key, const std::shared_ptr<device_buffer>& layer_key)\r
{\r
if(!std::all_of(item.textures.begin(), item.textures.end(), std::mem_fn(&device_buffer::ready)))\r
{\r
targets[1]->attach();\r
\r
kernel_.draw(item, make_safe(targets[0]), local_key, layer_key);\r
+ item.textures.clear();\r
\r
targets[0]->bind();\r
\r
\r
// frame_producer\r
\r
- virtual safe_ptr<basic_frame> receive() { return frame_; } \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
struct empty_frame_producer : public frame_producer\r
{\r
- virtual safe_ptr<basic_frame> receive(){return basic_frame::empty();}\r
+ virtual safe_ptr<basic_frame> receive(int){return basic_frame::empty();}\r
virtual safe_ptr<basic_frame> last_frame() const{return basic_frame::empty();}\r
virtual void set_frame_factory(const safe_ptr<frame_factory>&){}\r
virtual std::wstring print() const { return L"empty";}\r
return producer;\r
} \r
\r
-safe_ptr<basic_frame> receive_and_follow(safe_ptr<frame_producer>& producer)\r
+safe_ptr<basic_frame> receive_and_follow(safe_ptr<frame_producer>& producer, int hints)\r
{ \r
if(producer == frame_producer::empty())\r
return basic_frame::eof();\r
auto frame = basic_frame::eof();\r
try\r
{\r
- frame = producer->receive();\r
+ frame = producer->receive(hints);\r
}\r
catch(...)\r
{\r
following->set_leading_producer(producer);\r
producer = std::move(following); \r
\r
- return receive_and_follow(producer);\r
+ return receive_and_follow(producer, hints);\r
}\r
return frame;\r
}\r
class frame_producer : boost::noncopyable\r
{\r
public:\r
+ enum hints\r
+ {\r
+ NO_HINT = 0,\r
+ ALPHA_HINT = 1\r
+ };\r
+\r
virtual ~frame_producer(){} \r
\r
virtual std::wstring print() const = 0; // nothrow\r
\r
virtual int64_t nb_frames() const {return 0;}\r
\r
- virtual safe_ptr<basic_frame> receive() = 0;\r
+ virtual safe_ptr<basic_frame> receive(int hints) = 0;\r
virtual safe_ptr<core::basic_frame> last_frame() const = 0;\r
\r
static const safe_ptr<frame_producer>& empty(); // nothrow\r
};\r
\r
-safe_ptr<basic_frame> receive_and_follow(safe_ptr<frame_producer>& producer);\r
+safe_ptr<basic_frame> receive_and_follow(safe_ptr<frame_producer>& producer, int hints);\r
\r
typedef std::function<safe_ptr<core::frame_producer>(const safe_ptr<frame_factory>&, const std::vector<std::wstring>&)> producer_factory_t;\r
void register_producer_factory(const producer_factory_t& factory); // Not thread-safe.\r
\r
const auto frames_left = foreground_->nb_frames() - (++frame_number_) - auto_play_delta_;\r
\r
- auto frame = receive_and_follow(foreground_);\r
+ auto frame = receive_and_follow(foreground_, frame_producer::NO_HINT);\r
if(frame == core::basic_frame::late())\r
return foreground_->last_frame();\r
\r
\r
// frame_producer\r
\r
- virtual safe_ptr<basic_frame> receive()\r
+ virtual safe_ptr<basic_frame> receive(int hints)\r
{\r
tbb::parallel_invoke\r
(\r
[&]\r
{\r
if(fill_ == core::basic_frame::late())\r
- fill_ = receive_and_follow(fill_producer_);\r
+ fill_ = receive_and_follow(fill_producer_, hints);\r
},\r
[&]\r
{\r
if(key_ == core::basic_frame::late())\r
- key_ = receive_and_follow(key_producer_);\r
+ key_ = receive_and_follow(key_producer_, hints | ALPHA_HINT);\r
}\r
);\r
\r
destroy_context_.begin_invoke(std::bind(&destroy_producer, std::move(producer_)));\r
}\r
\r
- virtual safe_ptr<basic_frame> receive() {return producer_->receive();}\r
+ virtual safe_ptr<basic_frame> receive(int hints) {return producer_->receive(hints);}\r
virtual safe_ptr<basic_frame> last_frame() const {return producer_->last_frame();}\r
virtual std::wstring print() const {return producer_->print();}\r
virtual void param(const std::wstring& str) {producer_->param(str);}\r
org_source_producer_ = producer;\r
}\r
\r
- virtual safe_ptr<basic_frame> receive()\r
+ virtual safe_ptr<basic_frame> receive(int hints)\r
{\r
if(current_frame_++ >= info_.duration)\r
return basic_frame::eof();\r
(\r
[&]\r
{\r
- dest = receive_and_follow(dest_producer_);\r
+ dest = receive_and_follow(dest_producer_, hints);\r
if(dest == core::basic_frame::late())\r
dest = dest_producer_->last_frame();\r
},\r
[&]\r
{\r
- source = receive_and_follow(source_producer_);\r
+ source = receive_and_follow(source_producer_, hints);\r
if(source == core::basic_frame::late())\r
source = source_producer_->last_frame();\r
}\r
context_.reset([&]{return new decklink_producer(format_desc, device_index, frame_factory, filter_str);}); \r
}\r
\r
- virtual safe_ptr<core::basic_frame> receive()\r
+ virtual safe_ptr<core::basic_frame> receive(int)\r
{\r
auto frame = context_->get_frame();\r
if(frame != core::basic_frame::late())\r
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
</ClCompile>\r
+ <ClCompile Include="producer\util.cpp">\r
+ <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
+ <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
+ </ClCompile>\r
<ClCompile Include="producer\video\video_decoder.cpp">\r
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
<ClCompile Include="producer\filter\parallel_yadif.cpp">\r
<Filter>source\producer\filter</Filter>\r
</ClCompile>\r
+ <ClCompile Include="producer\util.cpp">\r
+ <Filter>source\producer</Filter>\r
+ </ClCompile>\r
</ItemGroup>\r
<ItemGroup>\r
<ClInclude Include="producer\ffmpeg_producer.h">\r
\r
#include "frame_muxer.h"\r
#include "input.h"\r
+#include "util.h"\r
#include "audio/audio_decoder.h"\r
#include "video/video_decoder.h"\r
\r
graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f)); \r
\r
for(int n = 0; n < 128 && muxer_.size() < 2; ++n)\r
- decode_frame();\r
+ decode_frame(0);\r
}\r
\r
~ffmpeg_producer()\r
tasks_.wait();\r
}\r
\r
- virtual safe_ptr<core::basic_frame> receive()\r
+ virtual safe_ptr<core::basic_frame> receive(int hints)\r
{\r
tasks_.wait();\r
\r
}\r
}\r
\r
- tasks_.run([this]\r
+ tasks_.run([=]\r
{\r
frame_timer_.restart();\r
\r
for(int n = 0; n < 64 && muxer_.size() < 2; ++n)\r
- decode_frame();\r
+ decode_frame(hints);\r
\r
graph_->update_value("frame-time", static_cast<float>(frame_timer_.elapsed()*format_desc_.fps*0.5));\r
});\r
return disable_audio(last_frame_);\r
}\r
\r
- void decode_frame()\r
+ void decode_frame(int hints)\r
{\r
for(int n = 0; n < 32 && ((!muxer_.video_ready() && !video_decoder_.ready()) || (!muxer_.audio_ready() && !audio_decoder_.ready())); ++n) \r
{\r
BOOST_FOREACH(auto& audio, audio_samples)\r
muxer_.push(audio);\r
\r
- BOOST_FOREACH(auto& video, video_frames)\r
- muxer_.push(video); \r
+ BOOST_FOREACH(auto& video, video_frames) \r
+ muxer_.push(video, hints); \r
}\r
\r
virtual int64_t nb_frames() const\r
\r
#include "util.h"\r
\r
+#include <core/producer/frame_producer.h>\r
#include <core/producer/frame/basic_frame.h>\r
#include <core/producer/frame/image_transform.h>\r
#include <core/producer/frame/pixel_format.h>\r
{\r
}\r
\r
- void push(const std::shared_ptr<AVFrame>& video_frame)\r
+ void push(const std::shared_ptr<AVFrame>& video_frame, int hints)\r
{ \r
if(!video_frame)\r
{ \r
put_frames(frame_buffer_);\r
return;\r
}\r
- \r
+\r
if(display_mode_ == display_mode::invalid)\r
{\r
if(auto_mode_)\r
\r
CASPAR_LOG(info) << "frame_muxer: " << display_mode::print(display_mode_);\r
}\r
- \r
+ \r
+ if(hints & core::frame_producer::ALPHA_HINT)\r
+ try_make_gray(make_safe(video_frame));\r
+\r
BOOST_FOREACH(auto& av_frame, filter_.execute(video_frame))\r
{\r
- auto frame = make_write_frame(this, av_frame, frame_factory_);\r
+ auto frame = make_write_frame(this, av_frame, frame_factory_, hints);\r
\r
// Fix field-order if needed\r
if(frame->get_type() == core::video_mode::lower && format_desc_.mode == core::video_mode::upper)\r
\r
frame_muxer::frame_muxer(double in_fps, const safe_ptr<core::frame_factory>& frame_factory)\r
: impl_(new implementation(in_fps, frame_factory)){}\r
-void frame_muxer::push(const std::shared_ptr<AVFrame>& video_frame){impl_->push(video_frame);}\r
+void frame_muxer::push(const std::shared_ptr<AVFrame>& video_frame, int hints){impl_->push(video_frame, hints);}\r
void frame_muxer::push(const std::shared_ptr<std::vector<int16_t>>& audio_samples){return impl_->push(audio_samples);}\r
safe_ptr<basic_frame> frame_muxer::pop(){return impl_->pop();}\r
size_t frame_muxer::size() const {return impl_->size();}\r
public:\r
frame_muxer(double in_fps, const safe_ptr<core::frame_factory>& frame_factory);\r
\r
- void push(const std::shared_ptr<AVFrame>& video_frame);\r
+ void push(const std::shared_ptr<AVFrame>& video_frame, int hints = 0);\r
void push(const std::shared_ptr<std::vector<int16_t>>& audio_samples);\r
\r
bool video_ready() const;\r
#pragma once\r
\r
-#include <tbb/concurrent_unordered_map.h>\r
-#include <tbb/concurrent_queue.h>\r
+#include <common/memory/safe_ptr.h>\r
\r
+#include <core/video_format.h>\r
#include <core/producer/frame/pixel_format.h>\r
-#include <core/producer/frame/image_transform.h>\r
-#include <core/producer/frame/frame_factory.h>\r
-#include <core/mixer/write_frame.h>\r
\r
-#include <common/memory/memcpy.h>\r
-\r
-#if defined(_MSC_VER)\r
-#pragma warning (push)\r
-#pragma warning (disable : 4244)\r
-#endif\r
-extern "C" \r
-{\r
- #include <libswscale/swscale.h>\r
- #include <libavcodec/avcodec.h>\r
- #include <libavfilter/avfilter.h>\r
-}\r
-#if defined(_MSC_VER)\r
-#pragma warning (pop)\r
-#endif\r
+struct AVFrame;\r
+enum PixelFormat;\r
\r
namespace caspar {\r
\r
-static core::video_mode::type get_mode(AVFrame& frame)\r
-{\r
- if(!frame.interlaced_frame)\r
- return core::video_mode::progressive;\r
+namespace core {\r
\r
- return frame.top_field_first ? core::video_mode::upper : core::video_mode::lower;\r
-}\r
+struct pixel_format_desc;\r
+class write_frame;\r
+struct frame_factory;\r
\r
-static core::pixel_format::type get_pixel_format(PixelFormat pix_fmt)\r
-{\r
- switch(pix_fmt)\r
- {\r
- case PIX_FMT_GRAY8: return core::pixel_format::gray;\r
- case PIX_FMT_BGRA: return core::pixel_format::bgra;\r
- case PIX_FMT_ARGB: return core::pixel_format::argb;\r
- case PIX_FMT_RGBA: return core::pixel_format::rgba;\r
- case PIX_FMT_ABGR: return core::pixel_format::abgr;\r
- case PIX_FMT_YUV444P: return core::pixel_format::ycbcr;\r
- case PIX_FMT_YUV422P: return core::pixel_format::ycbcr;\r
- case PIX_FMT_YUV420P: return core::pixel_format::ycbcr;\r
- case PIX_FMT_YUV411P: return core::pixel_format::ycbcr;\r
- case PIX_FMT_YUV410P: return core::pixel_format::ycbcr;\r
- case PIX_FMT_YUVA420P: return core::pixel_format::ycbcra;\r
- default: return core::pixel_format::invalid;\r
- }\r
}\r
\r
-static PixelFormat get_ffmpeg_pixel_format(const core::pixel_format_desc& format_desc)\r
-{\r
- switch(format_desc.pix_fmt)\r
- {\r
- case core::pixel_format::gray: return PIX_FMT_GRAY8;\r
- case core::pixel_format::bgra: return PIX_FMT_BGRA;\r
- case core::pixel_format::argb: return PIX_FMT_ARGB;\r
- case core::pixel_format::rgba: return PIX_FMT_RGBA;\r
- case core::pixel_format::abgr: return PIX_FMT_ABGR;\r
- case core::pixel_format::ycbcra: return PIX_FMT_YUVA420P;\r
- case core::pixel_format::ycbcr:\r
- auto planes = format_desc.planes;\r
- if(planes[0].height == planes[1].height)\r
- {\r
- if(planes[0].width == planes[1].width)\r
- return PIX_FMT_YUV444P;\r
- else if(planes[0].width/2 == planes[1].width)\r
- return PIX_FMT_YUV422P;\r
- else if(planes[0].width/4 == planes[1].width)\r
- return PIX_FMT_YUV411P;\r
- }\r
- if(planes[0].height/2 == planes[1].height)\r
- {\r
- if(planes[0].width/2 == planes[1].width)\r
- return PIX_FMT_YUV420P;\r
- }\r
- if(planes[0].height/4 == planes[1].height)\r
- {\r
- if(planes[0].width/4 == planes[1].width)\r
- return PIX_FMT_YUV410P;\r
- }\r
- }\r
- return PIX_FMT_NONE;\r
-}\r
-\r
-static safe_ptr<AVFrame> as_av_frame(const safe_ptr<core::write_frame>& frame)\r
-{\r
- auto desc = frame->get_pixel_format_desc();\r
- safe_ptr<AVFrame> av_frame(avcodec_alloc_frame(), av_free); \r
- avcodec_get_frame_defaults(av_frame.get());\r
-\r
- for(size_t n = 0; n < desc.planes.size(); ++n)\r
- { \r
- av_frame->data[n] = frame->image_data(n).begin();\r
- av_frame->linesize[n] = desc.planes[n].width;\r
- }\r
-\r
- av_frame->format = get_ffmpeg_pixel_format(desc);\r
- av_frame->width = desc.planes[0].width;\r
- av_frame->height = desc.planes[0].height;\r
-\r
- if(frame->get_type() != core::video_mode::progressive)\r
- {\r
- av_frame->interlaced_frame = 1;\r
- av_frame->top_field_first = frame->get_type() == core::video_mode::upper ? 1 : 0;\r
- }\r
-\r
- return av_frame;\r
-}\r
-\r
-static core::pixel_format_desc get_pixel_format_desc(PixelFormat pix_fmt, size_t width, size_t height)\r
-{\r
- // Get linesizes\r
- AVPicture dummy_pict; \r
- avpicture_fill(&dummy_pict, nullptr, pix_fmt, width, height);\r
-\r
- core::pixel_format_desc desc;\r
- desc.pix_fmt = get_pixel_format(pix_fmt);\r
- \r
- switch(desc.pix_fmt)\r
- {\r
- case core::pixel_format::gray:\r
- {\r
- desc.planes.push_back(core::pixel_format_desc::plane(dummy_pict.linesize[0]/4, height, 1)); \r
- return desc;\r
- }\r
- case core::pixel_format::bgra:\r
- case core::pixel_format::argb:\r
- case core::pixel_format::rgba:\r
- case core::pixel_format::abgr:\r
- {\r
- desc.planes.push_back(core::pixel_format_desc::plane(dummy_pict.linesize[0]/4, height, 4)); \r
- return desc;\r
- }\r
- case core::pixel_format::ycbcr:\r
- case core::pixel_format::ycbcra:\r
- { \r
- // Find chroma height\r
- size_t size2 = dummy_pict.data[2] - dummy_pict.data[1];\r
- size_t h2 = size2/dummy_pict.linesize[1]; \r
-\r
- desc.planes.push_back(core::pixel_format_desc::plane(dummy_pict.linesize[0], height, 1));\r
- desc.planes.push_back(core::pixel_format_desc::plane(dummy_pict.linesize[1], h2, 1));\r
- desc.planes.push_back(core::pixel_format_desc::plane(dummy_pict.linesize[2], h2, 1));\r
-\r
- if(desc.pix_fmt == core::pixel_format::ycbcra) \r
- desc.planes.push_back(core::pixel_format_desc::plane(dummy_pict.linesize[3], height, 1)); \r
- return desc;\r
- } \r
- default: \r
- desc.pix_fmt = core::pixel_format::invalid;\r
- return desc;\r
- }\r
-}\r
-\r
-static safe_ptr<core::write_frame> make_write_frame(const void* tag, const safe_ptr<AVFrame>& decoded_frame, const safe_ptr<core::frame_factory>& frame_factory)\r
-{ \r
- static tbb::concurrent_unordered_map<size_t, tbb::concurrent_queue<std::shared_ptr<SwsContext>>> sws_contexts_;\r
-\r
- auto width = decoded_frame->width;\r
- auto height = decoded_frame->height;\r
- auto pix_fmt = static_cast<PixelFormat>(decoded_frame->format);\r
- auto desc = get_pixel_format_desc(pix_fmt, width, height);\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
- if(decoded_frame->interlaced_frame)\r
- write->set_type(decoded_frame->top_field_first ? core::video_mode::upper : core::video_mode::lower);\r
- else\r
- write->set_type(core::video_mode::progressive);\r
-\r
- if(desc.pix_fmt == core::pixel_format::invalid)\r
- {\r
- std::shared_ptr<SwsContext> sws_context;\r
-\r
- //CASPAR_LOG(warning) << "Hardware accelerated color transform not supported.";\r
-\r
- size_t key = width << 20 | height << 8 | pix_fmt;\r
- \r
- auto& pool = sws_contexts_[key];\r
- \r
- if(!pool.try_pop(sws_context))\r
- {\r
- double param;\r
- sws_context.reset(sws_getContext(width, height, pix_fmt, width, height, PIX_FMT_BGRA, SWS_BILINEAR, nullptr, nullptr, ¶m), sws_freeContext);\r
- }\r
- \r
- if(!sws_context)\r
- {\r
- BOOST_THROW_EXCEPTION(operation_failed() << msg_info("Could not create software scaling context.") << \r
- boost::errinfo_api_function("sws_getContext"));\r
- } \r
-\r
- // Use sws_scale when provided colorspace has no hw-accel.\r
- safe_ptr<AVFrame> av_frame(avcodec_alloc_frame(), av_free); \r
- avcodec_get_frame_defaults(av_frame.get()); \r
- avpicture_fill(reinterpret_cast<AVPicture*>(av_frame.get()), write->image_data().begin(), PIX_FMT_BGRA, width, height);\r
- \r
- sws_scale(sws_context.get(), decoded_frame->data, decoded_frame->linesize, 0, height, av_frame->data, av_frame->linesize); \r
- pool.push(sws_context);\r
-\r
- write->commit();\r
- }\r
- else\r
- {\r
- tbb::parallel_for(0, static_cast<int>(desc.planes.size()), 1, [&](int n)\r
- {\r
- auto plane = desc.planes[n];\r
- auto result = write->image_data(n).begin();\r
- auto decoded = decoded_frame->data[n];\r
- auto decoded_linesize = decoded_frame->linesize[n];\r
- \r
- // Copy line by line since ffmpeg sometimes pads each line.\r
- tbb::parallel_for(tbb::blocked_range<size_t>(0, static_cast<int>(desc.planes[n].height)), [&](const tbb::blocked_range<size_t>& r)\r
- {\r
- for(size_t y = r.begin(); y != r.end(); ++y)\r
- fast_memcpy(result + y*plane.linesize, decoded + y*decoded_linesize, plane.linesize);\r
- });\r
-\r
- write->commit(n);\r
- });\r
- }\r
-\r
- return write;\r
-}\r
+core::video_mode::type get_mode(AVFrame& frame);\r
+core::pixel_format::type get_pixel_format(PixelFormat pix_fmt);\r
+core::pixel_format_desc get_pixel_format_desc(PixelFormat pix_fmt, size_t width, size_t height);\r
+PixelFormat get_ffmpeg_pixel_format(const core::pixel_format_desc& format_desc);\r
+safe_ptr<AVFrame> as_av_frame(const safe_ptr<core::write_frame>& frame);\r
+bool try_make_gray(const safe_ptr<AVFrame>& frame);\r
+safe_ptr<core::write_frame> make_write_frame(const void* tag, const safe_ptr<AVFrame>& decoded_frame, const safe_ptr<core::frame_factory>& frame_factory, int hints);\r
\r
}
\ No newline at end of file
flash_producer_->param(str);\r
}\r
\r
- virtual safe_ptr<core::basic_frame> receive()\r
+ virtual safe_ptr<core::basic_frame> receive(int hints)\r
{\r
- return flash_producer_->receive();\r
+ return flash_producer_->receive(hints);\r
}\r
\r
virtual safe_ptr<core::basic_frame> last_frame() const\r
\r
cg_producer::cg_producer(const safe_ptr<core::frame_producer>& frame_producer) : impl_(new implementation(frame_producer)){}\r
cg_producer::cg_producer(cg_producer&& other) : impl_(std::move(other.impl_)){}\r
-safe_ptr<core::basic_frame> cg_producer::receive(){return impl_->receive();}\r
+safe_ptr<core::basic_frame> cg_producer::receive(int hints){return impl_->receive(hints);}\r
safe_ptr<core::basic_frame> cg_producer::last_frame() const{return impl_->last_frame();}\r
void cg_producer::add(int layer, const std::wstring& template_name, bool play_on_load, const std::wstring& startFromLabel, const std::wstring& data){impl_->add(layer, template_name, play_on_load, startFromLabel, data);}\r
void cg_producer::remove(int layer){impl_->remove(layer);}\r
cg_producer(cg_producer&& other);\r
\r
// frame_producer\r
- virtual safe_ptr<core::basic_frame> receive();\r
+ virtual safe_ptr<core::basic_frame> receive(int);\r
virtual safe_ptr<core::basic_frame> last_frame() const;\r
virtual std::wstring print() const;\r
\r
\r
// frame_producer\r
\r
- virtual safe_ptr<core::basic_frame> receive()\r
+ virtual safe_ptr<core::basic_frame> receive(int)\r
{ \r
graph_->set_value("output-buffer", static_cast<float>(frame_buffer_.size())/static_cast<float>(frame_buffer_.capacity()));\r
\r
\r
// frame_producer\r
\r
- virtual safe_ptr<core::basic_frame> receive(){return frame_;}\r
+ virtual safe_ptr<core::basic_frame> receive(int){return frame_;}\r
\r
virtual safe_ptr<core::basic_frame> last_frame() const\r
{\r
\r
// frame_producer\r
\r
- virtual safe_ptr<core::basic_frame> receive()\r
+ virtual safe_ptr<core::basic_frame> receive(int)\r
{ \r
delta_ += speed_;\r
\r
projects / casparcg / commitdiff