#include "audio/audio_decoder.h"\r
#include "video/video_decoder.h"\r
\r
-#include "../../video_format.h"\r
-#include "../../mixer/frame/draw_frame.h"\r
-#include "../../mixer/audio/audio_mixer.h"\r
+#include <core/video_format.h>\r
+#include <common/utility/timer.h>\r
+#include <common/diagnostics/graph.h>\r
+#include <mixer/frame/draw_frame.h>\r
+#include <mixer/audio/audio_transform.h>\r
\r
#include <common/env.h>\r
\r
\r
struct ffmpeg_producer : public frame_producer\r
{\r
+ safe_ptr<diagnostics::graph> graph_;\r
+ timer perf_timer_;\r
+\r
input input_; \r
std::unique_ptr<audio_decoder> audio_decoder_;\r
- video_decoder video_decoder_;\r
+ std::unique_ptr<video_decoder> video_decoder_;\r
\r
std::deque<safe_ptr<write_frame>> video_frame_channel_; \r
std::deque<std::vector<short>> audio_chunk_channel_;\r
const std::wstring filename_;\r
\r
safe_ptr<draw_frame> last_frame_;\r
+ std::shared_ptr<frame_factory> frame_factory_;\r
\r
public:\r
explicit ffmpeg_producer(const std::wstring& filename, bool loop) \r
- : filename_(filename)\r
+ : graph_(diagnostics::create_graph("ffmpeg"))\r
+ , filename_(filename)\r
, last_frame_(draw_frame(draw_frame::empty()))\r
- , input_(filename, loop)\r
- , video_decoder_(input_.get_video_codec_context().get()) \r
- , audio_decoder_(input_.get_audio_codec_context().get() ? new audio_decoder(input_.get_audio_codec_context().get(), input_.fps()) : nullptr){}\r
+ , input_(graph_, filename, loop)\r
+ {\r
+ graph_->add_guide("frame_time_target", 0.5, diagnostics::color(0.5f, 0.0f, 0.0f));\r
+ graph_->set_color("frame_time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
+ }\r
+\r
+ ~ffmpeg_producer()\r
+ {\r
+ CASPAR_LOG(info) << print() << " closing.";\r
+ }\r
\r
virtual void initialize(const safe_ptr<frame_factory>& frame_factory)\r
{\r
- video_decoder_.initialize(frame_factory);\r
+ frame_factory_ = frame_factory;\r
+ video_decoder_.reset(input_.get_video_codec_context().get() ? new video_decoder(input_.get_video_codec_context().get(), frame_factory) : nullptr);\r
+ audio_decoder_.reset(input_.get_audio_codec_context().get() ? new audio_decoder(input_.get_audio_codec_context().get(), frame_factory->get_video_format_desc().fps) : nullptr);\r
}\r
\r
virtual safe_ptr<draw_frame> receive()\r
{\r
+ perf_timer_.reset();\r
+\r
while(ouput_channel_.empty() && !input_.is_eof())\r
{ \r
aligned_buffer video_packet;\r
- if(video_frame_channel_.size() < 3) \r
+ if(video_frame_channel_.size() < 3 && video_decoder_) \r
video_packet = input_.get_video_packet(); \r
\r
aligned_buffer audio_packet;\r
- if(audio_chunk_channel_.size() < 3) \r
+ if(audio_chunk_channel_.size() < 3 && audio_decoder_) \r
audio_packet = input_.get_audio_packet(); \r
\r
tbb::parallel_invoke(\r
[&]\r
{ // Video Decoding and Scaling\r
- if(!video_packet.empty())\r
+ if(!video_packet.empty() && video_decoder_)\r
{\r
- auto frame = video_decoder_.execute(video_packet);\r
- video_frame_channel_.push_back(std::move(frame));\r
+ try\r
+ {\r
+ auto frame = video_decoder_->execute(video_packet);\r
+ video_frame_channel_.push_back(std::move(frame));\r
+ }\r
+ catch(...)\r
+ {\r
+ CASPAR_LOG_CURRENT_EXCEPTION();\r
+ video_decoder_.reset();\r
+ CASPAR_LOG(warning) << print() << " removed video-stream.";\r
+ }\r
}\r
}, \r
[&] \r
{\r
CASPAR_LOG_CURRENT_EXCEPTION();\r
audio_decoder_.reset();\r
+ CASPAR_LOG(warning) << print() << " removed audio-stream.";\r
}\r
}\r
});\r
\r
- while(!video_frame_channel_.empty() && (!audio_chunk_channel_.empty() || !audio_decoder_))\r
+ while((!video_frame_channel_.empty() || !video_decoder_) && (!audio_chunk_channel_.empty() || !audio_decoder_))\r
{\r
+ std::shared_ptr<write_frame> frame;\r
+\r
+ if(video_decoder_)\r
+ {\r
+ frame = video_frame_channel_.front();\r
+ video_frame_channel_.pop_front();\r
+ }\r
+\r
if(audio_decoder_) \r
{\r
- video_frame_channel_.front()->audio_data() = std::move(audio_chunk_channel_.front());\r
+ if(!frame)\r
+ {\r
+ frame = frame_factory_->create_frame(1, 1);\r
+ std::fill(frame->image_data().begin(), frame->image_data().end(), 0);\r
+ }\r
+ \r
+ frame->audio_data() = std::move(audio_chunk_channel_.front());\r
audio_chunk_channel_.pop_front();\r
}\r
\r
- ouput_channel_.push(std::move(video_frame_channel_.front()));\r
- video_frame_channel_.pop_front();\r
+ ouput_channel_.push(safe_ptr<write_frame>(frame)); \r
} \r
\r
if(ouput_channel_.empty() && video_packet.empty() && audio_packet.empty()) \r
return last_frame_; \r
}\r
+ \r
+ graph_->update("frame_time", static_cast<float>(perf_timer_.elapsed()/frame_factory_->get_video_format_desc().interval*0.5));\r
\r
auto result = last_frame_;\r
if(!ouput_channel_.empty())\r
\r
safe_ptr<frame_producer> create_ffmpeg_producer(const std::vector<std::wstring>& params)\r
{ \r
- static const std::vector<std::wstring> extensions = boost::assign::list_of(L"mpg")(L"avi")(L"mov")(L"dv")(L"wav")(L"mp3")(L"mp4")(L"f4v")(L"flv");\r
+ static const std::vector<std::wstring> extensions = boost::assign::list_of\r
+ (L"mpg")(L"mpeg")(L"avi")(L"mov")(L"qt")(L"webm")(L"dv")(L"mp4")(L"f4v")(L"flv")(L"mkv")(L"mka")(L"wmw")(L"wma")(L"ogg")(L"divx")(L"wav")(L"mp3");\r
std::wstring filename = env::media_folder() + L"\\" + params[0];\r
\r
auto ext = std::find_if(extensions.begin(), extensions.end(), [&](const std::wstring& ex) -> bool\r
projects / casparcg / blobdiff