]> git.sesse.net Git - casparcg/blobdiff - modules/ffmpeg/producer/ffmpeg_producer.cpp
Merge pull request #145 from cambell-prince/ffmpeg-dshowparams
[casparcg] / modules / ffmpeg / producer / ffmpeg_producer.cpp
index a8988ad753f2f3a37690d6d186fe3daee755a997..07ef0cdb61af022527503599c70f9a7e8e093e6f 100644 (file)
@@ -1,29 +1,35 @@
 /*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://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
-#include "frame_muxer.h"\r
-#include "input.h"\r
-#include "util.h"\r
+#include "../ffmpeg.h"\r
+#include "../ffmpeg_error.h"\r
+#include "../ffmpeg_params.h"\r
+\r
+#include "muxer/frame_muxer.h"\r
+#include "input/input.h"\r
+#include "util/util.h"\r
 #include "audio/audio_decoder.h"\r
 #include "video/video_decoder.h"\r
 \r
 #include <common/utility/assert.h>\r
 #include <common/diagnostics/graph.h>\r
 \r
+#include <core/monitor/monitor.h>\r
 #include <core/video_format.h>\r
+#include <core/parameters/parameters.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
 \r
+#include <boost/algorithm/string.hpp>\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/regex.hpp>\r
 \r
 #include <tbb/parallel_invoke.h>\r
 \r
-namespace caspar {\r
+#include <limits>\r
+#include <memory>\r
+#include <queue>\r
+\r
+namespace caspar { namespace ffmpeg {\r
 \r
-double validate_fps(double fps, int64_t nb_frames, double duration_sec)\r
+std::wstring get_relative_or_original(\r
+               const std::wstring& filename,\r
+               const boost::filesystem::wpath& relative_to)\r
 {\r
-       if(fps > 20.0 && fps < 80.0)\r
-               return fps;\r
-       \r
-       auto est_fps = nb_frames/duration_sec;\r
+       boost::filesystem::wpath file(filename);\r
+       auto result = file.filename();\r
 \r
-       CASPAR_LOG(warning) << L"Invalid framerate detected, trying to estimate, fps: " << fps << L" nb_frames: " << nb_frames << L" duration_sec: " << duration_sec << L" => " << est_fps << L" fps.";\r
+       boost::filesystem::wpath current_path = file;\r
 \r
-       return est_fps;\r
+       while (true)\r
+       {\r
+               current_path = current_path.parent_path();\r
+\r
+               if (boost::filesystem::equivalent(current_path, relative_to))\r
+                       break;\r
+\r
+               if (current_path.empty())\r
+                       return filename;\r
+\r
+               result = current_path.filename() + L"/" + result;\r
+       }\r
+\r
+       return result;\r
 }\r
-                       \r
+                               \r
 struct ffmpeg_producer : public core::frame_producer\r
 {\r
-       const std::wstring                                                              filename_;\r
+       core::monitor::subject                                                                          monitor_subject_;\r
+       const std::wstring                                                                                      filename_;\r
+       const std::wstring                                                                                      path_relative_to_media_;\r
+\r
+       FFMPEG_Resource                                                                                         resource_type_;\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
+       std::shared_ptr<void>                                                                           initial_logger_disabler_;\r
 \r
-       input                                                                                   input_; \r
-       video_decoder                                                                   video_decoder_;\r
-       audio_decoder                                                                   audio_decoder_; \r
-       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
-       int                                                                                             late_frames_;\r
-       const int                                                                               start_;\r
-       const bool                                                                              loop_;\r
+       const double                                                                                            fps_;\r
+       const uint32_t                                                                                          start_;\r
+       const uint32_t                                                                                          length_;\r
+       const bool                                                                                                      thumbnail_mode_;\r
 \r
-       safe_ptr<core::basic_frame>                                             last_frame_;\r
+       safe_ptr<core::basic_frame>                                                                     last_frame_;\r
        \r
+       std::queue<std::pair<safe_ptr<core::basic_frame>, size_t>>      frame_buffer_;\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, int start, int length) \r
+       explicit ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filename, FFMPEG_Resource resource_type, const std::wstring& filter, bool loop, uint32_t start, uint32_t length, bool thumbnail_mode, const std::wstring& custom_channel_order, const ffmpeg_producer_params& vid_params)\r
                : filename_(filename)\r
-               , graph_(diagnostics::create_graph(narrow(print())))\r
+               , path_relative_to_media_(get_relative_or_original(filename, env::media_folder()))\r
+               , resource_type_(resource_type)\r
                , frame_factory_(frame_factory)         \r
                , format_desc_(frame_factory->get_video_format_desc())\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_(validate_fps(video_decoder_.fps(), video_decoder_.nb_frames(), audio_decoder_.duration()), frame_factory)\r
-               , late_frames_(0)\r
+               , initial_logger_disabler_(temporary_disable_logging_for_thread(thumbnail_mode))\r
+               , input_(graph_, filename_, resource_type, loop, start, length, thumbnail_mode, vid_params)\r
+               , fps_(read_fps(*input_.context(), format_desc_.fps))\r
                , start_(start)\r
-               , loop_(loop)\r
+               , length_(length)\r
+               , thumbnail_mode_(thumbnail_mode)\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(1.0f, 0.0f, 0.0f));\r
-               graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f));           \r
-               \r
-               for(int n = 0; n < 32 && muxer_.empty(); ++n)\r
-                       decode_frame(0);\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
+       \r
+               try\r
+               {\r
+                       video_decoder_.reset(new video_decoder(input_.context()));\r
+                       if (!thumbnail_mode_)\r
+                               CASPAR_LOG(info) << print() << L" " << video_decoder_->print();\r
+               }\r
+               catch(averror_stream_not_found&)\r
+               {\r
+                       //CASPAR_LOG(warning) << print() << " No video-stream found. Running without video.";   \r
+               }\r
+               catch(...)\r
+               {\r
+                       if (!thumbnail_mode_)\r
+                       {\r
+                               CASPAR_LOG_CURRENT_EXCEPTION();\r
+                               CASPAR_LOG(warning) << print() << "Failed to open video-stream. Running without video.";        \r
+                       }\r
+               }\r
+\r
+               core::channel_layout audio_channel_layout = core::default_channel_layout_repository().get_by_name(L"STEREO");\r
+\r
+               if (!thumbnail_mode_)\r
+               {\r
+                       try\r
+                       {\r
+                               audio_decoder_.reset(new audio_decoder(input_.context(), frame_factory->get_video_format_desc(), custom_channel_order));\r
+                               audio_channel_layout = audio_decoder_->channel_layout();\r
+                               CASPAR_LOG(info) << print() << L" " << audio_decoder_->print();\r
+                       }\r
+                       catch(averror_stream_not_found&)\r
+                       {\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) << print() << " Failed to open audio-stream. Running without audio.";               \r
+                       }\r
+               }\r
+\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(fps_, frame_factory, thumbnail_mode_, audio_channel_layout, filter));\r
        }\r
-                       \r
-       virtual safe_ptr<core::basic_frame> receive(int hints)\r
+\r
+       // frame_producer\r
+       \r
+       virtual safe_ptr<core::basic_frame> receive(int hints) override\r
        {\r
-               auto frame = core::basic_frame::late();\r
-               \r
+               return render_frame(hints).first;\r
+       }\r
+\r
+       virtual safe_ptr<core::basic_frame> last_frame() const override\r
+       {\r
+               return disable_audio(last_frame_);\r
+       }\r
+\r
+       std::pair<safe_ptr<core::basic_frame>, uint32_t> render_frame(int hints)\r
+       {               \r
                frame_timer_.restart();\r
+               auto disable_logging = temporary_disable_logging_for_thread(thumbnail_mode_);\r
+                               \r
+               for(int n = 0; n < 16 && frame_buffer_.size() < 2; ++n)\r
+                       try_decode_frame(hints);\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
+               graph_->set_value("frame-time", frame_timer_.elapsed()*format_desc_.fps*0.5);\r
 \r
-               if(!muxer_.empty())\r
-                       frame = last_frame_ = muxer_.pop();     \r
-               else\r
+               if (frame_buffer_.empty())\r
                {\r
-                       if(input_.eof())\r
-                               return core::basic_frame::eof();\r
+                       if (input_.eof())\r
+                       {\r
+                               send_osc();\r
+                               return std::make_pair(last_frame(), -1);\r
+                       }\r
+                       else if (resource_type_ == FFMPEG_FILE)\r
+                       {\r
+                               graph_->set_tag("underflow");  \r
+                               send_osc();\r
+                               return std::make_pair(core::basic_frame::late(), -1);     \r
+                       }\r
                        else\r
                        {\r
-                               graph_->add_tag("underflow");   \r
-                               ++late_frames_;         \r
+                               send_osc();\r
+                               return std::make_pair(last_frame(), -1);\r
                        }\r
                }\r
                \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
+               last_frame_ = frame.first;\r
+\r
+               send_osc();\r
+\r
                return frame;\r
        }\r
 \r
-       virtual safe_ptr<core::basic_frame> last_frame() const\r
+       void send_osc()\r
        {\r
-               return disable_audio(last_frame_);\r
+               monitor_subject_        << core::monitor::message("/profiler/time")             % frame_timer_.elapsed() % (1.0/format_desc_.fps);                      \r
+                                                               \r
+               monitor_subject_        << core::monitor::message("/file/time")                 % (file_frame_number()/fps_) \r
+                                                                                                                                                       % (file_nb_frames()/fps_)\r
+                                                       << core::monitor::message("/file/frame")                        % static_cast<int32_t>(file_frame_number())\r
+                                                                                                                                                       % static_cast<int32_t>(file_nb_frames())\r
+                                                       << core::monitor::message("/file/fps")                  % fps_\r
+                                                       << core::monitor::message("/file/path")                 % path_relative_to_media_\r
+                                                       << core::monitor::message("/loop")                              % input_.loop();\r
        }\r
-\r
-       void decode_frame(int hints)\r
+       \r
+       safe_ptr<core::basic_frame> render_specific_frame(uint32_t file_position, int hints)\r
        {\r
-               for(int n = 0; n < 16 && ((!muxer_.video_ready() && !video_decoder_.ready()) || (!muxer_.audio_ready() && !audio_decoder_.ready())); ++n) \r
+               // Some trial and error and undeterministic stuff here\r
+               static const int NUM_RETRIES = 32;\r
+               \r
+               if (file_position > 0) // Assume frames are requested in sequential order,\r
+                                          // therefore no seeking should be necessary for the first frame.\r
+               {\r
+                       input_.seek(file_position > 1 ? file_position - 2: file_position).get();\r
+                       boost::this_thread::sleep(boost::posix_time::milliseconds(40));\r
+               }\r
+\r
+               for (int i = 0; i < NUM_RETRIES; ++i)\r
                {\r
-                       std::shared_ptr<AVPacket> pkt;\r
-                       if(input_.try_pop(pkt))\r
+                       boost::this_thread::sleep(boost::posix_time::milliseconds(40));\r
+               \r
+                       auto frame = render_frame(hints);\r
+\r
+                       if (frame.second == std::numeric_limits<uint32_t>::max())\r
+                       {\r
+                               // Retry\r
+                               continue;\r
+                       }\r
+                       else if (frame.second == file_position + 1 || frame.second == file_position)\r
+                               return frame.first;\r
+                       else if (frame.second > file_position + 1)\r
                        {\r
-                               video_decoder_.push(pkt);\r
-                               audio_decoder_.push(pkt);\r
+                               CASPAR_LOG(trace) << print() << L" " << frame.second << L" received, wanted " << file_position + 1;\r
+                               int64_t adjusted_seek = file_position - (frame.second - file_position + 1);\r
+\r
+                               if (adjusted_seek > 1 && file_position > 0)\r
+                               {\r
+                                       CASPAR_LOG(trace) << print() << L" adjusting to " << adjusted_seek;\r
+                                       input_.seek(static_cast<uint32_t>(adjusted_seek) - 1).get();\r
+                                       boost::this_thread::sleep(boost::posix_time::milliseconds(40));\r
+                               }\r
+                               else\r
+                                       return frame.first;\r
                        }\r
                }\r
-               \r
-               tbb::parallel_invoke(\r
-               [&]\r
+\r
+               CASPAR_LOG(trace) << print() << " Giving up finding frame at " << file_position;\r
+               return core::basic_frame::empty();\r
+       }\r
+\r
+       virtual safe_ptr<core::basic_frame> create_thumbnail_frame() override\r
+       {\r
+               auto disable_logging = temporary_disable_logging_for_thread(thumbnail_mode_);\r
+               auto total_frames = nb_frames();\r
+               auto grid = env::properties().get(L"configuration.thumbnails.video-grid", 2);\r
+\r
+               if (grid < 1)\r
                {\r
-                       if(muxer_.video_ready())\r
-                               return;\r
+                       CASPAR_LOG(error) << L"configuration/thumbnails/video-grid cannot be less than 1";\r
+                       BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("configuration/thumbnails/video-grid cannot be less than 1"));\r
+               }\r
 \r
-                       auto video_frames = video_decoder_.poll();\r
-                       BOOST_FOREACH(auto& video, video_frames)                \r
-                               muxer_.push(video, hints);      \r
-               },\r
-               [&]\r
+               if (grid == 1)\r
                {\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
+                       return render_specific_frame(total_frames / 2, 0/*DEINTERLACE_HINT*/);\r
+               }\r
+\r
+               auto num_snapshots = grid * grid;\r
+\r
+               std::vector<safe_ptr<core::basic_frame>> frames;\r
+\r
+               for (int i = 0; i < num_snapshots; ++i)\r
+               {\r
+                       int x = i % grid;\r
+                       int y = i / grid;\r
+                       int desired_frame;\r
+                       \r
+                       if (i == 0)\r
+                               desired_frame = 0; // first\r
+                       else if (i == num_snapshots - 1)\r
+                               desired_frame = total_frames - 1; // last\r
+                       else\r
+                               // evenly distributed across the file.\r
+                               desired_frame = total_frames * i / (num_snapshots - 1);\r
+\r
+                       auto frame = render_specific_frame(desired_frame, 0/*DEINTERLACE_HINT*/);\r
+                       frame->get_frame_transform().fill_scale[0] = 1.0 / static_cast<double>(grid);\r
+                       frame->get_frame_transform().fill_scale[1] = 1.0 / static_cast<double>(grid);\r
+                       frame->get_frame_transform().fill_translation[0] = 1.0 / static_cast<double>(grid) * x;\r
+                       frame->get_frame_transform().fill_translation[1] = 1.0 / static_cast<double>(grid) * y;\r
+\r
+                       frames.push_back(frame);\r
+               }\r
+\r
+               return make_safe<core::basic_frame>(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 uint32_t nb_frames() const override\r
+       {\r
+               //if(input_.loop())\r
+               if(resource_type_ == FFMPEG_DEVICE || resource_type_ == FFMPEG_STREAM || input_.loop()) \r
+                       return std::numeric_limits<uint32_t>::max();\r
+\r
+               uint32_t nb_frames = file_nb_frames();\r
+\r
+               nb_frames = std::min(length_, nb_frames);\r
+               nb_frames = muxer_->calc_nb_frames(nb_frames);\r
+               \r
+               return nb_frames > start_ ? nb_frames - start_ : 0;\r
+       }\r
 \r
-               muxer_.commit();\r
+       uint32_t file_nb_frames() const\r
+       {\r
+               uint32_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 boost::unique_future<std::wstring> call(const std::wstring& param) override\r
+       {\r
+               boost::promise<std::wstring> promise;\r
+               promise.set_value(do_call(param));\r
+               return promise.get_future();\r
+       }\r
+                               \r
+       virtual std::wstring print() const override\r
+       {\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
-       virtual int64_t nb_frames() const \r
+       boost::property_tree::wptree info() const override\r
        {\r
-               if(loop_)\r
-                       return std::numeric_limits<int64_t>::max();\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
-               // This function estimates nb_frames until input has read all packets for one loop, at which point the count should be accurate.\r
+       // ffmpeg_producer\r
 \r
-               int64_t nb_frames = input_.nb_frames();\r
-               if(input_.nb_loops() < 1) // input still hasn't counted all frames\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
+               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
+               if(boost::regex_match(param, what, loop_exp))\r
+               {\r
+                       if(!what["VALUE"].str().empty())\r
+                               input_.loop(boost::lexical_cast<bool>(what["VALUE"].str()));\r
+                       return boost::lexical_cast<std::wstring>(input_.loop());\r
+               }\r
+               if(boost::regex_match(param, what, seek_exp))\r
                {\r
-                       int64_t video_nb_frames = video_decoder_.nb_frames();\r
-                       int64_t audio_nb_frames = audio_decoder_.nb_frames();\r
+                       input_.seek(boost::lexical_cast<uint32_t>(what["VALUE"].str()));\r
+                       return L"";\r
+               }\r
+\r
+               BOOST_THROW_EXCEPTION(invalid_argument());\r
+       }\r
+\r
+       void try_decode_frame(int hints)\r
+       {\r
+               std::shared_ptr<AVPacket> pkt;\r
 \r
-                       nb_frames = std::max(nb_frames, std::max(video_nb_frames, audio_nb_frames));\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
-               nb_frames = muxer_.calc_nb_frames(nb_frames);\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, hints);\r
+               muxer_->push(audio);\r
 \r
-               // TODO: Might need to scale nb_frames av frame_muxer transformations.\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
-               return nb_frames + late_frames_ - start_;\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
+               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(std::make_pair(make_safe_ptr(frame), file_frame_number));\r
        }\r
-                               \r
-       virtual std::wstring print() const\r
+\r
+       core::monitor::source& monitor_output()\r
        {\r
-               return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"]";\r
+               return monitor_subject_;\r
        }\r
 };\r
 \r
-safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_producer> create_producer(\r
+               const safe_ptr<core::frame_factory>& frame_factory,\r
+               const core::parameters& params)\r
 {              \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"wmv")(L"wma")(L"ogg")(L"divx")(L"xvid")(L"wav")(L"mp3")(L"m2v");\r
-       std::wstring filename = env::media_folder() + L"\\" + params[0];\r
-       \r
-       auto ext = boost::find_if(extensions, [&](const std::wstring& ex)\r
-       {                                       \r
-               return boost::filesystem::is_regular_file(boost::filesystem::wpath(filename + L"." + ex));\r
-       });\r
-\r
-       if(ext == extensions.end())\r
-               return core::frame_producer::empty();\r
-\r
-       std::wstring path = filename + L"." + *ext;\r
-       bool loop = boost::find(params, L"LOOP") != params.end();\r
+       static const std::vector<std::wstring> invalid_exts = boost::assign::list_of(L".png")(L".tga")(L".bmp")(L".jpg")(L".jpeg")(L".gif")(L".tiff")(L".tif")(L".jp2")(L".jpx")(L".j2k")(L".j2c")(L".swf")(L".ct");\r
 \r
-       size_t start = 0;\r
-       size_t length = std::numeric_limits<size_t>::max();\r
-       \r
-       auto seek_it = boost::find(params, L"SEEK");\r
-       if(seek_it != params.end())\r
+       // Infer the resource type from the resource_name\r
+       auto resource_type = FFMPEG_FILE;\r
+       auto tokens = core::parameters::protocol_split(params.at_original(0));\r
+       auto filename = params.at_original(0);\r
+       if (!tokens[0].empty())\r
        {\r
-               if(++seek_it != params.end())\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
+               if (tokens[0] == L"dshow")\r
+               {\r
+                       // Camera\r
+                       resource_type = FFMPEG_DEVICE;\r
+                       filename = tokens[1];\r
+               } else\r
+               {\r
+                       // Stream\r
+                       resource_type = FFMPEG_STREAM;\r
+                       filename = params.at_original(0);\r
+               }\r
+       } else\r
        {\r
-               if(++length_it != params.end())\r
-                       length = boost::lexical_cast<size_t>(*length_it);\r
+               // File\r
+               resource_type = FFMPEG_FILE;\r
+               filename = env::media_folder() + L"\\" + tokens[1];\r
+               if(!boost::filesystem::exists(filename))\r
+                       filename = probe_stem(filename);\r
+\r
+               //TODO fix these?\r
+               //vid_params->loop       = params.has(L"LOOP");\r
+               //vid_params->start     = params.get(L"SEEK", static_cast<uint32_t>(0));\r
        }\r
 \r
-       std::wstring filter = L"";\r
-       auto filter_it = boost::find(params, L"FILTER");\r
-       if(filter_it != params.end())\r
+       if(filename.empty())\r
+               return core::frame_producer::empty();\r
+       \r
+       auto loop               = params.has(L"LOOP");\r
+       auto start              = params.get(L"SEEK", static_cast<uint32_t>(0));\r
+       auto length             = params.get(L"LENGTH", std::numeric_limits<uint32_t>::max());\r
+       auto filter_str = params.get(L"FILTER", L"");   \r
+       auto custom_channel_order       = params.get(L"CHANNEL_LAYOUT", L"");\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
+       ffmpeg_producer_params vid_params;\r
+       bool haveFFMPEGStartIndicator = false;\r
+       for (size_t i = 0; i < params.size() - 1; ++i)\r
        {\r
-               if(++filter_it != params.end())\r
-                       filter = *filter_it;\r
+               if (!haveFFMPEGStartIndicator && params[i] == L"--")\r
+               {\r
+                       haveFFMPEGStartIndicator = true;\r
+                       continue;\r
+               }\r
+               if (haveFFMPEGStartIndicator)\r
+               {\r
+                       auto name = narrow(params.at_original(i++)).substr(1);\r
+                       auto value = narrow(params.at_original(i));\r
+                       vid_params.options.push_back(option(name, value));\r
+               }\r
        }\r
 \r
-       return make_safe<ffmpeg_producer>(frame_factory, path, filter, loop, start, length);\r
+       \r
+       return create_producer_destroy_proxy(make_safe<ffmpeg_producer>(frame_factory, filename, resource_type, filter_str, loop, start, length, false, custom_channel_order, vid_params));\r
+}\r
+\r
+safe_ptr<core::frame_producer> create_thumbnail_producer(\r
+               const safe_ptr<core::frame_factory>& frame_factory,\r
+               const core::parameters& params)\r
+{              \r
+       static const std::vector<std::wstring> invalid_exts = boost::assign::list_of\r
+                       (L".png")(L".tga")(L".bmp")(L".jpg")(L".jpeg")(L".gif")(L".tiff")(L".tif")(L".jp2")(L".jpx")(L".j2k")(L".j2c")(L".swf")(L".ct")\r
+                       (L".wav")(L".mp3"); // audio shall not have thumbnails\r
+       auto filename = probe_stem(env::media_folder() + L"\\" + params.at_original(0), invalid_exts);\r
+\r
+       if(filename.empty())\r
+               return core::frame_producer::empty();\r
+       \r
+       auto loop               = false;\r
+       auto start              = 0;\r
+       auto length             = std::numeric_limits<uint32_t>::max();\r
+       auto filter_str = L"";\r
+\r
+       ffmpeg_producer_params vid_params;\r
+       return make_safe<ffmpeg_producer>(frame_factory, filename, FFMPEG_FILE, filter_str, loop, start, length, true, L"", vid_params);\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file