2.0. ffmpeg: Header file optimization and fixes.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1085 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/producer/color/color_producer.cpp b/core/producer/color/color_producer.cpp
index 4760c19d5554b35dd25ca905478ec4d06484017f..6e74e27d8d1f8fcf877052f1ebab29fcc652029b 100644 (file)
--- a/core/producer/color/color_producer.cpp
+++ b/core/producer/color/color_producer.cpp
@@ -22,6 +22,7 @@
 #include "color_producer.h"\r
 \r
 #include "../frame/basic_frame.h"\r
+#include "../frame/frame_factory.h"\r
 #include "../../mixer/write_frame.h"\r
 \r
 #include <sstream>\r

diff --git a/core/producer/color/color_producer.h b/core/producer/color/color_producer.h
index c9163de473f085e0c5a2969aa64d1d034c3b6ac9..051b5007a2bfc7b2e986e5e9bc91cc0323ac66ad 100644 (file)
--- a/core/producer/color/color_producer.h
+++ b/core/producer/color/color_producer.h
@@ -26,6 +26,9 @@
 \r
 namespace caspar { namespace core {\r
 \r
+class write_frame;\r
+struct frame_factory;\r
+\r
 safe_ptr<frame_producer> create_color_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
 safe_ptr<core::write_frame> create_color_frame(void* tag, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& color);\r
 \r

diff --git a/core/producer/frame_producer.h b/core/producer/frame_producer.h
index 70da5f2f89c886737f597ce81befadd987150e3e..aa51269df41d5c397da4ca86279d6bab21f4a085 100644 (file)
--- a/core/producer/frame_producer.h
+++ b/core/producer/frame_producer.h
@@ -19,8 +19,6 @@
 */\r
 #pragma once\r
 \r
-#include "frame/frame_factory.h"\r
-\r
 #include <common/memory/safe_ptr.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
@@ -32,8 +30,9 @@
 namespace caspar { namespace core {\r
 \r
 class basic_frame;\r
+struct frame_factory;\r
 \r
-class frame_producer : boost::noncopyable\r
+struct frame_producer : boost::noncopyable\r
 {\r
 public:\r
        enum hints\r

diff --git a/core/producer/layer.h b/core/producer/layer.h
index 4433891b8bf17a3ae17c0b4406499ace067c1724..86c741ded4868d35f98f6806a35b9e129ad66d2f 100644 (file)
--- a/core/producer/layer.h
+++ b/core/producer/layer.h
@@ -26,7 +26,7 @@
 \r
 namespace caspar { namespace core {\r
 \r
-class frame_producer;\r
+struct frame_producer;\r
 class basic_frame;\r
 \r
 class layer : boost::noncopyable\r

diff --git a/modules/ffmpeg/StdAfx.h b/modules/ffmpeg/StdAfx.h
index 9beabdace45218570a3a82f99d2ed366dcea7c6d..a1d0a2b901bbfb65226daf3416af359152a5e964 100644 (file)
--- a/modules/ffmpeg/StdAfx.h
+++ b/modules/ffmpeg/StdAfx.h
@@ -68,6 +68,7 @@ extern "C"
        #define __STDC_LIMIT_MACROS\r
        #include <libavformat/avformat.h>\r
        #include <libavcodec/avcodec.h>\r
+       #include <libavfilter/avfilter.h>\r
        #include <libswscale/swscale.h>\r
 }\r
 \r

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index 82dc849913f7cf388a290758feed5aaae2cd9ef2..bf9725b881d1e3684f4448a65e07f4e0e622702e 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -23,6 +23,8 @@
 #include "ffmpeg_consumer.h"\r
 \r
 #include <core/mixer/read_frame.h>\r
+#include <core/consumer/frame_consumer.h>\r
+#include <core/video_format.h>\r
 \r
 #include <common/concurrency/executor.h>\r
 #include <common/utility/string.h>\r

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.h b/modules/ffmpeg/consumer/ffmpeg_consumer.h
index decc821a88210a00da6236466c98b614d2333496..644e1fea623286bcc71bd10c0372f63c08f59196 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.h
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.h
@@ -19,9 +19,6 @@
 */\r
 #pragma once\r
 \r
-#include <core/consumer/frame_consumer.h>\r
-#include <core/video_format.h>\r
-\r
 #include <boost/property_tree/ptree.hpp>\r
 \r
 #include <string>\r
@@ -29,7 +26,7 @@
 \r
 namespace caspar { \r
        \r
-safe_ptr<core::frame_consumer> create_ffmpeg_consumer(const std::vector<std::wstring>& params);\r
-safe_ptr<core::frame_consumer> create_ffmpeg_consumer(const boost::property_tree::ptree& ptree);\r
+//safe_ptr<core::frame_consumer> create_ffmpeg_consumer(const std::vector<std::wstring>& params);\r
+//safe_ptr<core::frame_consumer> create_ffmpeg_consumer(const boost::property_tree::ptree& ptree);\r
 \r
 }
\ No newline at end of file

diff --git a/modules/ffmpeg/ffmpeg.cpp b/modules/ffmpeg/ffmpeg.cpp
index 6dfb68b6a0fb708bb541ffb1cadeda9d7e595862..5fa7aab5bc8228e4910c7fdb376640c5d5f08e69 100644 (file)
--- a/modules/ffmpeg/ffmpeg.cpp
+++ b/modules/ffmpeg/ffmpeg.cpp
@@ -149,7 +149,7 @@ void init_ffmpeg()
        av_lockmgr_register(ffmpeg_lock_callback);\r
        av_log_set_callback(log_callback);\r
        \r
-       core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_ffmpeg_consumer(params);});\r
+       //core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_ffmpeg_consumer(params);});\r
        core::register_producer_factory(create_ffmpeg_producer);\r
 }\r
 \r

diff --git a/modules/ffmpeg/ffmpeg.vcxproj b/modules/ffmpeg/ffmpeg.vcxproj
index 3b45ee06fc8164172293a745ebe7cc2809fd7f46..9fcfaf1a4b3adaf5e9e1a12477dd956536e9d38c 100644 (file)
--- a/modules/ffmpeg/ffmpeg.vcxproj
+++ b/modules/ffmpeg/ffmpeg.vcxproj
@@ -272,8 +272,14 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
+    </ClCompile>\r
+    <ClCompile Include="ffmpeg.cpp">\r
+      <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">false</ShowIncludes>\r
     </ClCompile>\r
-    <ClCompile Include="ffmpeg.cpp" />\r
     <ClCompile Include="producer\audio\audio_decoder.cpp">\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
@@ -285,6 +291,7 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+      <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">false</ShowIncludes>\r
     </ClCompile>\r
     <ClCompile Include="producer\filter\filter.cpp">\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r

diff --git a/modules/ffmpeg/ffmpeg_error.h b/modules/ffmpeg/ffmpeg_error.h
index 67e5163ee59071c28d5eba761aea17977455240b..b50efee452d29724529a99c4d652ee4a097c9fc2 100644 (file)
--- a/modules/ffmpeg/ffmpeg_error.h
+++ b/modules/ffmpeg/ffmpeg_error.h
@@ -1,5 +1,7 @@
 #pragma once\r
 \r
+#include <common/exception/exceptions.h>\r
+\r
 #include <string>\r
 \r
 #pragma warning(push, 1)\r

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.cpp b/modules/ffmpeg/producer/audio/audio_decoder.cpp
index f697768d58e945a3412b7779087f79e31967477e..fecc2ae8b11014b68e30f455fbcd2551422b0ae3 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.cpp
+++ b/modules/ffmpeg/producer/audio/audio_decoder.cpp
@@ -23,7 +23,11 @@
 \r
 #include "../../ffmpeg_error.h"\r
 \r
-#include <tbb/task_group.h>\r
+#include <core/video_format.h>\r
+\r
+#include <tbb/cache_aligned_allocator.h>\r
+\r
+#include <queue>\r
 \r
 #if defined(_MSC_VER)\r
 #pragma warning (push)\r

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.h b/modules/ffmpeg/producer/audio/audio_decoder.h
index 6ff023633f6f013317581dd5b7cf950e3aa18b1f..41bc8b49a6b12339c03c70447fce3a440f19e29b 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.h
+++ b/modules/ffmpeg/producer/audio/audio_decoder.h
@@ -21,17 +21,21 @@
 \r
 #include <common/memory/safe_ptr.h>\r
 \r
-#include <core/video_format.h>\r
-\r
 #include <boost/noncopyable.hpp>\r
 \r
-#include <deque>\r
+#include <vector>\r
 \r
-struct AVStream;\r
-struct AVCodecContext;\r
+struct AVPacket;\r
+struct AVFormatContext;\r
 \r
 namespace caspar {\r
 \r
+namespace core {\r
+\r
+struct video_format_desc;\r
+\r
+}\r
+\r
 class audio_decoder : boost::noncopyable\r
 {\r
 public:\r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index dc95e69bcb12786365fd413b04c744bf11f838da..bae7396cce132b97ef08ac36a1d1dca433b33824 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -27,26 +27,24 @@
 #include "audio/audio_decoder.h"\r
 #include "video/video_decoder.h"\r
 \r
+#include <common/env.h>\r
 #include <common/utility/assert.h>\r
-#include <common/utility/timer.h>\r
 #include <common/diagnostics/graph.h>\r
 \r
-#include <core/mixer/write_frame.h>\r
 #include <core/video_format.h>\r
-#include <core/producer/frame/audio_transform.h>\r
+#include <core/producer/frame_producer.h>\r
+#include <core/producer/frame/frame_factory.h>\r
 #include <core/producer/frame/basic_frame.h>\r
-#include <core/producer/color/color_producer.h>\r
-\r
-#include <common/env.h>\r
 \r
+#include <boost/assign.hpp>\r
 #include <boost/timer.hpp>\r
-#include <boost/range/algorithm.hpp>\r
-#include <boost/range/algorithm_ext.hpp>\r
+#include <boost/foreach.hpp>\r
+#include <boost/filesystem.hpp>\r
+#include <boost/range/algorithm/find_if.hpp>\r
+#include <boost/range/algorithm/find.hpp>\r
 \r
 #include <tbb/task_group.h>\r
-\r
-#include <deque>\r
-#include <vector>\r
+#include <tbb/parallel_invoke.h>\r
 \r
 namespace caspar {\r
                        \r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.h b/modules/ffmpeg/producer/ffmpeg_producer.h
index c7aa4a1a9886cf02b77d2ec3a578aba0f29cb45a..9bbb5ffa2a7d8c4897db077a5f2c30b860fe6597 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.h
+++ b/modules/ffmpeg/producer/ffmpeg_producer.h
@@ -19,14 +19,19 @@
 */\r
 #pragma once\r
 \r
-#include <core/producer/frame_producer.h>\r
-\r
 #include <common/memory/safe_ptr.h>\r
 \r
 #include <string>\r
 #include <vector>\r
 \r
 namespace caspar {\r
+\r
+namespace core {\r
+\r
+struct frame_producer;\r
+struct frame_factory;\r
+\r
+}\r
        \r
 safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
 \r

diff --git a/modules/ffmpeg/producer/filter/filter.cpp b/modules/ffmpeg/producer/filter/filter.cpp
index 4db46b9503f6ccd13069ac33805c17fb997ab895..ff2ce9f1ac0602f0eb3b925b0082e6af9841db1d 100644 (file)
--- a/modules/ffmpeg/producer/filter/filter.cpp
+++ b/modules/ffmpeg/producer/filter/filter.cpp
@@ -6,18 +6,15 @@
 \r
 #include "../../ffmpeg_error.h"\r
 \r
-#include <common/exception/exceptions.h>\r
-#include <core/producer/frame/basic_frame.h>\r
-#include <core/producer/frame/frame_factory.h>\r
-#include <core/mixer/write_frame.h>\r
-\r
-#include <boost/circular_buffer.hpp>\r
-\r
-#include <tbb/task_group.h>\r
+#include <boost/assign.hpp>\r
 \r
 #include <cstdio>\r
 #include <sstream>\r
 \r
+#if defined(_MSC_VER)\r
+#pragma warning (push)\r
+#pragma warning (disable : 4244)\r
+#endif\r
 extern "C" \r
 {\r
        #define __STDC_CONSTANT_MACROS\r
@@ -30,6 +27,9 @@ extern "C"
        #include <libavfilter/vsink_buffer.h>\r
        #include <libavfilter/vsrc_buffer.h>\r
 }\r
+#if defined(_MSC_VER)\r
+#pragma warning (pop)\r
+#endif\r
 \r
 namespace caspar {\r
        \r
@@ -163,5 +163,7 @@ struct filter::implementation
 };\r
 \r
 filter::filter(const std::wstring& filters) : impl_(new implementation(filters)){}\r
+filter::filter(filter&& other) : impl_(std::move(other.impl_)){}\r
+filter& filter::operator=(filter&& other){impl_ = std::move(other.impl_); return *this;}\r
 std::vector<safe_ptr<AVFrame>> filter::execute(const std::shared_ptr<AVFrame>& frame) {return impl_->execute(frame);}\r
 }
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/filter/filter.h b/modules/ffmpeg/producer/filter/filter.h
index 5e2f94277545b184e1179fbf3b79c6eb4540ccf9..de89332b90d7b862c15252a4af2257c298018d56 100644 (file)
--- a/modules/ffmpeg/producer/filter/filter.h
+++ b/modules/ffmpeg/producer/filter/filter.h
@@ -2,6 +2,8 @@
 \r
 #include <common/memory/safe_ptr.h>\r
 \r
+#include <boost/noncopyable.hpp>\r
+\r
 #include <string>\r
 #include <vector>\r
 \r
@@ -20,10 +22,12 @@ static bool double_rate(const std::wstring& filters)
        return false;\r
 }\r
 \r
-class filter\r
+class filter : boost::noncopyable\r
 {\r
 public:\r
        filter(const std::wstring& filters = L"");\r
+       filter(filter&& other);\r
+       filter& operator=(filter&& other);\r
 \r
        std::vector<safe_ptr<AVFrame>> execute(const std::shared_ptr<AVFrame>& frame);\r
 \r

diff --git a/modules/ffmpeg/producer/filter/parallel_yadif.cpp b/modules/ffmpeg/producer/filter/parallel_yadif.cpp
index dcaaddd81759cb5bff7e84cadddee9f61d7e8928..b467bfae0e9cf694ecdae1759cc21270ccfd15e3 100644 (file)
--- a/modules/ffmpeg/producer/filter/parallel_yadif.cpp
+++ b/modules/ffmpeg/producer/filter/parallel_yadif.cpp
@@ -2,12 +2,22 @@
 \r
 #include "parallel_yadif.h"\r
 \r
+#include <common/log/log.h>\r
+\r
+#if defined(_MSC_VER)\r
+#pragma warning (push)\r
+#pragma warning (disable : 4244)\r
+#endif\r
 extern "C" \r
 {\r
        #include <libavfilter/avfilter.h>\r
 }\r
+#if defined(_MSC_VER)\r
+#pragma warning (pop)\r
+#endif\r
 \r
 #include <tbb/parallel_for.h>\r
+#include <tbb/concurrent_queue.h>\r
 \r
 #include <boost/thread/once.hpp>\r
 \r

diff --git a/modules/ffmpeg/producer/filter/parallel_yadif.h b/modules/ffmpeg/producer/filter/parallel_yadif.h
index 3146d472fd8be9a5a3426952341ca79913a2b73b..44a0e87211003c0776090847106e53689e476f35 100644 (file)
--- a/modules/ffmpeg/producer/filter/parallel_yadif.h
+++ b/modules/ffmpeg/producer/filter/parallel_yadif.h
@@ -1,5 +1,7 @@
 #pragma once\r
 \r
+#include <memory>\r
+\r
 struct AVFilterContext;\r
 \r
 namespace caspar {\r

diff --git a/modules/ffmpeg/producer/frame_muxer.cpp b/modules/ffmpeg/producer/frame_muxer.cpp
index 66442b77e8d3b7775a683b4d41d1e0c38c1bdc5e..a09aaa4bff0cdd8d082313e019f3e85dbf588a9b 100644 (file)
--- a/modules/ffmpeg/producer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/frame_muxer.cpp
@@ -14,10 +14,31 @@
 #include <core/mixer/write_frame.h>\r
 \r
 #include <common/env.h>\r
+#include <common/exception/exceptions.h>\r
 #include <common/log/log.h>\r
 \r
+#if defined(_MSC_VER)\r
+#pragma warning (push)\r
+#pragma warning (disable : 4244)\r
+#endif\r
+extern "C" \r
+{\r
+       #define __STDC_CONSTANT_MACROS\r
+       #define __STDC_LIMIT_MACROS\r
+       #include <libavcodec/avcodec.h>\r
+       #include <libavformat/avformat.h>\r
+}\r
+#if defined(_MSC_VER)\r
+#pragma warning (pop)\r
+#endif\r
+\r
+#include <boost/foreach.hpp>\r
 #include <boost/range/algorithm_ext/push_back.hpp>\r
 \r
+#include <deque>\r
+#include <queue>\r
+#include <vector>\r
+\r
 using namespace caspar::core;\r
 \r
 namespace caspar {\r

diff --git a/modules/ffmpeg/producer/frame_muxer.h b/modules/ffmpeg/producer/frame_muxer.h
index c7b60757f3c2505354adfce8895edbe28b16f314..59632adb32817e051f0bf4eba72d29d87654e3da 100644 (file)
--- a/modules/ffmpeg/producer/frame_muxer.h
+++ b/modules/ffmpeg/producer/frame_muxer.h
@@ -2,12 +2,12 @@
 \r
 #include <common/memory/safe_ptr.h>\r
 \r
-#include <core/video_format.h>\r
-\r
 #include <boost/noncopyable.hpp>\r
 \r
 #include <vector>\r
 \r
+struct AVFrame;\r
+\r
 namespace caspar { \r
        \r
 namespace core {\r

diff --git a/modules/ffmpeg/producer/input.cpp b/modules/ffmpeg/producer/input.cpp
index 63a088611ca0b7cd6aa29a5e36efb690f63d586d..98ea13d070dfafaa87df41ad3e2072f2701008ee 100644 (file)
--- a/modules/ffmpeg/producer/input.cpp
+++ b/modules/ffmpeg/producer/input.cpp
@@ -21,7 +21,7 @@
 #pragma warning (disable : 4244)\r
 #endif\r
 \r
-#include "..\stdafx.h"\r
+#include "../stdafx.h"\r
 \r
 #include "input.h"\r
 #include "../ffmpeg_error.h"\r
@@ -30,6 +30,8 @@
 #include <core/video_format.h>\r
 \r
 #include <common/diagnostics/graph.h>\r
+#include <common/exception/exceptions.h>\r
+#include <common/exception/win32_exception.h>\r
 \r
 #include <tbb/concurrent_queue.h>\r
 #include <tbb/atomic.h>\r
@@ -38,14 +40,20 @@
 #include <boost/thread/condition_variable.hpp>\r
 #include <boost/thread/mutex.hpp>\r
 #include <boost/thread/thread.hpp>\r
-#include <boost/range/iterator_range.hpp>\r
 \r
+#if defined(_MSC_VER)\r
+#pragma warning (push)\r
+#pragma warning (disable : 4244)\r
+#endif\r
 extern "C" \r
 {\r
        #define __STDC_CONSTANT_MACROS\r
        #define __STDC_LIMIT_MACROS\r
        #include <libavformat/avformat.h>\r
 }\r
+#if defined(_MSC_VER)\r
+#pragma warning (pop)\r
+#endif\r
 \r
 namespace caspar {\r
 \r

diff --git a/modules/ffmpeg/producer/input.h b/modules/ffmpeg/producer/input.h
index 0ddd0612060a10777df220e3504484c6583bfec2..ddecae014e64c63b2cedf80d8de9ab0b2606764a 100644 (file)
--- a/modules/ffmpeg/producer/input.h
+++ b/modules/ffmpeg/producer/input.h
@@ -19,16 +19,23 @@
 */\r
 #pragma once\r
 \r
-#include <common/diagnostics/graph.h>\r
+#include <common/memory/safe_ptr.h>\r
 \r
 #include <memory>\r
 #include <string>\r
 \r
-#include <boost/iterator/iterator_facade.hpp>\r
+#include <boost/noncopyable.hpp>\r
 \r
-struct AVCodecContext;\r
+struct AVFormatContext;\r
+struct AVPacket;\r
 \r
 namespace caspar {\r
+\r
+namespace diagnostics {\r
+\r
+class graph;\r
+\r
+}\r
        \r
 class input : boost::noncopyable\r
 {\r

diff --git a/modules/ffmpeg/producer/util.cpp b/modules/ffmpeg/producer/util.cpp
index e4e8aafad210763d261f4e937b4e3fa2861ad46b..d688b54484b9ce805e01e7eaa4e5c8399190d0e5 100644 (file)
--- a/modules/ffmpeg/producer/util.cpp
+++ b/modules/ffmpeg/producer/util.cpp
@@ -5,12 +5,12 @@
 #include <tbb/concurrent_unordered_map.h>\r
 #include <tbb/concurrent_queue.h>\r
 \r
-#include <core/producer/frame/pixel_format.h>\r
 #include <core/producer/frame/image_transform.h>\r
 #include <core/producer/frame/frame_factory.h>\r
 #include <core/producer/frame_producer.h>\r
 #include <core/mixer/write_frame.h>\r
 \r
+#include <common/exception/exceptions.h>\r
 #include <common/memory/memcpy.h>\r
 \r
 #if defined(_MSC_VER)\r
@@ -21,7 +21,6 @@ extern "C"
 {\r
        #include <libswscale/swscale.h>\r
        #include <libavcodec/avcodec.h>\r
-       #include <libavfilter/avfilter.h>\r
 }\r
 #if defined(_MSC_VER)\r
 #pragma warning (pop)\r

diff --git a/modules/ffmpeg/producer/video/video_decoder.cpp b/modules/ffmpeg/producer/video/video_decoder.cpp
index 3d3091d2d430c926006e3d69ed4759a8902fd58c..d2827fa1e805ad376ce8c5f9544a10024525478d 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.cpp
+++ b/modules/ffmpeg/producer/video/video_decoder.cpp
@@ -20,24 +20,21 @@
 #include "../../stdafx.h"\r
 \r
 #include "video_decoder.h"\r
+\r
 #include "../util.h"\r
 #include "../filter/filter.h"\r
 \r
 #include "../../ffmpeg_error.h"\r
 #include "../../tbb_avcodec.h"\r
 \r
-#include <common/memory/memcpy.h>\r
-\r
-#include <core/video_format.h>\r
-#include <core/producer/frame/basic_frame.h>\r
-#include <core/mixer/write_frame.h>\r
 #include <core/producer/frame/image_transform.h>\r
 #include <core/producer/frame/frame_factory.h>\r
-#include <core/producer/color/color_producer.h>\r
+\r
+#include <boost/range/algorithm_ext/push_back.hpp>\r
 \r
 #include <tbb/task_group.h>\r
 \r
-#include <boost/range/algorithm_ext.hpp>\r
+#include <queue>\r
 \r
 #if defined(_MSC_VER)\r
 #pragma warning (push)\r
@@ -47,8 +44,8 @@ extern "C"
 {\r
        #define __STDC_CONSTANT_MACROS\r
        #define __STDC_LIMIT_MACROS\r
-       #include <libavformat/avformat.h>\r
        #include <libavcodec/avcodec.h>\r
+       #include <libavformat/avformat.h>\r
 }\r
 #if defined(_MSC_VER)\r
 #pragma warning (pop)\r

diff --git a/modules/ffmpeg/producer/video/video_decoder.h b/modules/ffmpeg/producer/video/video_decoder.h
index 22a6404e1ee5b84bc2f25528952209bb6b79feeb..76609f9ce3125ad596df9e0e4fe73ba4a170e599 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.h
+++ b/modules/ffmpeg/producer/video/video_decoder.h
@@ -23,7 +23,13 @@
 \r
 #include <core/video_format.h>\r
 \r
-struct AVStream;\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

diff --git a/modules/ffmpeg/tbb_avcodec.cpp b/modules/ffmpeg/tbb_avcodec.cpp
index 15d5a2598d308f5f0eacfa13856db44eccd848cc..27925b5539af24e39dcae4a3aed94e7ef769326b 100644 (file)
--- a/modules/ffmpeg/tbb_avcodec.cpp
+++ b/modules/ffmpeg/tbb_avcodec.cpp
@@ -6,20 +6,26 @@
 \r
 #include <common/log/log.h>\r
 #include <common/env.h>\r
+#include <common/utility/assert.h>\r
 \r
 #include <tbb/task.h>\r
 #include <tbb/atomic.h>\r
+#include <tbb/parallel_for.h>\r
 #include <tbb/tbb_thread.h>\r
 \r
-#include <regex>\r
-#include <boost/algorithm/string.hpp>\r
-\r
+#if defined(_MSC_VER)\r
+#pragma warning (push)\r
+#pragma warning (disable : 4244)\r
+#endif\r
 extern "C" \r
 {\r
        #define __STDC_CONSTANT_MACROS\r
        #define __STDC_LIMIT_MACROS\r
        #include <libavformat/avformat.h>\r
 }\r
+#if defined(_MSC_VER)\r
+#pragma warning (pop)\r
+#endif\r
 \r
 namespace caspar {\r
                \r

diff --git a/modules/image/producer/image_producer.cpp b/modules/image/producer/image_producer.cpp
index 9af25d39b548e54fc871a2886d1478c3997583ee..3b0fad69f3353a8063b112b0a9a7592ad5d3ef90 100644 (file)
--- a/modules/image/producer/image_producer.cpp
+++ b/modules/image/producer/image_producer.cpp
@@ -24,6 +24,7 @@
 #include <core/video_format.h>\r
 \r
 #include <core/producer/frame/basic_frame.h>\r
+#include <core/producer/frame/frame_factory.h>\r
 #include <core/mixer/write_frame.h>\r
 \r
 #include <common/env.h>\r

diff --git a/modules/image/producer/image_scroll_producer.cpp b/modules/image/producer/image_scroll_producer.cpp
index fc9439d32efcccabb04329c3c5c9a32432720d6c..ccf55b3657733d3d6bc9cd3ad393e9cdbe08e7ae 100644 (file)
--- a/modules/image/producer/image_scroll_producer.cpp
+++ b/modules/image/producer/image_scroll_producer.cpp
@@ -24,6 +24,7 @@
 #include <core/video_format.h>\r
 \r
 #include <core/producer/frame/basic_frame.h>\r
+#include <core/producer/frame/frame_factory.h>\r
 #include <core/producer/frame/image_transform.h>\r
 #include <core/mixer/write_frame.h>\r
 \r

diff --git a/shell/server.cpp b/shell/server.cpp
index dabcccb921e48c49b2cb5e6d47327b91106df0e8..e3c33749f3ee6dd575ec1f6a789793d7966f21dc 100644 (file)
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -114,8 +114,8 @@ struct server::implementation : boost::noncopyable
                                                channels_.back()->output()->add(index++, create_bluefish_consumer(xml_consumer.second));                                        \r
                                        else if(name == "decklink")                                     \r
                                                channels_.back()->output()->add(index++, create_decklink_consumer(xml_consumer.second));                                \r
-                                       else if(name == "file")                                 \r
-                                               channels_.back()->output()->add(index++, create_ffmpeg_consumer(xml_consumer.second));                                          \r
+                                       //else if(name == "file")                                       \r
+                                       //      channels_.back()->output()->add(index++, create_ffmpeg_consumer(xml_consumer.second));                                          \r
                                        else if(name == "audio")\r
                                                channels_.back()->output()->add(index++, make_safe<oal_consumer>());            \r
                                        else if(name != "<xmlcomment>")\r