#include "video/video_decoder.h"\r
\r
#include <common/env.h>\r
-#include <common/utility/assert.h>\r
-#include <common/utility/param.h>\r
+#include <common/log.h>\r
+#include <common/param.h>\r
#include <common/diagnostics/graph.h>\r
\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
-#include <core/producer/frame/frame_transform.h>\r
+#include <core/frame/frame_factory.h>\r
+#include <core/frame/draw_frame.h>\r
+#include <core/frame/frame_transform.h>\r
+#include <core/monitor/monitor.h>\r
\r
#include <boost/algorithm/string.hpp>\r
+#include <common/assert.h>\r
#include <boost/assign.hpp>\r
#include <boost/timer.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
+#include <boost/property_tree/ptree.hpp>\r
#include <boost/regex.hpp>\r
+#include <boost/thread/future.hpp>\r
\r
#include <tbb/parallel_invoke.h>\r
\r
\r
struct ffmpeg_producer : public core::frame_producer\r
{\r
+ monitor::basic_subject event_subject_;\r
const std::wstring filename_;\r
\r
- const safe_ptr<diagnostics::graph> graph_;\r
- boost::timer frame_timer_;\r
+ const spl::shared_ptr<diagnostics::graph> graph_;\r
\r
- const safe_ptr<core::frame_factory> frame_factory_;\r
+ const spl::shared_ptr<core::frame_factory> frame_factory_;\r
const core::video_format_desc format_desc_;\r
\r
input input_; \r
const double fps_;\r
const uint32_t start_;\r
const uint32_t length_;\r
-\r
- safe_ptr<core::basic_frame> last_frame_;\r
- \r
- std::queue<std::pair<safe_ptr<core::basic_frame>, uint32_t>> frame_buffer_;\r
-\r
+ \r
int64_t frame_number_;\r
- uint32_t file_frame_number_;\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, uint32_t start, uint32_t length) \r
+ explicit ffmpeg_producer(const spl::shared_ptr<core::frame_factory>& frame_factory, const std::wstring& filename, const std::wstring& filter, bool loop, uint32_t start, uint32_t length) \r
: filename_(filename)\r
, frame_factory_(frame_factory) \r
- , format_desc_(frame_factory->get_video_format_desc())\r
+ , format_desc_(frame_factory->video_format_desc())\r
, input_(graph_, filename_, loop, start, length)\r
, fps_(read_fps(*input_.context(), format_desc_.fps))\r
, start_(start)\r
, length_(length)\r
- , last_frame_(core::basic_frame::empty())\r
, frame_number_(0)\r
{\r
- graph_->add_guide("frame-time", 0.5);\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
diagnostics::register_graph(graph_);\r
try\r
{\r
video_decoder_.reset(new video_decoder(input_.context()));\r
+ video_decoder_->subscribe(event_subject_);\r
+ CASPAR_LOG(info) << print() << L" " << video_decoder_->print();\r
}\r
catch(averror_stream_not_found&)\r
{\r
- CASPAR_LOG(warning) << "No video-stream found. Running without video."; \r
+ //CASPAR_LOG(warning) << print() << " No video-stream found. Running without video."; \r
}\r
catch(...)\r
{\r
CASPAR_LOG_CURRENT_EXCEPTION();\r
- CASPAR_LOG(warning) << "Failed to open video-stream. Running without video."; \r
+ CASPAR_LOG(warning) << print() << "Failed to open video-stream. Running without video."; \r
}\r
\r
try\r
{\r
- audio_decoder_.reset(new audio_decoder(input_.context(), frame_factory->get_video_format_desc()));\r
+ audio_decoder_.reset(new audio_decoder(input_.context(), frame_factory->video_format_desc()));\r
+ audio_decoder_->subscribe(event_subject_);\r
+ CASPAR_LOG(info) << print() << L" " << audio_decoder_->print();\r
}\r
catch(averror_stream_not_found&)\r
{\r
- CASPAR_LOG(warning) << "No audio-stream found. Running without audio."; \r
+ //CASPAR_LOG(warning) << print() << " No audio-stream found. Running without audio."; \r
}\r
catch(...)\r
{\r
CASPAR_LOG_CURRENT_EXCEPTION();\r
- CASPAR_LOG(warning) << "Failed to open audio-stream. Running without audio."; \r
+ CASPAR_LOG(warning) << print() << " Failed to open audio-stream. Running without audio."; \r
} \r
\r
if(!video_decoder_ && !audio_decoder_)\r
\r
// frame_producer\r
\r
- virtual safe_ptr<core::basic_frame> receive(int flags) override\r
+ virtual spl::shared_ptr<core::draw_frame> receive(int flags) override\r
{ \r
- frame_timer_.restart();\r
+ boost::timer frame_timer;\r
\r
- for(int n = 0; n < 16 && frame_buffer_.size() < 2; ++n)\r
- try_decode_frame(flags);\r
+ std::shared_ptr<core::draw_frame> frame = try_decode_frame(flags);\r
+ \r
+ graph_->set_value("frame-time", frame_timer.elapsed()*format_desc_.fps*0.5);\r
\r
- graph_->update_value("frame-time", frame_timer_.elapsed()*format_desc_.fps*0.5);\r
+ event_subject_ << monitor::event("profiler/time") % frame_timer.elapsed() % (1.0/format_desc_.fps) \r
+ << monitor::event("file/time") % monitor::duration(file_frame_number()/fps_) \r
+ % monitor::duration(file_nb_frames()/fps_)\r
+ << monitor::event("file/frame") % static_cast<int32_t>(file_frame_number())\r
+ % static_cast<int32_t>(file_nb_frames())\r
+ << monitor::event("file/fps") % fps_\r
+ << monitor::event("filename") % u8(filename_)\r
+ << monitor::event("loop") % input_.loop();\r
\r
- if(frame_buffer_.empty() && input_.eof())\r
- return last_frame();\r
-\r
- if(frame_buffer_.empty())\r
+ if(!frame)\r
{\r
- graph_->add_tag("underflow"); \r
- return core::basic_frame::late(); \r
+ if(!input_.eof()) \r
+ graph_->set_tag("underflow"); \r
+ return core::draw_frame::late();\r
}\r
- \r
- auto frame = frame_buffer_.front(); \r
- frame_buffer_.pop();\r
- \r
+ \r
++frame_number_;\r
- file_frame_number_ = frame.second;\r
\r
graph_->set_text(print());\r
\r
- return last_frame_ = frame.first;\r
+ return spl::make_shared_ptr(frame);\r
}\r
-\r
- virtual safe_ptr<core::basic_frame> last_frame() const override\r
- {\r
- return disable_audio(last_frame_);\r
- }\r
-\r
+ \r
virtual uint32_t nb_frames() const override\r
{\r
if(input_.loop())\r
file_nb_frames = std::max(file_nb_frames, audio_decoder_ ? audio_decoder_->nb_frames() : 0);\r
return file_nb_frames;\r
}\r
+\r
+ uint32_t file_frame_number() const\r
+ {\r
+ return video_decoder_ ? video_decoder_->file_frame_number() : 0;\r
+ }\r
\r
virtual boost::unique_future<std::wstring> call(const std::wstring& param) override\r
{\r
{\r
return L"ffmpeg[" + boost::filesystem::path(filename_).filename().wstring() + L"|" \r
+ print_mode() + L"|" \r
- + boost::lexical_cast<std::wstring>(file_frame_number_) + L"/" + boost::lexical_cast<std::wstring>(file_nb_frames()) + L"]";\r
+ + boost::lexical_cast<std::wstring>(file_frame_number()) + L"/" + boost::lexical_cast<std::wstring>(file_nb_frames()) + L"]";\r
+ }\r
+\r
+ virtual std::wstring name() const override\r
+ {\r
+ return L"ffmpeg";\r
}\r
\r
boost::property_tree::wptree info() const override\r
{\r
boost::property_tree::wptree info;\r
- info.add(L"type", L"ffmpeg-producer");\r
+ info.add(L"type", L"ffmpeg");\r
info.add(L"filename", filename_);\r
info.add(L"width", video_decoder_ ? video_decoder_->width() : 0);\r
info.add(L"height", video_decoder_ ? video_decoder_->height() : 0);\r
info.add(L"frame-number", frame_number_);\r
auto nb_frames2 = nb_frames();\r
info.add(L"nb-frames", nb_frames2 == std::numeric_limits<int64_t>::max() ? -1 : nb_frames2);\r
- info.add(L"file-frame-number", file_frame_number_);\r
+ info.add(L"file-frame-number", file_frame_number());\r
info.add(L"file-nb-frames", file_nb_frames());\r
return info;\r
}\r
+ \r
+ virtual void subscribe(const monitor::observable::observer_ptr& o) override\r
+ {\r
+ event_subject_.subscribe(o);\r
+ }\r
+\r
+ virtual void unsubscribe(const monitor::observable::observer_ptr& o) override\r
+ {\r
+ event_subject_.unsubscribe(o);\r
+ }\r
\r
// ffmpeg_producer\r
\r
std::wstring print_mode() const\r
{\r
- return video_decoder_ ? ffmpeg::print_mode(video_decoder_->width(), video_decoder_->height(), fps_, !video_decoder_->is_progressive()) : L"";\r
+ return video_decoder_ ? ffmpeg::print_mode(video_decoder_->width(), video_decoder_->height(), fps_, !video_decoder_->is_progressive()) : L"n/a";\r
}\r
\r
std::wstring do_call(const std::wstring& param)\r
{\r
- static const boost::wregex loop_exp(L"LOOP\\s*(?<VALUE>\\d?)", boost::regex::icase);\r
+ static const boost::wregex loop_exp(L"LOOP\\s*(?<VALUE>\\d?)?", boost::regex::icase);\r
static const boost::wregex seek_exp(L"SEEK\\s+(?<VALUE>\\d+)", boost::regex::icase);\r
\r
boost::wsmatch what;\r
BOOST_THROW_EXCEPTION(invalid_argument());\r
}\r
\r
- void try_decode_frame(int flags)\r
+ std::shared_ptr<core::draw_frame> try_decode_frame(int flags)\r
{\r
- std::shared_ptr<AVPacket> pkt;\r
+ std::shared_ptr<core::draw_frame> result = muxer_->poll();\r
\r
- for(int n = 0; n < 32 && ((video_decoder_ && !video_decoder_->ready()) || (audio_decoder_ && !audio_decoder_->ready())) && input_.try_pop(pkt); ++n)\r
+ for(int n = 0; n < 32 && !result; ++n, result = muxer_->poll())\r
{\r
- if(video_decoder_)\r
- video_decoder_->push(pkt);\r
- if(audio_decoder_)\r
- audio_decoder_->push(pkt);\r
- }\r
+ std::shared_ptr<AVPacket> pkt;\r
+\r
+ for(int n = 0; n < 32 && ((video_decoder_ && !video_decoder_->ready()) || (audio_decoder_ && !audio_decoder_->ready())) && input_.try_pop(pkt); ++n)\r
+ {\r
+ if(video_decoder_)\r
+ video_decoder_->push(pkt);\r
+ if(audio_decoder_)\r
+ audio_decoder_->push(pkt);\r
+ }\r
\r
- std::shared_ptr<AVFrame> video;\r
- std::shared_ptr<core::audio_buffer> audio;\r
-\r
- tbb::parallel_invoke(\r
- [&]\r
- {\r
- if(!muxer_->video_ready() && video_decoder_) \r
- video = video_decoder_->poll(); \r
- },\r
- [&]\r
- { \r
- if(!muxer_->audio_ready() && audio_decoder_) \r
- audio = audio_decoder_->poll(); \r
- });\r
+
std::shared_ptr<AVFrame> video;
\r+ std::shared_ptr<core::audio_buffer> audio;\r
+\r
+ tbb::parallel_invoke(\r
+ [&]\r
+ {\r
+ if(!muxer_->video_ready() && video_decoder_) \r
+ video = video_decoder_->poll(); \r
+ },\r
+ [&]\r
+ { \r
+ if(!muxer_->audio_ready() && audio_decoder_) \r
+ audio = audio_decoder_->poll(); \r
+ });\r
\r
- muxer_->push(video, flags);\r
- muxer_->push(audio);\r
-\r
- if(!audio_decoder_)\r
- {\r
- if(video == flush_video())\r
- muxer_->push(flush_audio());\r
- else if(!muxer_->audio_ready())\r
- muxer_->push(empty_audio());\r
+ muxer_->push(video, flags);\r
+ muxer_->push(audio);\r
+\r
+ if(!audio_decoder_)\r
+ {\r
+ if(video == flush_video())\r
+ muxer_->push(flush_audio());\r
+ else if(!muxer_->audio_ready())\r
+ muxer_->push(empty_audio());\r
+ }\r
+\r
+ if(!video_decoder_)\r
+ {\r
+ if(audio == flush_audio())\r
+ muxer_->push(flush_video(), 0);\r
+ else if(!muxer_->video_ready())\r
+ muxer_->push(empty_video(), 0);\r
+ }\r
}\r
\r
- if(!video_decoder_)\r
- {\r
- if(audio == flush_audio())\r
- muxer_->push(flush_video(), 0);\r
- else if(!muxer_->video_ready())\r
- muxer_->push(empty_video(), 0);\r
- }\r
- \r
- uint32_t file_frame_number = 0;\r
- file_frame_number = std::max(file_frame_number, video_decoder_ ? video_decoder_->file_frame_number() : 0);\r
- //file_frame_number = std::max(file_frame_number, audio_decoder_ ? audio_decoder_->file_frame_number() : 0);\r
-\r
- for(auto frame = muxer_->poll(); frame; frame = muxer_->poll())\r
- frame_buffer_.push(std::make_pair(make_safe_ptr(frame), file_frame_number));\r
+ return result;\r
}\r
};\r
\r
-safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+spl::shared_ptr<core::frame_producer> create_producer(const spl::shared_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
{ \r
auto filename = probe_stem(env::media_folder() + L"\\" + params.at(0));\r
\r
boost::replace_all(filter_str, L"DEINTERLACE", L"YADIF=0:-1");\r
boost::replace_all(filter_str, L"DEINTERLACE_BOB", L"YADIF=1:-1");\r
\r
- return create_producer_destroy_proxy(make_safe<ffmpeg_producer>(frame_factory, filename, filter_str, loop, start, length));\r
+ return core::wrap_producer(spl::make_shared<ffmpeg_producer>(frame_factory, filename, filter_str, loop, start, length));\r
}\r
\r
}}
\ No newline at end of file
projects / casparcg / blobdiff