2.0.2: auto-deinterlace when using MIXER fill scaling and/or translation.

[casparcg] / core / producer / frame_producer.h

diff --git a/core/producer/frame_producer.h b/core/producer/frame_producer.h
index 93c45ddfe1019e564c34f161d8987a616ebd361a..b1f3aa5568d55b39f6adf36f8ab3b29d6a70bc0c 100644 (file)
--- a/core/producer/frame_producer.h
+++ b/core/producer/frame_producer.h
@@ -1,22 +1,24 @@
 /*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
 *\r
-*  This file is part of CasparCG.\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
+* 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
+* 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
@@ -31,7 +33,7 @@
 #include <numeric>\r
 \r
 #include <boost/thread/future.hpp>\r
-#include <boost/property_tree/ptree.hpp>\r
+#include <boost/property_tree/ptree_fwd.hpp>\r
 \r
 namespace caspar { \r
        \r
@@ -48,12 +50,14 @@ public:
        enum hints\r
        {\r
                NO_HINT = 0,\r
-               ALPHA_HINT = 1\r
+               ALPHA_HINT = 1,\r
+               DEINTERLACE_HINT\r
        };\r
 \r
        virtual ~frame_producer(){}     \r
 \r
        virtual std::wstring print() const = 0; // nothrow\r
+       virtual boost::property_tree::wptree info() const = 0;\r
 \r
        virtual boost::unique_future<std::wstring> call(const std::wstring&) \r
        {\r
@@ -62,21 +66,10 @@ public:
                return promise.get_future();\r
        }\r
 \r
-       virtual boost::property_tree::wptree info() const\r
-       {\r
-               boost::property_tree::wptree info;\r
-               info.push_front(std::make_pair(L"producer", print()));\r
-               return info;\r
-       }\r
-\r
        virtual safe_ptr<frame_producer> get_following_producer() const {return frame_producer::empty();}  // nothrow\r
        virtual void set_leading_producer(const safe_ptr<frame_producer>&) {}  // nothrow\r
                \r
        virtual int64_t nb_frames() const {return std::numeric_limits<int>::max();}\r
-       virtual int64_t file_nb_frames() const {return nb_frames();}\r
-\r
-       virtual int64_t frame_number() const {return 0;}\r
-       virtual int64_t file_frame_number() const {return frame_number();}\r
        \r
        virtual safe_ptr<basic_frame> receive(int hints) = 0;\r
        virtual safe_ptr<core::basic_frame> last_frame() const = 0;\r