\r
#include "display_mode.h"\r
\r
-#include <common/memory/safe_ptr.h>\r
+#include <common/forward.h>\r
+#include <common/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
\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"", display_mode::type force_deinterlace_mode = display_mode::deinterlace_bob_reinterlace);\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);\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
-\r
- void force_deinterlacing(bool value);\r
+ void clear();\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