/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
*\r
-* This file is part of CasparCG.\r
+* This file is part of CasparCG (www.casparcg.com).\r
*\r
-* CasparCG is free software: you can redistribute it and/or modify\r
-* it under the terms of the GNU General Public License as published by\r
-* the Free Software Foundation, either version 3 of the License, or\r
-* (at your option) any later version.\r
+* CasparCG is free software: you can redistribute it and/or modify\r
+* it under the terms of the GNU General Public License as published by\r
+* the Free Software Foundation, either version 3 of the License, or\r
+* (at your option) any later version.\r
*\r
-* CasparCG is distributed in the hope that it will be useful,\r
-* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
-* GNU General Public License for more details.\r
-\r
-* You should have received a copy of the GNU General Public License\r
-* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
+* CasparCG is distributed in the hope that it will be useful,\r
+* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+* GNU General Public License for more details.\r
+*\r
+* You should have received a copy of the GNU General Public License\r
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
*\r
+* Author: Robert Nagy, ronag89@gmail.com\r
*/\r
+\r
#include "../stdafx.h"\r
\r
#include "ffmpeg_producer.h"\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
- boost::timer video_timer_;\r
- boost::timer audio_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 core::video_format_desc format_desc_;\r
+ const safe_ptr<core::frame_factory> frame_factory_;\r
+ const core::video_format_desc format_desc_;\r
\r
- input input_; \r
- std::unique_ptr<video_decoder> video_decoder_;\r
- std::unique_ptr<audio_decoder> audio_decoder_; \r
- std::unique_ptr<frame_muxer> muxer_;\r
+ input input_; \r
+ std::unique_ptr<video_decoder> video_decoder_;\r
+ std::unique_ptr<audio_decoder> audio_decoder_; \r
+ std::unique_ptr<frame_muxer> muxer_;\r
\r
- const int start_;\r
- const bool loop_;\r
- const size_t length_;\r
+ const double fps_;\r
+ const int start_;\r
+ const bool loop_;\r
+ const size_t length_;\r
\r
- safe_ptr<core::basic_frame> last_frame_;\r
+ safe_ptr<core::basic_frame> last_frame_;\r
\r
- std::queue<safe_ptr<core::basic_frame>> frame_buffer_;\r
+ std::queue<std::pair<safe_ptr<core::basic_frame>, size_t>> frame_buffer_;\r
\r
- int64_t frame_number_;\r
- int64_t file_frame_number_;;\r
+ int64_t frame_number_;\r
+ int64_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, int start, size_t length) \r
, frame_factory_(frame_factory) \r
, format_desc_(frame_factory->get_video_format_desc())\r
, input_(graph_, filename_, loop, start, length)\r
+ , fps_(read_fps(*input_.context(), format_desc_.fps))\r
, start_(start)\r
, loop_(loop)\r
, length_(length)\r
if(!video_decoder_ && !audio_decoder_)\r
BOOST_THROW_EXCEPTION(averror_stream_not_found() << msg_info("No streams found"));\r
\r
- muxer_.reset(new frame_muxer(video_decoder_ ? video_decoder_->fps() : frame_factory->get_video_format_desc().fps, frame_factory, filter));\r
+ muxer_.reset(new frame_muxer(fps_, frame_factory, filter));\r
}\r
\r
// frame_producer\r
return core::basic_frame::late(); \r
}\r
\r
- last_frame_ = frame_buffer_.front(); \r
+ auto frame = frame_buffer_.front(); \r
frame_buffer_.pop();\r
+ \r
+ ++frame_number_;\r
+ file_frame_number_ = frame.second;\r
\r
graph_->set_text(print());\r
\r
- ++frame_number_;\r
- return last_frame_;\r
+ return last_frame_ = frame.first;\r
}\r
\r
virtual safe_ptr<core::basic_frame> last_frame() const override\r
return nb_frames - start_;\r
}\r
\r
- virtual int64_t file_nb_frames() const override\r
+ virtual int64_t file_nb_frames() const\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
- auto video_nb_frames = video_decoder_ ? video_decoder_->nb_frames() : std::numeric_limits<int64_t>::max();\r
- //auto audio_nb_frames = audio_decoder_ ? audio_decoder_->nb_frames() : std::numeric_limits<int64_t>::max();\r
-\r
- nb_frames = std::max(nb_frames, video_nb_frames);\r
- }\r
- return nb_frames;\r
+ int64_t file_nb_frames = 0;\r
+ file_nb_frames = std::max(file_nb_frames, video_decoder_ ? video_decoder_->nb_frames() : 0);\r
+ file_nb_frames = std::max(file_nb_frames, audio_decoder_ ? audio_decoder_->nb_frames() : 0);\r
+ return file_nb_frames;\r
}\r
\r
- virtual int64_t frame_number() const override\r
+ virtual int64_t frame_number() const\r
{\r
return frame_number_;\r
}\r
\r
- virtual int64_t file_frame_number() const override\r
+ virtual int64_t file_frame_number() const\r
{\r
- return std::max<int64_t>(0, file_frame_number_-frame_buffer_.size()+1);\r
+ return file_frame_number_;\r
}\r
\r
virtual boost::unique_future<std::wstring> call(const std::wstring& param) override\r
\r
virtual std::wstring print() const override\r
{\r
- if(video_decoder_)\r
- {\r
- std::wostringstream fps_ss;\r
- fps_ss << std::fixed << std::setprecision(2) << (video_decoder_->is_progressive() ? video_decoder_->fps() : 2.0 * video_decoder_->fps());\r
+ return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + 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
+ }\r
\r
- return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"|" \r
- + boost::lexical_cast<std::wstring>(video_decoder_->width()) + L"x" + boost::lexical_cast<std::wstring>(video_decoder_->height())\r
- + (video_decoder_->is_progressive() ? L"p" : L"i") + fps_ss.str()\r
- + L"|" + boost::lexical_cast<std::wstring>(file_frame_number()) + L"/" + boost::lexical_cast<std::wstring>(file_nb_frames()) + L"]";\r
- }\r
- \r
- return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"]";\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"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"progressive", video_decoder_ ? video_decoder_->is_progressive() : false);\r
+ info.add(L"fps", fps_);\r
+ info.add(L"loop", input_.loop());\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-nb-frames", file_nb_frames());\r
+ return info;\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
+ }\r
\r
std::wstring do_call(const std::wstring& param)\r
{\r
[&]\r
{\r
if(!muxer_->video_ready() && video_decoder_) \r
- {\r
video = video_decoder_->poll(); \r
- file_frame_number_ = video_decoder_->file_frame_number();\r
- }\r
},\r
[&]\r
{ \r
if(!muxer_->audio_ready() && audio_decoder_) \r
- {\r
audio = audio_decoder_->poll(); \r
- file_frame_number_ = video_decoder_->file_frame_number();\r
- } \r
});\r
\r
muxer_->push(video, hints);\r
muxer_->push(empty_video(), 0);\r
}\r
\r
+ size_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(make_safe_ptr(frame));\r
+ frame_buffer_.push(std::make_pair(make_safe_ptr(frame), file_frame_number));\r
}\r
};\r
\r
(L"dv") \r
(L"f4v")(L"flv")\r
(L"mkv")(L"mka")\r
+ (L"mxf")\r
(L"wmv")(L"wma")(L"wav")\r
(L"rm")(L"ram")\r
(L"ogg")(L"ogv")(L"oga")(L"ogx")\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_destroy_proxy(make_safe<ffmpeg_producer>(frame_factory, path, filter_str, loop, start, length));\r
+ return create_producer_destroy_proxy(make_safe<ffmpeg_producer>(frame_factory, path, filter_str, loop, start, length));\r
}\r
\r
}}
\ No newline at end of file
projects / casparcg / blobdiff