\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/mixer/write_frame.h>\r
#include <core/video_format.h>\r
-#include <core/producer/frame/audio_transform.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
-#include <core/producer/color/color_producer.h>\r
-\r
-#include <common/env.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 <tbb/task_group.h>\r
\r
-#include <deque>\r
-#include <vector>\r
-\r
namespace caspar {\r
\r
struct ffmpeg_producer : public core::frame_producer\r
\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 core::video_format_desc format_desc_;\r
\r
frame_muxer muxer_;\r
\r
+ int late_frames_;\r
const int start_;\r
- int64_t nb_frames_;\r
const bool loop_;\r
\r
safe_ptr<core::basic_frame> last_frame_;\r
- \r
- tbb::task_group tasks_;\r
\r
+ tbb::task_group tasks_;\r
+ \r
public:\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
, 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(), format_desc_, frame_factory)\r
+ , muxer_(video_decoder_.fps(), frame_factory)\r
+ , late_frames_(0)\r
, start_(start)\r
- , nb_frames_(video_decoder_.nb_frames() - 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("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
for(int n = 0; n < 128 && muxer_.size() < 2; ++n)\r
- decode_frame();\r
+ decode_frame(0);\r
}\r
\r
~ffmpeg_producer()\r
tasks_.cancel();\r
tasks_.wait();\r
}\r
- \r
- virtual safe_ptr<core::basic_frame> receive()\r
+ \r
+ virtual safe_ptr<core::basic_frame> receive(int hints)\r
{\r
- tasks_.wait();\r
-\r
auto frame = core::basic_frame::late();\r
\r
+ frame_timer_.restart();\r
+ \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
else\r
{\r
graph_->add_tag("underflow"); \r
- ++nb_frames_; \r
+ ++late_frames_; \r
}\r
}\r
-\r
- tasks_.run([this]\r
- {\r
- frame_timer_.restart();\r
-\r
- for(int n = 0; n < 64 && muxer_.size() < 2; ++n)\r
- decode_frame();\r
-\r
- graph_->update_value("frame-time", static_cast<float>(frame_timer_.elapsed()*format_desc_.fps*0.5));\r
- });\r
+ \r
+ graph_->update_value("frame-time", static_cast<float>(frame_timer_.elapsed()*format_desc_.fps*0.5));\r
\r
return frame;\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
+ 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
std::shared_ptr<AVPacket> pkt;\r
if(input_.try_pop(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
+ if(!muxer_.video_ready())\r
{\r
- if(!muxer_.video_ready())\r
- video_frames = video_decoder_.poll();\r
- },\r
- [&]\r
+ tasks_.run([=]\r
+ {\r
+ video_timer_.restart();\r
+\r
+ auto video_frames = video_decoder_.poll();\r
+ BOOST_FOREACH(auto& video, video_frames) \r
+ muxer_.push(video, hints); \r
+\r
+ graph_->update_value("video-time", static_cast<float>(video_timer_.elapsed()*format_desc_.fps*0.5));\r
+ });\r
+ } \r
+\r
+ if(!muxer_.audio_ready())\r
{\r
- if(!muxer_.audio_ready())\r
- audio_samples = audio_decoder_.poll();\r
- });\r
- \r
- BOOST_FOREACH(auto& audio, audio_samples)\r
- muxer_.push(audio);\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
- BOOST_FOREACH(auto& video, video_frames)\r
- muxer_.push(video); \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
- return loop_ ? 0 : nb_frames_;\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
projects / casparcg / blobdiff