\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
-\r
-#include <tbb/task_group.h>\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 <vector>\r
+#include <tbb/parallel_invoke.h>\r
\r
namespace caspar {\r
- \r
+ \r
struct ffmpeg_producer : public core::frame_producer\r
{\r
const std::wstring filename_;\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
input input_; \r
video_decoder video_decoder_;\r
- audio_decoder audio_decoder_;\r
+ audio_decoder audio_decoder_; \r
+ double fps_;\r
+ frame_muxer muxer_;\r
\r
- std::queue<safe_ptr<core::basic_frame>> output_buffer_;\r
+ const int start_;\r
+ const bool loop_;\r
+ const size_t length_;\r
\r
- frame_muxer muxer_;\r
- \r
- tbb::task_group tasks_;\r
+ safe_ptr<core::basic_frame> last_frame_;\r
\r
+ const size_t width_;\r
+ const size_t height_;\r
+ bool is_progressive_;\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
+ explicit ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filename, const std::wstring& filter, bool loop, int start, size_t length) \r
: filename_(filename)\r
- , graph_(diagnostics::create_graph(narrow(print())))\r
+ , graph_(diagnostics::create_graph([this]{return print();}))\r
, frame_factory_(frame_factory) \r
, format_desc_(frame_factory->get_video_format_desc())\r
- , input_(safe_ptr<diagnostics::graph>(graph_), filename_, loop, start, length)\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
+ , fps_(video_decoder_.fps())\r
+ , muxer_(fps_, frame_factory)\r
+ , start_(start)\r
+ , loop_(loop)\r
+ , length_(length)\r
+ , last_frame_(core::basic_frame::empty())\r
+ , width_(video_decoder_.width())\r
+ , height_(video_decoder_.height())\r
+ , is_progressive_(true)\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("underflow", diagnostics::color(0.6f, 0.3f, 0.9f)); \r
+ graph_->set_color("frame-time", diagnostics::color(0.1f, 1.0f, 0.1f));\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
- }\r
-\r
- ~ffmpeg_producer()\r
- {\r
- tasks_.cancel();\r
- tasks_.wait();\r
+ for(int n = 0; n < 32 && muxer_.empty(); ++n)\r
+ decode_frame(0);\r
}\r
-\r
- virtual safe_ptr<core::basic_frame> receive()\r
+ \r
+ virtual safe_ptr<core::basic_frame> receive(int hints)\r
{\r
- if(output_buffer_.empty())\r
- { \r
- //tasks_.wait();\r
-\r
- while(muxer_.size() > 0)\r
- output_buffer_.push(muxer_.pop());\r
-\r
- //tasks_.run([=]\r
- //{\r
- frame_timer_.restart();\r
-\r
- for(int n = 0; n < 64 && muxer_.empty(); ++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
- \r
auto frame = core::basic_frame::late();\r
+ \r
+ frame_timer_.restart();\r
+ \r
+ for(int n = 0; n < 64 && muxer_.empty(); ++n)\r
+ decode_frame(hints);\r
+ \r
+ graph_->update_value("frame-time", static_cast<float>(frame_timer_.elapsed()*format_desc_.fps*0.5));\r
\r
- if(output_buffer_.empty())\r
- {\r
- if(input_.eof())\r
- frame = core::basic_frame::eof();\r
- else\r
- graph_->add_tag("underflow"); \r
- }\r
+ if(!muxer_.empty())\r
+ frame = last_frame_ = muxer_.pop(); \r
else\r
{\r
- frame = output_buffer_.front();\r
- output_buffer_.pop();\r
+ if(input_.eof())\r
+ return core::basic_frame::eof();\r
+ else \r
+ graph_->add_tag("underflow"); \r
}\r
\r
return frame;\r
}\r
\r
- void decode_frame()\r
+ virtual safe_ptr<core::basic_frame> last_frame() const\r
{\r
- for(int n = 0; n < 32 && ((muxer_.video_frames() < 2 && !video_decoder_.ready()) || (muxer_.audio_chunks() < 2 && !audio_decoder_.ready())); ++n) \r
+ return disable_audio(last_frame_);\r
+ }\r
+\r
+ void decode_frame(int hints)\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
{\r
- if(muxer_.video_frames() < 2)\r
- video_frames = video_decoder_.poll();\r
+ if(muxer_.video_ready())\r
+ return;\r
+\r
+ auto video_frames = video_decoder_.poll();\r
+ BOOST_FOREACH(auto& video, video_frames) \r
+ {\r
+ is_progressive_ = video ? video->interlaced_frame == 0 : is_progressive_;\r
+ muxer_.push(video, hints); \r
+ }\r
},\r
[&]\r
{\r
- if(muxer_.audio_chunks() < 2)\r
- audio_samples = audio_decoder_.poll();\r
+ if(muxer_.audio_ready())\r
+ return;\r
+ \r
+ auto audio_samples = audio_decoder_.poll();\r
+ BOOST_FOREACH(auto& audio, audio_samples)\r
+ muxer_.push(audio); \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
+ muxer_.commit();\r
+ }\r
+\r
+ virtual int64_t nb_frames() const \r
+ {\r
+ if(loop_)\r
+ return std::numeric_limits<int64_t>::max();\r
+\r
+ // This function estimates nb_frames until input has read all packets for one loop, at which point the count should be accurate.\r
+\r
+ int64_t nb_frames = input_.nb_frames();\r
+ if(input_.nb_loops() < 1) // input still hasn't counted all frames\r
+ {\r
+ int64_t video_nb_frames = video_decoder_.nb_frames();\r
+ int64_t audio_nb_frames = audio_decoder_.nb_frames();\r
+\r
+ nb_frames = std::min(static_cast<int64_t>(length_), std::max(nb_frames, std::max(video_nb_frames, audio_nb_frames)));\r
+ }\r
+\r
+ nb_frames = muxer_.calc_nb_frames(nb_frames);\r
+\r
+ // TODO: Might need to scale nb_frames av frame_muxer transformations.\r
+\r
+ return nb_frames - start_;\r
}\r
\r
virtual std::wstring print() const\r
{\r
- return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"]";\r
+ return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"|" \r
+ + boost::lexical_cast<std::wstring>(width_) + L"x" + boost::lexical_cast<std::wstring>(height_)\r
+ + (is_progressive_ ? L"p" : L"i") + boost::lexical_cast<std::wstring>(fps_)\r
+ + L"]";\r
}\r
};\r
\r
std::wstring path = filename + L"." + *ext;\r
bool loop = boost::find(params, L"LOOP") != params.end();\r
\r
- int start = -1;\r
- int length = -1;\r
+ size_t start = 0;\r
+ size_t length = std::numeric_limits<size_t>::max();\r
\r
- auto seek_it = std::find(params.begin(), params.end(), L"SEEK");\r
+ auto seek_it = boost::find(params, L"SEEK");\r
if(seek_it != params.end())\r
{\r
if(++seek_it != params.end())\r
- start = boost::lexical_cast<int>(*seek_it);\r
+ start = boost::lexical_cast<size_t>(*seek_it);\r
+ }\r
+ \r
+ auto length_it = boost::find(params, L"LENGTH");\r
+ if(length_it != params.end())\r
+ {\r
+ if(++length_it != params.end())\r
+ length = boost::lexical_cast<size_t>(*length_it);\r
}\r
\r
std::wstring filter = L"";\r
- auto filter_it = std::find(params.begin(), params.end(), L"FILTER");\r
+ auto filter_it = boost::find(params, L"FILTER");\r
if(filter_it != params.end())\r
{\r
if(++filter_it != params.end())\r
projects / casparcg / blobdiff