[ffmpeg] Ported 2.0.7 ffmpeg producer to 2.1.0 while still keeping the usage of the...

[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 e60da4936f29ea00905af301391a6c6203ec8651..d954dc05b05610a1d8b24d26b8cd03b7a75e573a 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.h
+++ b/modules/ffmpeg/producer/video/video_decoder.h
@@ -1,54 +1,64 @@
-/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
-*\r
-*  This file is part of CasparCG.\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
-*/\r
-#pragma once\r
-\r
-#include <common/memory/safe_ptr.h>\r
-\r
-#include <core/video_format.h>\r
-\r
-struct AVStream;\r
-\r
-namespace caspar {\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(const std::shared_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<core::write_frame>> poll();\r
-\r
-       core::video_mode::type mode();\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
+/*
+* Copyright 2013 Sveriges Television AB http://casparcg.com/
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Robert Nagy, ronag89@gmail.com
+*/
+
+#pragma once
+
+#include <common/memory.h>
+
+#include <boost/noncopyable.hpp>
+
+struct AVFormatContext;
+struct AVFrame;
+struct AVPacket;
+
+namespace caspar {
+
+namespace core {
+       class frame_factory;
+       class write_frame;
+}
+
+namespace ffmpeg {
+
+class video_decoder : boost::noncopyable
+{
+public:
+       explicit video_decoder(const spl::shared_ptr<AVFormatContext>& context);
+       
+       bool                                            ready() const;
+       void                                            push(const std::shared_ptr<AVPacket>& packet);
+       std::shared_ptr<AVFrame>        poll();
+       
+       int                                                     width() const;
+       int                                                     height() const;
+
+       uint32_t                                        nb_frames() const;
+       uint32_t                                        file_frame_number() const;
+       bool                                            is_progressive() const;
+
+       std::wstring                            print() const;
+
+private:
+       struct implementation;
+       spl::shared_ptr<implementation> impl_;
+};
+
+}}
\ No newline at end of file