wip: fix build

Julusian · Julusian · commit f4f62e310cc8 · 2025-01-21T21:58:59.000Z
diff --git a/src/accelerator/ogl/image/frame_converter.cpp b/src/accelerator/ogl/image/frame_converter.cpp
@@ -107,7 +107,7 @@ ogl_frame_converter::convert_from_rgba(const core::const_frame&         frame,
         CASPAR_THROW_EXCEPTION(not_supported() << msg_info("Unknown encoded frame format"));
     }
 
-    auto texture_ptr = boost::any_cast<std::shared_ptr<texture>>(frame.opaque());
+    auto texture_ptr = std::any_cast<std::shared_ptr<texture>>(frame.opaque());
     if (!texture_ptr) {
         CASPAR_THROW_EXCEPTION(not_supported() << msg_info("No texture inside frame!"));
     }
@@ -126,7 +126,7 @@ ogl_frame_converter::convert_from_rgba(const core::const_frame&         frame,
 
 common::bit_depth ogl_frame_converter::get_frame_bitdepth(const core::const_frame& frame)
 {
-    auto texture_ptr = boost::any_cast<std::shared_ptr<texture>>(frame.opaque());
+    auto texture_ptr = std::any_cast<std::shared_ptr<texture>>(frame.opaque());
     if (!texture_ptr) {
         CASPAR_THROW_EXCEPTION(not_supported() << msg_info("No texture inside frame!"));
     }
diff --git a/src/accelerator/ogl/image/image_mixer.cpp b/src/accelerator/ogl/image/image_mixer.cpp
@@ -82,7 +82,6 @@ class image_renderer
                             core::color_space              color_space)
         : ogl_(ogl)
         , kernel_(ogl_)
-        , depth_(depth)
         , max_frame_size_(max_frame_size)
         , depth_(depth)
         , color_space_(color_space)
@@ -98,7 +97,7 @@ class image_renderer
         //        }
 
         return flatten(ogl_->dispatch_async(
-            [=, layers = std::move(layers)]() mutable -> std::shared_future<array<const std::uint8_t>> {
+            [=, layers = std::move(layers)]() mutable -> std::shared_future<core::mixed_image> {
                 auto target_texture = ogl_->create_texture(format_desc.width, format_desc.height, 4, depth_);
 
                 draw(target_texture, std::move(layers), format_desc);
diff --git a/src/accelerator/ogl/image/image_mixer.h b/src/accelerator/ogl/image/image_mixer.h
@@ -48,7 +48,7 @@ class image_mixer final : public core::image_mixer
 
     image_mixer& operator=(const image_mixer&) = delete;
 
-    std::future<array<const std::uint8_t>> operator()(const core::video_format_desc& format_desc) override;
+    std::future<core::mixed_image> operator()(const core::video_format_desc& format_desc) override;
     core::mutable_frame                    create_frame(const void* tag, const core::pixel_format_desc& desc) override;
     core::mutable_frame
     create_frame(const void* video_stream_tag, const core::pixel_format_desc& desc, common::bit_depth depth) override;
diff --git a/src/core/frame/frame.cpp b/src/core/frame/frame.cpp
@@ -155,7 +155,7 @@ const_frame::const_frame(std::vector<array<const std::uint8_t>> image_data,
 const_frame::const_frame(std::vector<array<const std::uint8_t>> image_data,
                          array<const std::int32_t>              audio_data,
                          const struct pixel_format_desc&        desc,
-                         boost::any                             opaque)
+                         std::any                             opaque)
     : impl_(new impl(std::move(image_data), std::move(audio_data), desc, opaque))
 {
 }
diff --git a/src/core/mixer/image/image_mixer.h b/src/core/mixer/image/image_mixer.h
@@ -34,9 +34,9 @@ namespace caspar { namespace core {
 struct mixed_image
 {
     array<const uint8_t> rgba8;
-    boost::any           texture;
+    std::any           texture;
 
-    mixed_image(array<const uint8_t> rgba8, boost::any texture)
+    mixed_image(array<const uint8_t> rgba8, std::any texture)
         : rgba8(rgba8)
         , texture(texture)
     {
diff --git a/src/modules/decklink/consumer/decklink_consumer.cpp b/src/modules/decklink/consumer/decklink_consumer.cpp
@@ -966,7 +966,7 @@ struct decklink_consumer final : public IDeckLinkVideoOutputCallback
                     // //                                                           frame2,
                     // //                                                           mode_->GetFieldDominance());
 
-                    // auto buffer = frame1.value().frame.get();
+                    auto buffer = frame1.value().frame.get();
 
                     // // rgb12:
                     // //                    std::shared_ptr<void> image_data =
@@ -978,20 +978,20 @@ struct decklink_consumer final : public IDeckLinkVideoOutputCallback
                     // //                    video_display_time);
 
                     // // yuv10:
-                    // std::shared_ptr<void> image_data = create_aligned_buffer(buffer.size(), 128);
-                    // std::memcpy(image_data.get(), buffer.data(), buffer.size());
+                    std::shared_ptr<void> image_data = create_aligned_buffer(buffer.size(), 128);
+                    std::memcpy(image_data.get(), buffer.data(), buffer.size());
 
                     // schedule_next_video(image_data, bmdFormat10BitYUV, nb_samples, video_display_time);
-                    std::shared_ptr<void> image_data = convert_frame_for_port(channel_format_desc_,
-                                                                              decklink_format_desc_,
-                                                                              config_.primary,
-                                                                              frame1,
-                                                                              frame2,
-                                                                              mode_->GetFieldDominance(),
-                                                                              config_.hdr);
+                    // std::shared_ptr<void> image_data = convert_frame_for_port(channel_format_desc_,
+                    //                                                           decklink_format_desc_,
+                    //                                                           config_.primary,
+                    //                                                           frame1,
+                    //                                                           frame2,
+                    //                                                           mode_->GetFieldDominance(),
+                    //                                                           config_.hdr);
 
                     schedule_next_video(
-                        image_data, nb_samples, video_display_time, frame1.pixel_format_desc().color_space);
+                        image_data, nb_samples, video_display_time, frame1.value().raw_frame.pixel_format_desc().color_space);
 
                     if (config_.embedded_audio) {
                         schedule_next_audio(std::move(audio_data), nb_samples);
@@ -1180,7 +1180,7 @@ spl::shared_ptr<core::frame_consumer> create_consumer(const std::vector<std::wst
                                << msg_info("Decklink consumer does not support hdr in combination with key only"));
     }
 
-    return spl::make_shared<decklink_consumer_proxy>(config);
+    return spl::make_shared<decklink_consumer_proxy>(frame_converter, config);
 }
 
 spl::shared_ptr<core::frame_consumer>

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ ogl_frame_converter::convert_from_rgba(const core::const_frame& frame,`
`107`	`107`	`CASPAR_THROW_EXCEPTION(not_supported() << msg_info("Unknown encoded frame format"));`
`108`	`108`	`}`
`109`	`109`
`110`		`- auto texture_ptr = boost::any_cast<std::shared_ptr<texture>>(frame.opaque());`
	`110`	`+ auto texture_ptr = std::any_cast<std::shared_ptr<texture>>(frame.opaque());`
`111`	`111`	`if (!texture_ptr) {`
`112`	`112`	`CASPAR_THROW_EXCEPTION(not_supported() << msg_info("No texture inside frame!"));`
`113`	`113`	`}`
`@@ -126,7 +126,7 @@ ogl_frame_converter::convert_from_rgba(const core::const_frame& frame,`
`126`	`126`
`127`	`127`	`common::bit_depth ogl_frame_converter::get_frame_bitdepth(const core::const_frame& frame)`
`128`	`128`	`{`
`129`		`- auto texture_ptr = boost::any_cast<std::shared_ptr<texture>>(frame.opaque());`
	`129`	`+ auto texture_ptr = std::any_cast<std::shared_ptr<texture>>(frame.opaque());`
`130`	`130`	`if (!texture_ptr) {`
`131`	`131`	`CASPAR_THROW_EXCEPTION(not_supported() << msg_info("No texture inside frame!"));`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ const_frame::const_frame(std::vector<array<const std::uint8_t>> image_data,`
`155`	`155`	`const_frame::const_frame(std::vector<array<const std::uint8_t>> image_data,`
`156`	`156`	`array<const std::int32_t> audio_data,`
`157`	`157`	`const struct pixel_format_desc& desc,`
`158`		`- boost::any opaque)`
	`158`	`+ std::any opaque)`
`159`	`159`	`: impl_(new impl(std::move(image_data), std::move(audio_data), desc, opaque))`
`160`	`160`	`{`
`161`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,9 @@ namespace caspar { namespace core {`
`34`	`34`	`struct mixed_image`
`35`	`35`	`{`
`36`	`36`	`array<const uint8_t> rgba8;`
`37`		`- boost::any texture;`
	`37`	`+ std::any texture;`
`38`	`38`
`39`		`- mixed_image(array<const uint8_t> rgba8, boost::any texture)`
	`39`	`+ mixed_image(array<const uint8_t> rgba8, std::any texture)`
`40`	`40`	`: rgba8(rgba8)`
`41`	`41`	`, texture(texture)`
`42`	`42`	`{`