2.0. Updated namespaces.

[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 12b84251ea826039a4abf49e4432934e8dd66c23..1351e881bf0f5ee35fd8b4e2ac078b30d077f4ad 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.h
+++ b/modules/ffmpeg/producer/video/video_decoder.h
@@ -21,23 +21,43 @@
 \r
 #include <common/memory/safe_ptr.h>\r
 \r
-#include "../input.h"\r
+#include <core/video_format.h>\r
+\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
+\r
 namespace core {\r
        struct frame_factory;\r
        class write_frame;\r
 }\r
 \r
+namespace ffmpeg {\r
+\r
 class video_decoder : boost::noncopyable\r
 {\r
 public:\r
-       explicit video_decoder(input& input, const safe_ptr<core::frame_factory>& frame_factory, const std::string& filter);\r
-       std::deque<std::pair<int, safe_ptr<core::write_frame>>> receive();      \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
 };\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file