\r
#include "ffmpeg_producer.h"\r
\r
+#include "frame_muxer.h"\r
#include "input.h"\r
#include "audio/audio_decoder.h"\r
#include "video/video_decoder.h"\r
\r
+#include <common/utility/assert.h>\r
#include <common/utility/timer.h>\r
#include <common/diagnostics/graph.h>\r
\r
-#include <core/producer/frame/basic_frame.h>\r
#include <core/mixer/write_frame.h>\r
-#include <core/producer/frame/audio_transform.h>\r
#include <core/video_format.h>\r
+#include <core/producer/frame/audio_transform.h>\r
+#include <core/producer/frame/basic_frame.h>\r
+#include <core/producer/color/color_producer.h>\r
\r
#include <common/env.h>\r
\r
-#include <tbb/parallel_invoke.h>\r
-\r
#include <boost/timer.hpp>\r
#include <boost/range/algorithm.hpp>\r
#include <boost/range/algorithm_ext.hpp>\r
\r
+#include <tbb/task_group.h>\r
+\r
#include <deque>\r
+#include <vector>\r
\r
namespace caspar {\r
- \r
+ \r
struct ffmpeg_producer : public core::frame_producer\r
{\r
- const std::wstring filename_;\r
+ const std::wstring filename_;\r
\r
- const safe_ptr<diagnostics::graph> graph_;\r
- boost::timer frame_timer_;\r
+ const safe_ptr<diagnostics::graph> graph_;\r
+ boost::timer frame_timer_;\r
\r
- const safe_ptr<core::frame_factory> frame_factory_;\r
+ const safe_ptr<core::frame_factory> frame_factory_;\r
+ const core::video_format_desc format_desc_;\r
+\r
+ input input_; \r
+ video_decoder video_decoder_;\r
+ audio_decoder audio_decoder_;\r
+\r
+ std::queue<safe_ptr<core::basic_frame>> output_buffer_;\r
+\r
+ frame_muxer muxer_;\r
+ \r
+ tbb::task_group tasks_;\r
\r
- input input_; \r
- std::unique_ptr<video_decoder> video_decoder_;\r
- std::unique_ptr<audio_decoder> audio_decoder_;\r
public:\r
- explicit ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filename, bool loop, int start, int length) \r
+ explicit ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filename, const std::wstring& filter, bool loop, int start, int length) \r
: filename_(filename)\r
, graph_(diagnostics::create_graph(narrow(print())))\r
, frame_factory_(frame_factory) \r
- , input_(safe_ptr<diagnostics::graph>(graph_), filename_, loop, start)\r
+ , format_desc_(frame_factory->get_video_format_desc())\r
+ , input_(safe_ptr<diagnostics::graph>(graph_), filename_, loop, start, length)\r
+ , video_decoder_(input_.context(), frame_factory, filter)\r
+ , audio_decoder_(input_.context(), frame_factory->get_video_format_desc())\r
+ , muxer_(video_decoder_.fps(), format_desc_, frame_factory)\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("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f)); \r
\r
- double frame_time = 1.0f/input_.fps();\r
- double format_frame_time = 1.0/frame_factory->get_video_format_desc().fps;\r
- if(abs(frame_time - format_frame_time) > 0.0001 && abs(frame_time - format_frame_time/2) > 0.0001)\r
- CASPAR_LOG(warning) << print() << L" Invalid framerate detected. This may cause distorted audio during playback. frame-time: " << frame_time;\r
- \r
- video_decoder_.reset(input_.get_video_codec_context() ? \r
- new video_decoder(*input_.get_video_codec_context(), frame_factory) : nullptr);\r
- \r
- audio_decoder_.reset(input_.get_audio_codec_context() ? \r
- new audio_decoder(*input_.get_audio_codec_context(), frame_factory->get_video_format_desc()) : nullptr); \r
- \r
- // Fill buffers.\r
- decode_next_packets();\r
+ for(int n = 0; n < 128 && muxer_.size() < 2; ++n)\r
+ decode_frame();\r
}\r
\r
- virtual safe_ptr<core::basic_frame> receive()\r
+ ~ffmpeg_producer()\r
{\r
- frame_timer_.restart();\r
-\r
- auto result = decode_frame();\r
- \r
- graph_->update_value("frame-time", static_cast<float>(frame_timer_.elapsed()*frame_factory_->get_video_format_desc().fps*0.5));\r
- \r
- return result;\r
- }\r
- \r
- virtual std::wstring print() const\r
- {\r
- return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"]";\r
+ tasks_.cancel();\r
+ tasks_.wait();\r
}\r
\r
- void decode_next_packets()\r
+ virtual safe_ptr<core::basic_frame> receive()\r
{\r
- tbb::parallel_invoke\r
- (\r
- [&]\r
- {\r
- std::shared_ptr<AVPacket> pkt;\r
- for(int n = 0; n < 8 && video_decoder_ && video_decoder_->empty() && input_.try_pop_video_packet(pkt); ++n)\r
- video_decoder_->push(std::move(pkt));\r
- }, \r
- [&]\r
- {\r
- std::shared_ptr<AVPacket> pkt;\r
- for(int n = 0; n < 8 && audio_decoder_ && audio_decoder_->empty() && input_.try_pop_audio_packet(pkt); ++n)\r
- audio_decoder_->push(std::move(pkt));\r
- }\r
- ); \r
- }\r
+ if(output_buffer_.empty())\r
+ { \r
+ //tasks_.wait();\r
\r
- safe_ptr<core::basic_frame> decode_frame()\r
- {\r
- decode_next_packets();\r
+ while(muxer_.size() > 0)\r
+ output_buffer_.push(muxer_.pop());\r
\r
- if(video_decoder_ && !video_decoder_->empty() && audio_decoder_ && !audio_decoder_->empty())\r
- {\r
- auto frame = std::move(video_decoder_->front()); \r
- video_decoder_->pop();\r
- \r
- frame->audio_data() = std::move(audio_decoder_->front());\r
- audio_decoder_->pop();\r
+ //tasks_.run([=]\r
+ //{\r
+ frame_timer_.restart();\r
\r
- return frame;\r
- }\r
- else if(video_decoder_ && !video_decoder_->empty() && !audio_decoder_)\r
- {\r
- auto frame = std::move(video_decoder_->front()); \r
- video_decoder_->pop();\r
- frame->get_audio_transform().set_has_audio(false); \r
+ for(int n = 0; n < 64 && muxer_.empty(); ++n)\r
+ decode_frame();\r
\r
- return frame;\r
+ graph_->update_value("frame-time", static_cast<float>(frame_timer_.elapsed()*format_desc_.fps*0.5));\r
+ //});\r
}\r
- else if(audio_decoder_ && !audio_decoder_->empty() && !video_decoder_)\r
- {\r
- auto frame = frame_factory_->create_frame(this, 1, 1);\r
- std::fill(frame->image_data().begin(), frame->image_data().end(), 0);\r
- \r
- frame->audio_data() = std::move(audio_decoder_->front());\r
- audio_decoder_->pop();\r
+ \r
+ auto frame = core::basic_frame::late();\r
\r
- return frame;\r
- }\r
- else if(!input_.is_running() || (!video_decoder_ && !audio_decoder_))\r
+ if(output_buffer_.empty())\r
{\r
- return core::basic_frame::eof();\r
+ if(input_.eof())\r
+ frame = core::basic_frame::eof();\r
+ else\r
+ graph_->add_tag("underflow"); \r
}\r
else\r
{\r
- graph_->add_tag("underflow");\r
- return core::basic_frame::late();\r
+ frame = output_buffer_.front();\r
+ output_buffer_.pop();\r
+ }\r
+ \r
+ return frame;\r
+ }\r
+\r
+ void decode_frame()\r
+ {\r
+ for(int n = 0; n < 32 && ((muxer_.video_frames() < 2 && !video_decoder_.ready()) || (muxer_.audio_chunks() < 2 && !audio_decoder_.ready())); ++n) \r
+ {\r
+ std::shared_ptr<AVPacket> pkt;\r
+ if(input_.try_pop(pkt))\r
+ {\r
+ video_decoder_.push(pkt);\r
+ audio_decoder_.push(pkt);\r
+ }\r
}\r
+\r
+ decltype(video_decoder_.poll()) video_frames;\r
+ decltype(audio_decoder_.poll()) audio_samples;\r
+ \r
+ tbb::parallel_invoke(\r
+ [&]\r
+ {\r
+ if(muxer_.video_frames() < 2)\r
+ video_frames = video_decoder_.poll();\r
+ },\r
+ [&]\r
+ {\r
+ if(muxer_.audio_chunks() < 2)\r
+ audio_samples = audio_decoder_.poll();\r
+ });\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
+ }\r
+ \r
+ virtual std::wstring print() const\r
+ {\r
+ return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"]";\r
}\r
};\r
\r
\r
auto ext = boost::find_if(extensions, [&](const std::wstring& ex)\r
{ \r
- return boost::filesystem::is_regular_file(boost::filesystem::wpath(filename).replace_extension(ex));\r
+ return boost::filesystem::is_regular_file(boost::filesystem::wpath(filename + L"." + ex));\r
});\r
\r
if(ext == extensions.end())\r
std::wstring path = filename + L"." + *ext;\r
bool loop = boost::find(params, L"LOOP") != params.end();\r
\r
- static const boost::wregex expr(L"\\((?<START>\\d+)(,(?<LENGTH>\\d+)?)?\\)");//(,(?<END>\\d+))?\\]"); // boost::regex has no repeated captures?\r
- boost::wsmatch what;\r
- auto it = std::find_if(params.begin(), params.end(), [&](const std::wstring& str)\r
- {\r
- return boost::regex_match(str, what, expr);\r
- });\r
-\r
int start = -1;\r
int length = -1;\r
+ \r
+ auto seek_it = std::find(params.begin(), params.end(), L"SEEK");\r
+ if(seek_it != params.end())\r
+ {\r
+ if(++seek_it != params.end())\r
+ start = boost::lexical_cast<int>(*seek_it);\r
+ }\r
\r
- if(it != params.end())\r
+ std::wstring filter = L"";\r
+ auto filter_it = std::find(params.begin(), params.end(), L"FILTER");\r
+ if(filter_it != params.end())\r
{\r
- start = lexical_cast_or_default(what["START"].str(), -1);\r
- if(what["LENGTH"].matched)\r
- length = lexical_cast_or_default(what["LENGTH"].str(), -1);\r
+ if(++filter_it != params.end())\r
+ filter = *filter_it;\r
}\r
- \r
- return make_safe<ffmpeg_producer>(frame_factory, path, loop, start, length);\r
+\r
+ return make_safe<ffmpeg_producer>(frame_factory, path, filter, loop, start, length);\r
}\r
\r
}
\ No newline at end of file
projects / casparcg / blobdiff