### Mayor refactoring. Simplified frame handling and image_mixer. Separated video...

[casparcg] / modules / ffmpeg / producer / muxer / frame_muxer.h

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.h b/modules/ffmpeg/producer/muxer/frame_muxer.h
index 3ee2ed81015230f396b75ac7f2f4502be2dc8491..1a5e5578b6358fa9c368a1448018de03f7b9a5a5 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.h
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.h
@@ -1,8 +1,33 @@
+/*\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
 #pragma once\r
 \r
-#include <common/memory/safe_ptr.h>\r
+#include "display_mode.h"\r
+\r
+#include <common/forward.h>\r
+#include <common/spl/memory.h>\r
 \r
 #include <core/mixer/audio/audio_mixer.h>\r
+#include <core/video_format.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r
@@ -10,36 +35,30 @@
 \r
 struct AVFrame;\r
 \r
-namespace caspar { \r
-       \r
-namespace core {\r
-\r
-class write_frame;\r
-class basic_frame;\r
-struct frame_factory;\r
-\r
-}\r
+FORWARD2(caspar, core, struct pixel_format_desc);\r
+FORWARD2(caspar, core, class frame);\r
+FORWARD2(caspar, core, class frame_factory);\r
+FORWARD2(caspar, core, class draw_frame);\r
 \r
-namespace ffmpeg {\r
+namespace caspar { namespace ffmpeg {\r
 \r
 class frame_muxer : boost::noncopyable\r
 {\r
 public:\r
-       frame_muxer(double in_fps, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter = L"");\r
+       frame_muxer(double in_fps, const spl::shared_ptr<core::frame_factory>& frame_factory, const core::video_format_desc& format_desc, const std::wstring& filter = L"");\r
        \r
-       void push(const std::shared_ptr<AVFrame>& video_frame, int hints = 0);\r
+       void push(const std::shared_ptr<AVFrame>& video_frame, int flags = 0);\r
        void push(const std::shared_ptr<core::audio_buffer>& audio_samples);\r
        \r
        bool video_ready() const;\r
        bool audio_ready() const;\r
 \r
-       std::shared_ptr<core::basic_frame> poll();\r
-\r
-       int64_t calc_nb_frames(int64_t nb_frames) const;\r
+       bool try_pop(core::draw_frame& result);\r
 \r
+       uint32_t calc_nb_frames(uint32_t nb_frames) const;\r
 private:\r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
+       struct impl;\r
+       spl::shared_ptr<impl> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file