git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

[casparcg] / modules / ffmpeg / producer / video / video_decoder.h

diff --git a/modules/ffmpeg/producer/video/video_decoder.h b/modules/ffmpeg/producer/video/video_decoder.h
index 7676bafd9e4f7026f096f76c14c208db5c42a786..743bf749ae449323b84bca289a7b24a6dd44f663 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.h
+++ b/modules/ffmpeg/producer/video/video_decoder.h
@@ -21,19 +21,38 @@
 \r
 #include <common/memory/safe_ptr.h>\r
 \r
-#include <core/mixer/frame_mixer_device.h>\r
+#include <core/video_format.h>\r
 \r
-struct AVCodecContext;\r
+#include <boost/noncopyable.hpp>\r
+\r
+#include <vector>\r
+\r
+struct AVFormatContext;\r
+struct AVFrame;\r
+struct AVPacket;\r
 \r
 namespace caspar {\r
-       \r
-typedef std::vector<unsigned char, tbb::cache_aligned_allocator<unsigned char>> aligned_buffer;\r
+\r
+namespace core {\r
+       struct frame_factory;\r
+       class write_frame;\r
+}\r
 \r
 class video_decoder : boost::noncopyable\r
 {\r
 public:\r
-       explicit video_decoder(AVCodecContext* codec_context, const safe_ptr<core::frame_factory>& frame_factory);\r
-       std::shared_ptr<core::write_frame> execute(void* tag, const aligned_buffer& video_packet);      \r
+       explicit video_decoder(const safe_ptr<AVFormatContext>& context, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter);\r
+       \r
+       void push(const std::shared_ptr<AVPacket>& packet);\r
+       bool ready() const;\r
+       std::vector<std::shared_ptr<AVFrame>> poll();\r
+       \r
+       size_t width() const;\r
+       size_t height() const;\r
+\r
+       int64_t nb_frames() const;\r
+\r
+       double fps() const;\r
 private:\r
        struct implementation;\r
        safe_ptr<implementation> impl_;\r