Header optimization.

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

diff --git a/core/consumer/output.h b/core/consumer/output.h
index 7741623a2888ce8029f32cc21e51d19fda0791b0..77d1b1e91c9326a898a8b440e4ceff4d06d6c277 100644 (file)
--- a/core/consumer/output.h
+++ b/core/consumer/output.h
@@ -34,7 +34,7 @@
 namespace caspar { namespace core {\r
        \r
 class output sealed : public target<std::pair<safe_ptr<read_frame>, std::shared_ptr<void>>>\r
-                        , boost::noncopyable\r
+                                       , boost::noncopyable\r
 {\r
 public:\r
        explicit output(const safe_ptr<diagnostics::graph>& graph, const video_format_desc& format_desc, int channel_index);\r

diff --git a/core/producer/frame_producer.h b/core/producer/frame_producer.h
index 06fc0cd53ba6e05f13e154338408d46d92f4fd45..b1b717b8809c98ea38cbcbbf98671e930411fa4c 100644 (file)
--- a/core/producer/frame_producer.h
+++ b/core/producer/frame_producer.h
@@ -26,11 +26,11 @@
 #include <boost/noncopyable.hpp>\r
 \r
 #include <algorithm>\r
+#include <stdint.h>\r
+#include <limits>\r
 #include <functional>\r
 #include <string>\r
 #include <vector>\r
-#include <stdint.h>\r
-#include <numeric>\r
 \r
 #include <boost/thread/future.hpp>\r
 #include <boost/property_tree/ptree_fwd.hpp>\r

diff --git a/modules/decklink/StdAfx.h b/modules/decklink/StdAfx.h
index ee2bab48895799e324ed9a283256b247a563d235..a4bcb77a5ac94642cb15d2ff8ef2b5b85ce3e136 100644 (file)
--- a/modules/decklink/StdAfx.h
+++ b/modules/decklink/StdAfx.h
@@ -39,10 +39,9 @@
 #include <queue>\r
 #include <string>\r
 #include <vector>\r
-\r
 #include <tbb/atomic.h>\r
 #include <tbb/concurrent_queue.h>\r
-\r
+#include <tbb/cache_aligned_allocator.h>\r
 #include <boost/assign.hpp>\r
 #include <boost/circular_buffer.hpp>\r
 #include <boost/timer.hpp>\r
@@ -50,11 +49,38 @@
 #include <boost/foreach.hpp>\r
 #include <boost/range.hpp>\r
 #include <boost/range/algorithm.hpp>\r
+#include <boost/property_tree/ptree.hpp>\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 <libavcodec/avcodec.h>\r
+}\r
+#if defined(_MSC_VER)\r
+#pragma warning (pop)\r
+#endif\r
+\r
+#pragma warning(push)\r
+#pragma warning(disable : 4996)\r
+\r
+       #include <atlbase.h>\r
+\r
+       #include <atlcom.h>\r
+       #include <atlhost.h>\r
+\r
+#pragma warning(push)\r
+\r
+#include <functional>\r
+\r
 \r
 #include "../common/memory/safe_ptr.h"\r
 #include "../common/utility/string.h"\r
-//#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
-\r
 #include "../common/exception/exceptions.h"\r
 #include "../common/exception/win32_exception.h"\r
 #include "../common/log/Log.h"\r

diff --git a/modules/ffmpeg/StdAfx.h b/modules/ffmpeg/StdAfx.h
index f7e56ad990a43d50d21b4d23b502bd363f4eafc6..5ecbe80f1cf1f7a2ec4767b4d456317995abacf5 100644 (file)
--- a/modules/ffmpeg/StdAfx.h
+++ b/modules/ffmpeg/StdAfx.h
@@ -27,36 +27,55 @@
 \r
 #define NOMINMAX\r
 \r
-#include <memory>\r
-#include <array>\r
-#include <functional>\r
 #include <algorithm>\r
-#include <vector>\r
+#include <array>\r
+#include <asmlib.h>\r
+#include <assert.h>\r
+#include <boost/algorithm/string.hpp>\r
+#include <boost/algorithm/string/case_conv.hpp>\r
+#include <boost/algorithm/string/predicate.hpp>\r
+#include <boost/assign.hpp>\r
+#include <boost/filesystem.hpp>\r
+#include <boost/foreach.hpp>\r
+#include <boost/lexical_cast.hpp>\r
+#include <boost/noncopyable.hpp>\r
+#include <boost/property_tree/ptree.hpp>\r
+#include <boost/range/adaptors.hpp>\r
+#include <boost/range/algorithm.hpp>\r
+#include <boost/range/algorithm.hpp>\r
+#include <boost/range/algorithm/find.hpp>\r
+#include <boost/range/algorithm/find_if.hpp>\r
+#include <boost/range/algorithm_ext/push_back.hpp>\r
+#include <boost/range/iterator_range.hpp>\r
+#include <boost/regex.hpp>\r
+#include <boost/thread/condition_variable.hpp>\r
+#include <boost/thread/mutex.hpp>\r
+#include <boost/thread/once.hpp>\r
+#include <boost/thread/thread.hpp>\r
+#include <boost/timer.hpp>\r
+#include <crtdbg.h>\r
+#include <cstdint>\r
+#include <cstdio>\r
+#include <deque>\r
 #include <deque>\r
+#include <functional>\r
+#include <iostream>\r
+#include <limits>\r
+#include <math.h>\r
+#include <memory>\r
 #include <queue>\r
+#include <sstream>\r
 #include <string>\r
-#include <math.h>\r
-\r
 #include <tbb/atomic.h>\r
+#include <tbb/cache_aligned_allocator.h>\r
 #include <tbb/concurrent_queue.h>\r
+#include <tbb/concurrent_unordered_map.h>\r
 #include <tbb/parallel_for.h>\r
-\r
-#include <boost/assign.hpp>\r
-#include <boost/algorithm/string.hpp>\r
-#include <boost/filesystem.hpp>\r
-#include <boost/foreach.hpp>\r
-#include <boost/range/algorithm.hpp>\r
-#include <boost/property_tree/ptree.hpp>\r
-#include <boost/assign.hpp>\r
-\r
-#include <common/utility/string.h>\r
-#include <common/utility/assert.h>\r
-#include <common/memory/safe_ptr.h>\r
-//#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
-\r
-#include <common/log/log.h>\r
-#include <common/exception/exceptions.h>\r
-#include <common/exception/win32_exception.h>\r
+#include <tbb/parallel_invoke.h>\r
+#include <tbb/recursive_mutex.h>\r
+#include <tbb/tbb_thread.h>\r
+#include <unordered_map>\r
+#include <vector>\r
 \r
 #pragma warning(push, 1)\r
 \r
@@ -64,9 +83,21 @@ extern "C"
 {\r
        #define __STDC_CONSTANT_MACROS\r
        #define __STDC_LIMIT_MACROS\r
-       #include <libavformat/avformat.h>\r
        #include <libavcodec/avcodec.h>\r
+       #include <libavfilter/avcodec.h>\r
        #include <libavfilter/avfilter.h>\r
+       #include <libavfilter/avfiltergraph.h>\r
+       #include <libavfilter/buffersink.h>\r
+       #include <libavfilter/vsrc_buffer.h>\r
+       #include <libavformat/avformat.h>\r
+       #include <libavutil/avutil.h>\r
+       #include <libavutil/common.h>\r
+       #include <libavutil/cpu.h>\r
+       #include <libavutil/error.h>\r
+       #include <libavutil/imgutils.h>\r
+       #include <libavutil/opt.h>\r
+       #include <libavutil/pixdesc.h>\r
+       #include <libavutil/samplefmt.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 a38004743f2b71332cb7fcc034848c415b3458f0..a9d8f43babace3ac0d9b34ca7c08d7b387b3d690 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -30,18 +30,17 @@
 #include <core/consumer/frame_consumer.h>\r
 #include <core/video_format.h>\r
 \r
+#include <common/env.h>\r
 #include <common/concurrency/executor.h>\r
 #include <common/diagnostics/graph.h>\r
-#include <common/env.h>\r
+#include <common/memory/safe_ptr.h>\r
 #include <common/utility/string.h>\r
 #include <common/utility/param.h>\r
 \r
 #include <boost/algorithm/string.hpp>\r
 #include <boost/timer.hpp>\r
 #include <boost/property_tree/ptree.hpp>\r
-\r
-#include <tbb/cache_aligned_allocator.h>\r
-#include <tbb/parallel_invoke.h>\r
+#include <boost/filesystem.hpp>\r
 \r
 #if defined(_MSC_VER)\r
 #pragma warning (push)\r

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.h b/modules/ffmpeg/consumer/ffmpeg_consumer.h
index 9f27cdd36bbc5e0840e21f5820db0a718764e993..adaa43f3952211776af605caff822b739041dd74 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.h
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.h
@@ -21,7 +21,9 @@
 \r
 #pragma once\r
 \r
-#include <boost/property_tree/ptree.hpp>\r
+#include <common/memory/safe_ptr.h>\r
+\r
+#include <boost/property_tree/ptree_fwd.hpp>\r
 \r
 #include <string>\r
 #include <vector>\r

diff --git a/modules/ffmpeg/ffmpeg_error.cpp b/modules/ffmpeg/ffmpeg_error.cpp
index b86f0a175202e46a01500ed0b326b173474d3091..7c01ded151bc9dd2532b8617c6b322c9515fc9de 100644 (file)
--- a/modules/ffmpeg/ffmpeg_error.cpp
+++ b/modules/ffmpeg/ffmpeg_error.cpp
@@ -22,7 +22,6 @@
 */\r
 #include "ffmpeg_error.h"\r
 \r
-#include <common/exception/exceptions.h>\r
 #include <common/utility/string.h>\r
 \r
 #pragma warning(disable: 4146)\r

diff --git a/modules/ffmpeg/ffmpeg_error.h b/modules/ffmpeg/ffmpeg_error.h
index ee29f4b6d75cd58ceecf4529dbc875b26411afea..ffb16ba967feba7a5140a735444a8a5a834eb82e 100644 (file)
--- a/modules/ffmpeg/ffmpeg_error.h
+++ b/modules/ffmpeg/ffmpeg_error.h
@@ -22,7 +22,6 @@
 #pragma once\r
 \r
 #include <common/exception/exceptions.h>\r
-#include <common/utility/string.h>\r
 \r
 #include <string>\r
 \r

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.cpp b/modules/ffmpeg/producer/audio/audio_decoder.cpp
index e3d0c4a1d5cd8756c6f7f75afb1a01080a644dd9..c39fcf6160e283df3e5ffd321c3a96ceca6694da 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.cpp
+++ b/modules/ffmpeg/producer/audio/audio_decoder.cpp
@@ -30,6 +30,8 @@
 \r
 #include <core/video_format.h>\r
 \r
+#include <common/log/log.h>\r
+\r
 #include <tbb/cache_aligned_allocator.h>\r
 \r
 #include <queue>\r

diff --git a/modules/ffmpeg/producer/audio/audio_resampler.cpp b/modules/ffmpeg/producer/audio/audio_resampler.cpp
index 792de3bf61a6d4b07013be53bec5e82c660af27c..ef29ff53e5dddffa640cd117f32ed202b6705e48 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_resampler.cpp
+++ b/modules/ffmpeg/producer/audio/audio_resampler.cpp
@@ -24,6 +24,7 @@
 #include "audio_resampler.h"\r
 \r
 #include <common/exception/exceptions.h>\r
+#include <common/log/log.h>\r
 \r
 #if defined(_MSC_VER)\r
 #pragma warning (push)\r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 7a56709020c7f02a43a7b8fca0dfd3eead2ddbae..b6a05607410f78e5dc37e936373c8e297d51f5dd 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -49,6 +49,7 @@
 #include <boost/filesystem.hpp>\r
 #include <boost/range/algorithm/find_if.hpp>\r
 #include <boost/range/algorithm/find.hpp>\r
+#include <boost/property_tree/ptree.hpp>\r
 #include <boost/regex.hpp>\r
 \r
 #include <tbb/parallel_invoke.h>\r

diff --git a/modules/ffmpeg/producer/input/input.cpp b/modules/ffmpeg/producer/input/input.cpp
index 6a70527f1fc5d1c84c73eced4d2c0875b747ed7a..23441b06f5a992214a4f4a424c426eecea970d3e 100644 (file)
--- a/modules/ffmpeg/producer/input/input.cpp
+++ b/modules/ffmpeg/producer/input/input.cpp
@@ -26,11 +26,12 @@
 #include "../util/util.h"\r
 #include "../../ffmpeg_error.h"\r
 \r
-#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
+#include <common/log/log.h>\r
+\r
+#include <core/video_format.h>\r
 \r
 #include <tbb/concurrent_queue.h>\r
 #include <tbb/atomic.h>\r

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.cpp b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
index c774c5e312d2e87afc3cf90222a96c22e73171dd..643dd4c1a1baa593da3b715caf692f4dce59d695 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -36,6 +36,7 @@
 #include <common/env.h>\r
 #include <common/exception/exceptions.h>\r
 #include <common/log/log.h>\r
+#include <common/utility/assert.h>\r
 \r
 #if defined(_MSC_VER)\r
 #pragma warning (push)\r

diff --git a/modules/ffmpeg/producer/tbb_avcodec.cpp b/modules/ffmpeg/producer/tbb_avcodec.cpp
index 09ad9d573d7990936cbd57c05fba4f08571a1d17..739478faec652fc333abe0dc848a911aa6b92c1e 100644 (file)
--- a/modules/ffmpeg/producer/tbb_avcodec.cpp
+++ b/modules/ffmpeg/producer/tbb_avcodec.cpp
@@ -27,7 +27,6 @@
 #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

diff --git a/modules/ffmpeg/producer/util/flv.cpp b/modules/ffmpeg/producer/util/flv.cpp
index a6074b7897a4fd0d12fe5384e587998776d209cf..70df483ee80cce7232f81db935a14866a8f22201 100644 (file)
--- a/modules/ffmpeg/producer/util/flv.cpp
+++ b/modules/ffmpeg/producer/util/flv.cpp
@@ -24,6 +24,7 @@
 #include "flv.h"\r
 \r
 #include <common/exception/exceptions.h>\r
+#include <common/log/log.h>\r
 \r
 #include <boost/filesystem.hpp>\r
 \r

diff --git a/modules/ffmpeg/producer/video/video_decoder.cpp b/modules/ffmpeg/producer/video/video_decoder.cpp
index 19606a9882b2a3fd6df1383b936dc8559b65aff5..aee1b5c15e00405e5150cba67383cb4bd9208332 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.cpp
+++ b/modules/ffmpeg/producer/video/video_decoder.cpp
@@ -27,6 +27,7 @@
 \r
 #include "../../ffmpeg_error.h"\r
 \r
+#include <common/log/log.h>\r
 #include <core/producer/frame/frame_transform.h>\r
 #include <core/producer/frame/frame_factory.h>\r
 \r

diff --git a/shell/server.h b/shell/server.h
index 920735af55377d8b644bdd250f841fd234e78f34..4506b01be4b82836c58f3ad92fc79f8d414ed704 100644 (file)
--- a/shell/server.h
+++ b/shell/server.h
@@ -19,7 +19,6 @@
 * Author: Robert Nagy, ronag89@gmail.com\r
 */\r
 \r
-\r
 #pragma once\r
 \r
 #include <common/memory/safe_ptr.h>\r