chore: reduce some unnecessary includes

CasparCG · Jan 14, 2025 · abcae38 · abcae38
1 parent e421335
commit abcae38
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 20 deletions.
diff --git a/src/accelerator/accelerator.h b/src/accelerator/accelerator.h
@@ -6,7 +6,7 @@
 #include <core/mixer/mixer.h>
 #include <core/video_format.h>
 
-#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/ptree_fwd.hpp>
 
 #include <future>
 #include <memory>

diff --git a/src/accelerator/ogl/util/buffer.cpp b/src/accelerator/ogl/util/buffer.cpp
@@ -20,6 +20,8 @@
  */
 #include "buffer.h"
 
+#include <boost/property_tree/ptree.hpp>
+
 #include <common/gl/gl_check.h>
 
 #include <GL/glew.h>

diff --git a/src/accelerator/ogl/util/buffer.h b/src/accelerator/ogl/util/buffer.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/ptree_fwd.hpp>
 #include <memory>
 
 namespace caspar { namespace accelerator { namespace ogl {

diff --git a/src/common/ptree.h b/src/common/ptree.h
@@ -25,7 +25,8 @@
 
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/iterator/iterator_facade.hpp>
-#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/ptree_fwd.hpp>
+#include <boost/property_tree/exceptions.hpp>
 #include <boost/range/adaptor/transformed.hpp>
 
 #include <map>

diff --git a/src/core/fwd.h b/src/core/fwd.h
@@ -38,7 +38,6 @@ namespace caspar::core { class video_channel; }
 namespace caspar::core { struct pixel_format_desc; }
 namespace caspar::core { class cg_producer_registry; }
 namespace caspar::core { struct frame_transform; }
-namespace caspar::core { struct write_frame_consumer; }
 namespace caspar::core { struct frame_producer_dependencies; }
 namespace caspar::core { struct module_dependencies; }
 namespace caspar::core { class frame_producer_registry; }

diff --git a/src/core/module_dependencies.h b/src/core/module_dependencies.h
@@ -26,7 +26,11 @@
 #include "consumer/frame_consumer.h"
 #include "producer/cg_proxy.h"
 #include "producer/frame_producer.h"
-#include "protocol/amcp/amcp_command_repository_wrapper.h"
+// #include "protocol/amcp/amcp_command_repository_wrapper.h"
+
+namespace caspar::protocol::amcp {
+class amcp_command_repository_wrapper;
+}
 
 namespace caspar { namespace core {
 

diff --git a/src/modules/artnet/consumer/artnet_consumer.cpp b/src/modules/artnet/consumer/artnet_consumer.cpp
@@ -24,22 +24,14 @@
 #undef NOMINMAX
 // ^^ This is needed to avoid a conflict between boost asio and other header files defining NOMINMAX
 
-#include <common/array.h>
 #include <common/future.h>
 #include <common/log.h>
 #include <common/ptree.h>
-#include <common/utf.h>
-
-#include <core/consumer/frame_consumer.h>
-#include <core/frame/frame.h>
-#include <core/video_format.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/asio.hpp>
-#include <boost/locale/encoding_utf.hpp>
 #include <boost/property_tree/ptree.hpp>
 
-#include <cmath>
 #include <thread>
 #include <utility>
 #include <vector>

diff --git a/src/modules/decklink/consumer/decklink_consumer.cpp b/src/modules/decklink/consumer/decklink_consumer.cpp
@@ -312,7 +312,7 @@ class decklink_frame
     [[nodiscard]] int nb_samples() const { return nb_samples_; }
 
     // IDeckLinkVideoFrameMetadataExtensions
-    HRESULT STDMETHODCALLTYPE GetInt(BMDDeckLinkFrameMetadataID metadataID, int64_t* value)
+    HRESULT STDMETHODCALLTYPE GetInt(BMDDeckLinkFrameMetadataID metadataID, int64_t* value) override
     {
         HRESULT result = S_OK;
 
@@ -333,7 +333,7 @@ class decklink_frame
         return result;
     }
 
-    HRESULT STDMETHODCALLTYPE GetFloat(BMDDeckLinkFrameMetadataID metadataID, double* value)
+    HRESULT STDMETHODCALLTYPE GetFloat(BMDDeckLinkFrameMetadataID metadataID, double* value) override
     {
         const auto color_space = (color_space_ == core::color_space::bt2020) ? &REC_2020 : &REC_709;
         HRESULT    result      = S_OK;
@@ -395,25 +395,27 @@ class decklink_frame
         return result;
     }
 
-    HRESULT STDMETHODCALLTYPE GetFlag(BMDDeckLinkFrameMetadataID, BOOL* value)
+    HRESULT STDMETHODCALLTYPE GetFlag(BMDDeckLinkFrameMetadataID, BOOL* value) override
     {
         // Not expecting GetFlag
         *value = false;
         return E_INVALIDARG;
     }
 
-    HRESULT STDMETHODCALLTYPE GetString(BMDDeckLinkFrameMetadataID, String* value)
+    HRESULT STDMETHODCALLTYPE GetString(BMDDeckLinkFrameMetadataID, String* value) override
     {
         // Not expecting GetString
         *value = nullptr;
         return E_INVALIDARG;
     }
 
+    /*
     HRESULT STDMETHODCALLTYPE GetBytes(BMDDeckLinkFrameMetadataID metadataID, void* buffer, uint32_t* bufferSize)
     {
         *bufferSize = 0;
         return E_INVALIDARG;
     }
+     */
 };
 
 struct decklink_secondary_port final : public IDeckLinkVideoOutputCallback

diff --git a/src/modules/ffmpeg/util/av_util.cpp b/src/modules/ffmpeg/util/av_util.cpp
@@ -299,6 +299,9 @@ std::shared_ptr<AVFrame> make_av_video_frame(const core::const_frame& frame, con
         case core::pixel_format::ycbcra:
             av_frame->format = is_16bit ? AVPixelFormat::AV_PIX_FMT_YUVA420P10 : AVPixelFormat::AV_PIX_FMT_YUVA420P;
             break;
+        case core::pixel_format::uyvy:
+            // TODO
+            break;
         case core::pixel_format::count:
         case core::pixel_format::invalid:
             break;

diff --git a/src/modules/html/producer/html_producer.cpp b/src/modules/html/producer/html_producer.cpp
@@ -42,6 +42,7 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/log/trivial.hpp>
+#include <boost/property_tree/ptree.hpp>
 #include <boost/regex.hpp>
 
 #include <tbb/concurrent_queue.h>

diff --git a/src/modules/image/consumer/image_consumer.h b/src/modules/image/consumer/image_consumer.h
@@ -24,7 +24,7 @@
 #include <common/bit_depth.h>
 #include <common/memory.h>
 
-#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/ptree_fwd.hpp>
 #include <core/consumer/frame_consumer.h>
 
 #include <string>

diff --git a/src/modules/newtek/newtek.cpp b/src/modules/newtek/newtek.cpp
@@ -27,6 +27,7 @@
 #include "util/ndi.h"
 
 #include <core/consumer/frame_consumer.h>
+#include <protocol/amcp/amcp_command_repository_wrapper.h>
 
 #include <boost/property_tree/ptree.hpp>
 #include <common/env.h>

diff --git a/src/modules/screen/consumer/screen_consumer.h b/src/modules/screen/consumer/screen_consumer.h
@@ -26,7 +26,7 @@
 
 #include <core/fwd.h>
 
-#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/ptree_fwd.hpp>
 #include <vector>
 
 namespace caspar { namespace screen {

diff --git a/src/protocol/amcp/AMCPCommandsImpl.cpp b/src/protocol/amcp/AMCPCommandsImpl.cpp
@@ -30,7 +30,6 @@
 #include "../util/http_request.h"
 #include "AMCPCommandQueue.h"
 #include "amcp_args.h"
-#include "amcp_command_repository.h"
 
 #include <common/env.h>