]> git.sesse.net Git - casparcg/blobdiff - modules/ffmpeg/producer/muxer/frame_muxer.cpp
2.1.0: Refactoring. Simplified frame handling.
[casparcg] / modules / ffmpeg / producer / muxer / frame_muxer.cpp
index 067b24424e256ef7686594a08688d24629e769e1..9f633ae9c1811d6e27e5c945b8935436d594500b 100644 (file)
@@ -1,23 +1,41 @@
+/*\r
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+*\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
+*\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 "frame_muxer.h"\r
 \r
-#include "display_mode.h"\r
-\r
 #include "../filter/filter.h"\r
 #include "../util/util.h"\r
 \r
 #include <core/producer/frame_producer.h>\r
-#include <core/producer/frame/basic_frame.h>\r
-#include <core/producer/frame/frame_factory.h>\r
-#include <core/mixer/write_frame.h>\r
+#include <core/frame/draw_frame.h>\r
+#include <core/frame/frame_transform.h>\r
+#include <core/frame/pixel_format.h>\r
+#include <core/frame/frame_factory.h>\r
+#include <core/mixer/gpu/write_frame.h>\r
 \r
-#include <common/concurrency/governor.h>\r
 #include <common/env.h>\r
 #include <common/exception/exceptions.h>\r
-#include <common/log/log.h>\r
-\r
-#include <boost/range/algorithm_ext/push_back.hpp>\r
+#include <common/log.h>\r
 \r
 #if defined(_MSC_VER)\r
 #pragma warning (push)\r
@@ -34,285 +52,336 @@ extern "C"
 #pragma warning (pop)\r
 #endif\r
 \r
-#include <agents.h>\r
+#include <common/assert.h>\r
+#include <boost/foreach.hpp>\r
+#include <boost/range/algorithm_ext/push_back.hpp>\r
+#include <boost/algorithm/string/predicate.hpp>\r
+\r
+#include <deque>\r
+#include <queue>\r
+#include <vector>\r
 \r
-using namespace Concurrency;\r
+using namespace caspar::core;\r
 \r
 namespace caspar { namespace ffmpeg {\r
        \r
-struct frame_muxer2::implementation : public Concurrency::agent, boost::noncopyable\r
-{              \r
-       frame_muxer2::video_source_t* video_source_;\r
-       frame_muxer2::audio_source_t* audio_source_;\r
-\r
-       ITarget<frame_muxer2::target_element_t>&                        target_;\r
-       mutable single_assignment<display_mode::type>           display_mode_;\r
-       const double                                                                            in_fps_;\r
-       const core::video_format_desc                                           format_desc_;\r
-       const bool                                                                                      auto_transcode_;\r
+struct frame_muxer::impl : boost::noncopyable\r
+{      \r
+       std::queue<std::queue<safe_ptr<write_frame>>>   video_streams_;\r
+       std::queue<core::audio_buffer>                                  audio_streams_;\r
+       std::queue<safe_ptr<draw_frame>>                                frame_buffer_;\r
+       display_mode                                                            display_mode_;\r
+       const double                                                                    in_fps_;\r
+       const video_format_desc                                                 format_desc_;\r
+       bool                                                                                    auto_transcode_;\r
+       bool                                                                                    auto_deinterlace_;\r
        \r
-       mutable single_assignment<safe_ptr<filter>>                     filter_;\r
-       const safe_ptr<core::frame_factory>                                     frame_factory_;\r
+       std::vector<int>                                                                audio_cadence_;\r
                        \r
-       core::audio_buffer                                                                      audio_data_;\r
+       safe_ptr<core::frame_factory>                                   frame_factory_;\r
        \r
-       std::wstring                                                                            filter_str_;\r
-\r
-       governor                                                                                        governor_;\r
-\r
-       tbb::atomic<bool>                                                                       is_running_;\r
-       \r
-       size_t                                                                                          video_loop_count_;\r
-       size_t                                                                                          audio_loop_count_;\r
+       filter                                                                                  filter_;\r
+       const std::wstring                                                              filter_str_;\r
+       bool                                                                                    force_deinterlacing_;\r
                \r
-       implementation(frame_muxer2::video_source_t* video_source,\r
-                                  frame_muxer2::audio_source_t* audio_source,\r
-                                  frame_muxer2::target_t& target,\r
-                                  double in_fps, \r
-                                  const safe_ptr<core::frame_factory>& frame_factory,\r
-                                  const std::wstring& filter)\r
-               : video_source_(video_source)\r
-               , audio_source_(audio_source)\r
-               , target_(target)\r
+       impl(double in_fps, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter_str)\r
+               : display_mode_(display_mode::invalid)\r
                , in_fps_(in_fps)\r
                , format_desc_(frame_factory->get_video_format_desc())\r
-               , auto_transcode_(env::properties().get("configuration.producers.auto-transcode", false))\r
+               , auto_transcode_(env::properties().get(L"configuration.auto-transcode", true))\r
+               , auto_deinterlace_(env::properties().get(L"configuration.auto-deinterlace", true))\r
+               , audio_cadence_(format_desc_.audio_cadence)\r
                , frame_factory_(frame_factory)\r
-               , governor_(2)\r
-               , video_loop_count_(0)\r
-               , audio_loop_count_(0)\r
-       {               \r
-               is_running_ = true;\r
-               start();\r
-       }\r
-\r
-       ~implementation()\r
+               , filter_str_(filter_str)\r
+               , force_deinterlacing_(false)\r
        {\r
-               is_running_ = false;\r
-               governor_.cancel();\r
-               agent::wait(this);\r
-       }\r
-                               \r
-       std::shared_ptr<core::write_frame> receive_video()\r
-       {       \r
-               if(!video_source_)\r
-                       return make_safe<core::write_frame>(this);      \r
-\r
-               auto video = filter_.has_value() ? filter_.value()->poll() : nullptr;\r
-               if(video_loop_count_ >= audio_loop_count_ && video)             \r
-                       return make_write_frame(this, make_safe_ptr(video), frame_factory_, 0);         \r
+               video_streams_.push(std::queue<safe_ptr<write_frame>>());\r
+               audio_streams_.push(core::audio_buffer());\r
                \r
-               video = receive(video_source_);\r
+               // Note: Uses 1 step rotated cadence for 1001 modes (1602, 1602, 1601, 1602, 1601)\r
+               // This cadence fills the audio mixer most optimally.\r
+               boost::range::rotate(audio_cadence_, std::end(audio_cadence_)-1);\r
+       }\r
+\r
+       void push(const std::shared_ptr<AVFrame>& video_frame, int flags)\r
+       {               \r
+               if(!video_frame)\r
+                       return;\r
                \r
-               if(video == flush_video())\r
+               if(video_frame == flush_video())\r
+               {       \r
+                       video_streams_.push(std::queue<safe_ptr<write_frame>>());\r
+               }\r
+               else if(video_frame == empty_video())\r
                {\r
-                       ++video_loop_count_;\r
-                       return receive_video();\r
+                       video_streams_.back().push(make_safe<core::write_frame>(this));\r
+                       display_mode_ = display_mode::simple;\r
                }\r
+               else\r
+               {\r
+                       bool DEINTERLACE_FLAG = (flags & core::frame_producer::flags::deinterlace) != 0;\r
+               \r
+                       if(auto_deinterlace_ && force_deinterlacing_ != DEINTERLACE_FLAG)\r
+                       {\r
+                               force_deinterlacing_ = DEINTERLACE_FLAG;\r
+                               display_mode_ = display_mode::invalid;\r
+                       }\r
 \r
-               if(video == eof_video())\r
-                       return nullptr;         \r
+                       if(display_mode_ == display_mode::invalid)\r
+                               update_display_mode(video_frame, force_deinterlacing_);\r
+                               \r
+                       if(flags & core::frame_producer::flags::alpha_only)\r
+                               video_frame->format = make_alpha_format(video_frame->format);\r
+               \r
+                       auto format = video_frame->format;\r
+                       if(video_frame->format == CASPAR_PIX_FMT_LUMA) // CASPAR_PIX_FMT_LUMA is not valid for filter, change it to GRAY8\r
+                               video_frame->format = PIX_FMT_GRAY8;\r
 \r
-               if(!display_mode_.has_value())\r
-                       initialize_display_mode(*video);\r
-                       \r
-               filter_.value()->push(video);\r
-               video.reset();\r
+                       filter_.push(video_frame);\r
+                       BOOST_FOREACH(auto& av_frame, filter_.poll_all())\r
+                       {\r
+                               if(video_frame->format == PIX_FMT_GRAY8 && format == CASPAR_PIX_FMT_LUMA)\r
+                                       av_frame->format = format;\r
 \r
-               return receive_video();\r
-       }\r
-       \r
-       std::shared_ptr<core::audio_buffer> receive_audio()\r
-       {               \r
-               if(!audio_source_)\r
-                       return make_safe<core::audio_buffer>(format_desc_.audio_samples_per_frame, 0);\r
-                                       \r
-               if(audio_loop_count_ >= video_loop_count_ && audio_data_.size() >= format_desc_.audio_samples_per_frame)\r
-               {\r
-                       auto begin = audio_data_.begin(); \r
-                       auto end   = begin + format_desc_.audio_samples_per_frame;\r
-                       auto audio = make_safe<core::audio_buffer>(begin, end);\r
-                       audio_data_.erase(begin, end);\r
-                       return audio;\r
+                               video_streams_.back().push(make_write_frame(this, av_frame, frame_factory_, flags));\r
+                       }\r
                }\r
-                               \r
-               std::shared_ptr<core::audio_buffer> audio = receive(audio_source_);\r
+\r
+               if(video_streams_.back().size() > 32)\r
+                       BOOST_THROW_EXCEPTION(invalid_operation() << source_info("frame_muxer") << msg_info("video-stream overflow. This can be caused by incorrect frame-rate. Check clip meta-data."));\r
+       }\r
+\r
+       void push(const std::shared_ptr<core::audio_buffer>& audio)\r
+       {\r
+               if(!audio)      \r
+                       return;\r
 \r
                if(audio == flush_audio())\r
                {\r
-                       CASPAR_LOG(info) << L"Truncating: " << audio_data_.size() << L" audio-samples:";\r
-                       audio_data_.clear();\r
-                       ++audio_loop_count_;\r
-                       return receive_audio();         \r
+                       audio_streams_.push(core::audio_buffer());\r
+               }\r
+               else if(audio == empty_audio())\r
+               {\r
+                       boost::range::push_back(audio_streams_.back(), core::audio_buffer(audio_cadence_.front(), 0));\r
+               }\r
+               else\r
+               {\r
+                       boost::range::push_back(audio_streams_.back(), *audio);\r
                }\r
 \r
-               if(audio == eof_audio())\r
-                       return nullptr;\r
-\r
-               audio_data_.insert(audio_data_.end(), audio->begin(), audio->end());    \r
-               audio.reset();\r
-               \r
-               return receive_audio();\r
+               if(audio_streams_.back().size() > static_cast<size_t>(32*audio_cadence_.front()))\r
+                       BOOST_THROW_EXCEPTION(invalid_operation() << source_info("frame_muxer") << msg_info("audio-stream overflow. This can be caused by incorrect frame-rate. Check clip meta-data."));\r
        }\r
-                       \r
-       virtual void run()\r
+       \r
+       bool video_ready() const\r
+       {               \r
+               return video_streams_.size() > 1 || (video_streams_.size() >= audio_streams_.size() && video_ready2());\r
+       }\r
+       \r
+       bool audio_ready() const\r
        {\r
-               win32_exception::install_handler();\r
+               return audio_streams_.size() > 1 || (audio_streams_.size() >= video_streams_.size() && audio_ready2());\r
+       }\r
 \r
-               try\r
+       bool video_ready2() const\r
+       {               \r
+               switch(display_mode_)\r
                {\r
-                       while(is_running_ && display())\r
-                       {       \r
-                       }                               \r
+               case display_mode::deinterlace_bob_reinterlace:                                 \r
+               case display_mode::interlace:   \r
+               case display_mode::half:\r
+                       return video_streams_.front().size() >= 2;\r
+               default:                                                                                \r
+                       return video_streams_.front().size() >= 1;\r
                }\r
-               catch(...)\r
+       }\r
+       \r
+       bool audio_ready2() const\r
+       {\r
+               switch(display_mode_)\r
                {\r
-                       CASPAR_LOG_CURRENT_EXCEPTION();\r
+               case display_mode::duplicate:                                   \r
+                       return audio_streams_.front().size()/2 >= static_cast<size_t>(audio_cadence_.front());\r
+               default:                                                                                \r
+                       return audio_streams_.front().size() >= static_cast<size_t>(audio_cadence_.front());\r
                }\r
-               \r
-               send(target_, frame_muxer2::target_element_t(core::basic_frame::eof(), ticket_t()));\r
-\r
-               done();\r
        }\r
-\r
-       bool display()\r
+               \r
+       std::shared_ptr<draw_frame> poll()\r
        {\r
-               auto ticket = governor_.acquire();\r
+               if(!frame_buffer_.empty())\r
+               {\r
+                       auto frame = frame_buffer_.front();\r
+                       frame_buffer_.pop();    \r
+                       return frame;\r
+               }\r
 \r
-               auto video = receive_video();\r
-               if(!video)\r
-                       return false;\r
+               if(video_streams_.size() > 1 && audio_streams_.size() > 1 && (!video_ready2() || !audio_ready2()))\r
+               {\r
+                       if(!video_streams_.front().empty() || !audio_streams_.front().empty())\r
+                               CASPAR_LOG(trace) << "Truncating: " << video_streams_.front().size() << L" video-frames, " << audio_streams_.front().size() << L" audio-samples.";\r
 \r
-               auto audio = receive_audio();\r
-               if(!audio)\r
-                       return false;\r
+                       video_streams_.pop();\r
+                       audio_streams_.pop();\r
+               }\r
+\r
+               if(!video_ready2() || !audio_ready2() || display_mode_ == display_mode::invalid)\r
+                       return nullptr;\r
                                \r
-               video->audio_data() = std::move(*audio);\r
+               auto frame1                             = pop_video();\r
+               frame1->audio_data()    = pop_audio();\r
 \r
-               switch(display_mode_.value())\r
+               switch(display_mode_)\r
                {\r
-               case display_mode::simple:                      \r
-               case display_mode::deinterlace:\r
-               case display_mode::deinterlace_bob:\r
+               case display_mode::simple:                                              \r
+               case display_mode::deinterlace_bob:                             \r
+               case display_mode::deinterlace\r
                        {\r
-                               send(target_, frame_muxer2::target_element_t(video, ticket));\r
-                               \r
-                               return true;\r
+                               frame_buffer_.push(frame1);\r
+                               break;\r
                        }\r
-               case display_mode::duplicate:                                   \r
-                       {                       \r
-                               send(target_, frame_muxer2::target_element_t(video, ticket));\r
-                                                               \r
-                               auto video2 = make_safe<core::write_frame>(*video);     \r
-                               auto audio2 = receive_audio();\r
-\r
-                               if(audio2)\r
-                               {\r
-                                       video2->audio_data() = std::move(*audio2);\r
-                                       send(target_, frame_muxer2::target_element_t(video2, ticket));\r
-                               }\r
-\r
-                               return audio2 != nullptr;\r
+               case display_mode::interlace:                                   \r
+               case display_mode::deinterlace_bob_reinterlace: \r
+                       {                               \r
+                               auto frame2 = pop_video();\r
+\r
+                               frame_buffer_.push(core::draw_frame::interlace(frame1, frame2, format_desc_.field_mode));       \r
+                               break;\r
                        }\r
-               case display_mode::half:                                                \r
-                       {                                                               \r
-                               send(target_, frame_muxer2::target_element_t(video, ticket));\r
-                               auto video2 = receive_video(); // throw away\r
-                               \r
-                               return video2 != nullptr;\r
+               case display_mode::duplicate:   \r
+                       {\r
+                               // TODO: Test this!\r
+                               auto frame2                             = frame1;\r
+                               boost::range::push_back(frame2->audio_data(), pop_audio());\r
+\r
+                               frame_buffer_.push(frame1);\r
+                               frame_buffer_.push(frame2);\r
+                               break;\r
                        }\r
-               case display_mode::deinterlace_bob_reinterlace:\r
-               case display_mode::interlace:                                   \r
-                       {                                       \r
-                               std::shared_ptr<core::basic_frame> video2 = receive_video();\r
-                               if(!video2)\r
-                                       video2 = core::basic_frame::empty();\r
-                                                                                               \r
-                               auto frame = core::basic_frame::interlace(make_safe_ptr(video), make_safe_ptr(video2), format_desc_.field_mode);        \r
-                               send(target_, frame_muxer2::target_element_t(frame, ticket));\r
-                               \r
-                               return video2 != nullptr;\r
+               case display_mode::half:        \r
+                       {                               \r
+                               pop_video(); // Throw away\r
+\r
+                               frame_buffer_.push(frame1);\r
+                               break;\r
                        }\r
-               default:        \r
-                       BOOST_THROW_EXCEPTION(invalid_operation() << msg_info("invalid display-mode"));\r
                }\r
-       }       \r
+               \r
+               return frame_buffer_.empty() ? nullptr : poll();\r
+       }\r
        \r
-       void initialize_display_mode(AVFrame& frame)\r
+       safe_ptr<core::write_frame> pop_video()\r
+       {\r
+               auto frame = video_streams_.front().front();\r
+               video_streams_.front().pop();           \r
+               return frame;\r
+       }\r
+\r
+       core::audio_buffer pop_audio()\r
+       {\r
+               CASPAR_VERIFY(audio_streams_.front().size() >= static_cast<size_t>(audio_cadence_.front()));\r
+\r
+               auto begin = audio_streams_.front().begin();\r
+               auto end   = begin + audio_cadence_.front();\r
+\r
+               core::audio_buffer samples(begin, end);\r
+               audio_streams_.front().erase(begin, end);\r
+               \r
+               boost::range::rotate(audio_cadence_, std::begin(audio_cadence_)+1);\r
+\r
+               return samples;\r
+       }\r
+                               \r
+       void update_display_mode(const std::shared_ptr<AVFrame>& frame, bool force_deinterlace)\r
        {\r
-               auto display_mode = display_mode::invalid;\r
+               std::wstring filter_str = filter_str_;\r
 \r
+               display_mode_ = display_mode::simple;\r
                if(auto_transcode_)\r
                {\r
-                       auto mode = get_mode(frame);\r
+                       auto mode = get_mode(*frame);\r
                        auto fps  = in_fps_;\r
 \r
-                       if(is_deinterlacing(filter_str_))\r
+                       if(filter::is_deinterlacing(filter_str_))\r
                                mode = core::field_mode::progressive;\r
 \r
-                       if(is_double_rate(filter_str_))\r
+                       if(filter::is_double_rate(filter_str_))\r
                                fps *= 2;\r
-\r
-                       display_mode = get_display_mode(mode, fps, format_desc_.field_mode, format_desc_.fps);\r
                        \r
-                       if(display_mode == display_mode::simple && mode != core::field_mode::progressive && format_desc_.field_mode != core::field_mode::progressive && frame.height != static_cast<int>(format_desc_.height))\r
-                               display_mode = display_mode::deinterlace_bob_reinterlace; // The frame will most likely be scaled, we need to deinterlace->reinterlace  \r
-                               \r
-                       if(display_mode == display_mode::deinterlace)\r
-                               append_filter(filter_str_, L"YADIF=0:-1");\r
-                       else if(display_mode == display_mode::deinterlace_bob || display_mode == display_mode::deinterlace_bob_reinterlace)\r
-                               append_filter(filter_str_, L"YADIF=1:-1");\r
+                       display_mode_ = get_display_mode(mode, fps, format_desc_.field_mode, format_desc_.fps);\r
+                       \r
+                       if((frame->height != 480 || format_desc_.height != 486) && // don't deinterlace for NTSC DV\r
+                                       display_mode_ == display_mode::simple && mode != core::field_mode::progressive && format_desc_.field_mode != core::field_mode::progressive && \r
+                                       frame->height != static_cast<int>(format_desc_.height))\r
+                       {\r
+                               display_mode_ = display_mode::deinterlace_bob_reinterlace; // The frame will most likely be scaled, we need to deinterlace->reinterlace \r
+                       }\r
+\r
+                       if(force_deinterlace && mode != core::field_mode::progressive && \r
+                          display_mode_ != display_mode::deinterlace && \r
+                          display_mode_ != display_mode::deinterlace_bob && \r
+                          display_mode_ != display_mode::deinterlace_bob_reinterlace)                  \r
+                       {       \r
+                               CASPAR_LOG(info) << L"[frame_muxer] Automatically started non bob-deinterlacing. Consider starting producer with bob-deinterlacing (FILTER DEINTERLACE_BOB) for smoothest playback.";\r
+                               display_mode_ = display_mode::deinterlace;\r
+                       }\r
+\r
+                       if(display_mode_ == display_mode::deinterlace)\r
+                               filter_str = append_filter(filter_str, L"YADIF=0:-1");\r
+                       else if(display_mode_ == display_mode::deinterlace_bob || display_mode_ == display_mode::deinterlace_bob_reinterlace)\r
+                               filter_str = append_filter(filter_str, L"YADIF=1:-1");\r
                }\r
-               else\r
-                       display_mode = display_mode::simple;\r
 \r
-               if(display_mode == display_mode::invalid)\r
+               if(display_mode_ == display_mode::invalid)\r
                {\r
-                       CASPAR_LOG(warning) << L"[frame_muxer] Failed to detect display-mode.";\r
-                       display_mode = display_mode::simple;\r
+                       CASPAR_LOG(warning) << L"[frame_muxer] Auto-transcode: Failed to detect display-mode.";\r
+                       display_mode_ = display_mode::simple;\r
                }\r
                        \r
-               send(filter_, make_safe<filter>(filter_str_));\r
-\r
-               CASPAR_LOG(info) << "[frame_muxer] " << display_mode::print(display_mode);\r
-\r
-               send(display_mode_, display_mode);\r
+               if(!boost::iequals(filter_.filter_str(), filter_str))\r
+               {\r
+                       for(int n = 0; n < filter_.delay(); ++n)\r
+                       {\r
+                               filter_.push(frame);\r
+                               auto av_frame = filter_.poll();\r
+                               if(av_frame)                                                    \r
+                                       video_streams_.back().push(make_write_frame(this, make_safe_ptr(av_frame), frame_factory_, 0));\r
+                       }\r
+                       filter_ = filter(filter_str);\r
+                       CASPAR_LOG(info) << L"[frame_muxer] " << display_mode_ << L" " << print_mode(frame->width, frame->height, in_fps_, frame->interlaced_frame > 0);\r
+               }\r
        }\r
-                                       \r
-       int64_t calc_nb_frames(int64_t nb_frames) const\r
+       \r
+       uint32_t calc_nb_frames(uint32_t nb_frames) const\r
        {\r
-               switch(display_mode_.value()) // Take into account transformation in run.\r
+               uint64_t nb_frames2 = nb_frames;\r
+               \r
+               if(filter_.is_double_rate()) // Take into account transformations in filter.\r
+                       nb_frames2 *= 2;\r
+\r
+               switch(display_mode_) // Take into account transformation in run.\r
                {\r
                case display_mode::deinterlace_bob_reinterlace:\r
                case display_mode::interlace:   \r
                case display_mode::half:\r
-                       nb_frames /= 2;\r
+                       nb_frames2 /= 2;\r
                        break;\r
                case display_mode::duplicate:\r
-                       nb_frames *= 2;\r
+                       nb_frames2 *= 2;\r
                        break;\r
                }\r
 \r
-               if(is_double_rate(widen(filter_.value()->filter_str()))) // Take into account transformations in filter.\r
-                       nb_frames *= 2;\r
-\r
-               return nb_frames;\r
+               return static_cast<uint32_t>(nb_frames2);\r
        }\r
 };\r
 \r
-frame_muxer2::frame_muxer2(video_source_t* video_source, \r
-                                                  audio_source_t* audio_source,\r
-                                                  target_t& target,\r
-                                                  double in_fps, \r
-                                                  const safe_ptr<core::frame_factory>& frame_factory,\r
-                                                  const std::wstring& filter)\r
-       : impl_(new implementation(video_source, audio_source, target, in_fps, frame_factory, filter))\r
-{\r
-}\r
-\r
-int64_t frame_muxer2::calc_nb_frames(int64_t nb_frames) const\r
-{\r
-       return impl_->calc_nb_frames(nb_frames);\r
-}\r
+frame_muxer::frame_muxer(double in_fps, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter)\r
+       : impl_(new impl(in_fps, frame_factory, filter)){}\r
+void frame_muxer::push(const std::shared_ptr<AVFrame>& video_frame, int flags){impl_->push(video_frame, flags);}\r
+void frame_muxer::push(const std::shared_ptr<core::audio_buffer>& audio_samples){return impl_->push(audio_samples);}\r
+std::shared_ptr<draw_frame> frame_muxer::poll(){return impl_->poll();}\r
+uint32_t frame_muxer::calc_nb_frames(uint32_t nb_frames) const {return impl_->calc_nb_frames(nb_frames);}\r
+bool frame_muxer::video_ready() const{return impl_->video_ready();}\r
+bool frame_muxer::audio_ready() const{return impl_->audio_ready();}\r
 \r
 }}
\ No newline at end of file