\r
#include "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
+#include <common/env.h>\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_producer.h>\r
+#include <core/producer/frame/frame_factory.h>\r
+#include <core/producer/frame/basic_frame.h>\r
\r
-#include <common/env.h>\r
-\r
-#include <tbb/parallel_invoke.h>\r
-#include <tbb/task_group.h>\r
-\r
+#include <boost/assign.hpp>\r
#include <boost/timer.hpp>\r
-#include <boost/range/algorithm.hpp>\r
-#include <boost/range/algorithm_ext.hpp>\r
+#include <boost/foreach.hpp>\r
+#include <boost/filesystem.hpp>\r
+#include <boost/range/algorithm/find_if.hpp>\r
+#include <boost/range/algorithm/find.hpp>\r
\r
-#include <deque>\r
+#include <tbb/task_group.h>\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
+ boost::timer video_timer_;\r
+ boost::timer audio_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
+ frame_muxer muxer_;\r
+\r
+ int late_frames_;\r
+ const int start_;\r
+ const bool loop_;\r
\r
- input input_; \r
- std::unique_ptr<video_decoder> video_decoder_;\r
- std::unique_ptr<audio_decoder> audio_decoder_;\r
+ safe_ptr<core::basic_frame> last_frame_;\r
\r
- std::deque<std::pair<int, std::vector<int16_t>>> audio_chunks_;\r
- std::deque<std::pair<int, safe_ptr<core::write_frame>>> video_frames_;\r
+ tbb::task_group tasks_;\r
\r
- tbb::task_group task_group_;\r
public:\r
- explicit ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filename, const std::wstring& filter_str, 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, length)\r
+ , format_desc_(frame_factory->get_video_format_desc())\r
+ , input_(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(), frame_factory)\r
+ , late_frames_(0)\r
+ , start_(start)\r
+ , loop_(loop)\r
+ , last_frame_(core::basic_frame::empty())\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("video-time", diagnostics::color(1.0f, 1.0f, 0.0f));\r
+ graph_->set_color("audio-time", diagnostics::color(0.2f, 1.0f, 0.2f));\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_, frame_factory, narrow(filter_str)) : nullptr);\r
- \r
- audio_decoder_.reset(input_.get_audio_codec_context() ? \r
- new audio_decoder(input_, frame_factory->get_video_format_desc()) : nullptr); \r
- \r
- // Fill buffers.\r
- for(size_t n = 0; n < 2; ++n)\r
- decode_packets();\r
+ for(int n = 0; n < 128 && muxer_.size() < 2; ++n)\r
+ decode_frame(0);\r
}\r
\r
- virtual safe_ptr<core::basic_frame> receive()\r
- { \r
- // "receive" is called on the same thread as the gpu mixer runs. Minimize "receive" time in order to allow gpu and cpu to run in parallel. \r
- task_group_.wait();\r
-\r
- auto result = get_frame();\r
-\r
- task_group_.run([=]\r
- {\r
- frame_timer_.restart();\r
- decode_packets();\r
- graph_->update_value("frame-time", static_cast<float>(frame_timer_.elapsed()*frame_factory_->get_video_format_desc().fps*0.5));\r
- }); \r
- \r
- return result;\r
- }\r
- \r
- virtual std::wstring print() const\r
+ ~ffmpeg_producer()\r
{\r
- return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"]";\r
+ tasks_.cancel();\r
+ tasks_.wait();\r
}\r
-\r
- void decode_packets()\r
+ \r
+ virtual safe_ptr<core::basic_frame> receive(int hints)\r
{\r
- tbb::parallel_invoke\r
- (\r
- [&]\r
- {\r
- try\r
- {\r
- if(video_decoder_ && video_frames_.size() < 3)\r
- boost::range::push_back(video_frames_, video_decoder_->receive()); \r
- }\r
- catch(...)\r
- {\r
- CASPAR_LOG_CURRENT_EXCEPTION();\r
- video_decoder_.reset();\r
- }\r
- }, \r
- [&]\r
- {\r
- try\r
- {\r
- if(audio_decoder_ && audio_chunks_.size() < 3)\r
- boost::range::push_back(audio_chunks_, audio_decoder_->receive()); \r
- }\r
- catch(...)\r
- {\r
- CASPAR_LOG_CURRENT_EXCEPTION();\r
- audio_decoder_.reset();\r
- }\r
- }\r
- );\r
+ auto frame = core::basic_frame::late();\r
+ \r
+ frame_timer_.restart();\r
\r
- // If video is on first frame, sync with audio\r
- if(audio_decoder_ && video_decoder_ && !video_frames_.empty() && !audio_chunks_.empty() &&\r
- video_frames_.front().first == 0 && audio_chunks_.front().first != 0)\r
+ for(int n = 0; n < 8 && muxer_.empty(); ++n)\r
+ decode_frame(hints);\r
+\r
+ if(!muxer_.empty())\r
+ frame = last_frame_ = muxer_.pop(); \r
+ else\r
{\r
- audio_decoder_->restart(); // Notify decoder to wait for eof which was sent with video eof.\r
- audio_chunks_ = audio_decoder_->receive(); \r
+ if(input_.eof())\r
+ frame = core::basic_frame::eof();\r
+ else\r
+ {\r
+ graph_->add_tag("underflow"); \r
+ ++late_frames_; \r
+ }\r
}\r
\r
- CASPAR_ASSERT(!(video_decoder_ && audio_decoder_ && !video_frames_.empty() && !audio_chunks_.empty()) ||\r
- video_frames_.front().first == audio_chunks_.front().first);\r
+ graph_->update_value("frame-time", static_cast<float>(frame_timer_.elapsed()*format_desc_.fps*0.5));\r
+ \r
+ return frame;\r
}\r
\r
- // FIXME: Don't re-interlace when going from 50i to 50p, maybe do this inside decoder?\r
- safe_ptr<core::basic_frame> get_video_frame(std::vector<int16_t>&& audio_chunk)\r
+ virtual safe_ptr<core::basic_frame> last_frame() const\r
{\r
- auto frame = std::move(video_frames_.front().second); \r
- auto frame_number = video_frames_.front().first;\r
- video_frames_.pop_front();\r
- \r
- frame->audio_data() = std::move(audio_chunk);\r
- if(frame->audio_data().empty())\r
- frame->get_audio_transform().set_has_audio(false); \r
+ return disable_audio(last_frame_);\r
+ }\r
\r
- if(!video_frames_.empty()) // interlace if we have double frames\r
+ void decode_frame(int hints)\r
+ {\r
+ tasks_.wait();\r
+\r
+ muxer_.commit();\r
+\r
+ for(int n = 0; n < 16 && ((!muxer_.video_ready() && !video_decoder_.ready()) || (!muxer_.audio_ready() && !audio_decoder_.ready())); ++n) \r
{\r
- if(video_frames_.front().first == frame_number)\r
+ std::shared_ptr<AVPacket> pkt;\r
+ if(input_.try_pop(pkt))\r
{\r
- auto frame2 = std::move(video_frames_.front().second); \r
- video_frames_.pop_front();\r
- frame2->get_audio_transform().set_has_audio(false); \r
-\r
- return core::basic_frame::interlace(frame, frame2, frame_factory_->get_video_format_desc().mode);\r
+ video_decoder_.push(pkt);\r
+ audio_decoder_.push(pkt);\r
}\r
}\r
+ \r
+ if(!muxer_.video_ready())\r
+ {\r
+ tasks_.run([=]\r
+ {\r
+ video_timer_.restart();\r
\r
- return frame;\r
- }\r
+ auto video_frames = video_decoder_.poll();\r
+ BOOST_FOREACH(auto& video, video_frames) \r
+ muxer_.push(video, hints); \r
\r
- safe_ptr<core::basic_frame> get_frame()\r
- { \r
- if(video_decoder_ && audio_decoder_ && !video_frames_.empty() && !audio_chunks_.empty())\r
- {\r
- auto audio_chunk = std::move(audio_chunks_.front().second);\r
- audio_chunks_.pop_front();\r
- \r
- return get_video_frame(std::move(audio_chunk));\r
- }\r
- else if(video_decoder_ && !audio_decoder_ && !video_frames_.empty())\r
- { \r
- return get_video_frame(std::vector<int16_t>());\r
- }\r
- else if(audio_decoder_ && !video_decoder_ && !audio_chunks_.empty())\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_chunks_.front().second);\r
- audio_chunks_.pop_front();\r
+ graph_->update_value("video-time", static_cast<float>(video_timer_.elapsed()*format_desc_.fps*0.5));\r
+ });\r
+ } \r
\r
- return frame;\r
- }\r
- else if(!input_.is_running() || (!video_decoder_ && !audio_decoder_))\r
- {\r
- return core::basic_frame::eof();\r
- }\r
- else\r
+ if(!muxer_.audio_ready())\r
{\r
- graph_->add_tag("underflow");\r
- return core::basic_frame::late();\r
+ tasks_.run([=]\r
+ {\r
+ audio_timer_.restart();\r
+ \r
+ auto audio_samples = audio_decoder_.poll();\r
+ BOOST_FOREACH(auto& audio, audio_samples)\r
+ muxer_.push(audio); \r
+\r
+ graph_->update_value("audio-time", static_cast<float>(audio_timer_.elapsed()*format_desc_.fps*0.5));\r
+ }); \r
}\r
}\r
+\r
+ virtual int64_t nb_frames() const\r
+ {\r
+ auto nb_frames = input_.nb_frames() != 0 ? input_.nb_frames() : video_decoder_.nb_frames();\r
+ return loop_ ? 0 : (nb_frames + late_frames_ - start_);\r
+ }\r
+ \r
+ virtual std::wstring print() const\r
+ {\r
+ return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"]";\r
+ }\r
};\r
\r
safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
if(++seek_it != params.end())\r
start = boost::lexical_cast<int>(*seek_it);\r
}\r
- \r
- std::wstring filter_str = L"";\r
\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
if(++filter_it != params.end())\r
- filter_str = *filter_it;\r
+ filter = *filter_it;\r
}\r
\r
- return make_safe<ffmpeg_producer>(frame_factory, path, filter_str, loop, start, length);\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