fix: rename rgba8 to bgra8 to reflect actual format

Author: Julusian

src/accelerator/ogl/image/frame_converter.cpp

@@ -37,7 +37,7 @@ std::shared_future<array<const std::uint8_t>>
 ogl_frame_converter::convert_to_buffer(const core::const_frame&         frame,
                                        const core::frame_conversion_format& format)
 {
-    if (format.format != core::frame_conversion_format::pixel_format::rgba8)
+    if (format.format != core::frame_conversion_format::pixel_format::bgra8)
         CASPAR_THROW_EXCEPTION(not_supported() << msg_info("format not implemented"));
     if (format.key_only)
         CASPAR_THROW_EXCEPTION(not_supported() << msg_info("key_only not implemented"));

src/core/frame/frame_converter.h

@@ -35,7 +35,7 @@ struct frame_conversion_format
 {
     enum pixel_format
     {
-        rgba8 = 0,
+        bgra8 = 0,
         // rgba16        = 0,
         // bgra16        = 1,
         // decklink_v210 = 2,

src/modules/artnet/consumer/artnet_consumer.cpp

@@ -111,7 +111,7 @@ struct artnet_consumer : public core::frame_consumer
                     if (last_fetched_frame != frame) {
                         last_fetched_frame = frame;
                         // Future: this is not the most performant, but is simple to immediately wait
-                        last_fetched_pixels = frame_converter_->convert_to_buffer(frame, core::frame_conversion_format(core::frame_conversion_format::pixel_format::rgba8)).get();
+                        last_fetched_pixels = frame_converter_->convert_to_buffer(frame, core::frame_conversion_format(core::frame_conversion_format::pixel_format::bgra8)).get();
                     }
 
 

src/modules/bluefish/consumer/bluefish_consumer.cpp

@@ -164,7 +164,7 @@ EBlueVideoChannel get_bluesdk_videochannel_from_streamid(bluefish_hardware_outpu
 
 struct bluefish_consumer
 {
-    const spl::shared_ptr<core::frame_converter> frame_converter_;
+    const spl::shared_ptr<core::frame_converter> frame_converter_;
 
     const int           channel_index_;
     const configuration config_;
@@ -211,11 +211,11 @@ struct bluefish_consumer
     bluefish_consumer(const bluefish_consumer&)            = delete;
     bluefish_consumer& operator=(const bluefish_consumer&) = delete;
 
-    bluefish_consumer(const spl::shared_ptr<core::frame_converter>& frame_converter,
+    bluefish_consumer(const spl::shared_ptr<core::frame_converter>& frame_converter,
                         const configuration& config,
                       const core::video_format_desc&                                                    format_desc,
                       int                                                                               channel_index)
-        : frame_converter_(frame_converter)
+        : frame_converter_(frame_converter)
         , channel_index_(channel_index)
         , config_(config)
         , format_desc_(format_desc)
@@ -637,11 +637,11 @@ struct bluefish_consumer
 
         if (!frame) {
             return !abort_request_;
-        }
-
+        }
+
         auto frame2 = frame_converter_->convert_to_buffer_and_frame(
             frame,
-            core::frame_conversion_format(core::frame_conversion_format::pixel_format::rgba8, format_desc_.width, format_desc_.height));
+            core::frame_conversion_format(core::frame_conversion_format::pixel_format::bgra8, format_desc_.width, format_desc_.height));
 
         try {
             std::unique_lock<std::mutex> lock(buffer_mutex_);
@@ -720,9 +720,9 @@ struct bluefish_consumer
     void copy_frame(core::converted_frame frame)
     {
         int audio_samples_for_next_frame =
-            blue_->get_num_audio_samples_for_frame(mode_, static_cast<unsigned int>(audio_frames_filled_));
-
-        
+            blue_->get_num_audio_samples_for_frame(mode_, static_cast<unsigned int>(audio_frames_filled_));
+
+        
         // TODO - avoid doing the .get() immediately
         auto frame_pixels = frame.pixels.get();
 
@@ -854,9 +854,9 @@ struct bluefish_consumer_proxy : public core::frame_consumer
 
   public:
     explicit bluefish_consumer_proxy(
-        const spl::shared_ptr<core::frame_converter>& frame_converter,
+        const spl::shared_ptr<core::frame_converter>& frame_converter,
         const configuration& config)
-        : frame_converter_(frame_converter)
+        : frame_converter_(frame_converter)
         , config_(config)
         , executor_(L"bluefish_consumer[" + std::to_wstring(config.device_index) + L"]")
     {

src/modules/decklink/consumer/decklink_consumer.cpp

@@ -1037,7 +1037,7 @@ struct decklink_consumer final : public IDeckLinkVideoOutputCallback
         if (frame) {
             auto wrapped_frame = frame_converter_->convert_to_buffer_and_frame(
                 frame,
-                core::frame_conversion_format(core::frame_conversion_format::pixel_format::rgba8,
+                core::frame_conversion_format(core::frame_conversion_format::pixel_format::bgra8,
                                               decklink_format_desc_.width,
                                               decklink_format_desc_.height));
 

src/modules/ffmpeg/consumer/ffmpeg_consumer.cpp

@@ -687,7 +687,7 @@ struct ffmpeg_consumer : public core::frame_consumer
                     std::optional<core::converted_frame> wrapped_frame;
                     if (frame)
                         // TODO - better pixel format
-                        wrapped_frame = frame_converter_->convert_to_buffer_and_frame(frame, core::frame_conversion_format(core::frame_conversion_format::pixel_format::rgba8));
+                        wrapped_frame = frame_converter_->convert_to_buffer_and_frame(frame, core::frame_conversion_format(core::frame_conversion_format::pixel_format::bgra8));
 
                     caspar::timer frame_timer;
                     tbb::parallel_invoke(

src/modules/image/consumer/image_consumer.cpp

@@ -71,7 +71,7 @@ struct image_consumer : public core::frame_consumer
     {
         auto filename = filename_;
 
-        auto encode_format = core::frame_conversion_format(core::frame_conversion_format::pixel_format::rgba8);
+        auto encode_format = core::frame_conversion_format(core::frame_conversion_format::pixel_format::bgra8);
         // encode_format.straight_alpha = true; // Future
 
         std::thread async([frame_converter = frame_converter_, frame, filename, encode_format] {

src/modules/newtek/consumer/newtek_ndi_consumer.cpp

@@ -226,7 +226,7 @@ struct newtek_ndi_consumer : public core::frame_consumer
     std::future<bool> send(core::video_field field, core::const_frame frame) override
     {
         auto wrapped_frame =
-               frame_converter_->convert_to_buffer_and_frame(frame, core::frame_conversion_format(core::frame_conversion_format::pixel_format::rgba8));
+               frame_converter_->convert_to_buffer_and_frame(frame, core::frame_conversion_format(core::frame_conversion_format::pixel_format::bgra8));
 
         return executor_.begin_invoke([=] {
             graph_->set_value("tick-time", tick_timer_.elapsed() * format_desc_.fps * 0.5);

src/modules/screen/consumer/screen_consumer.cpp

@@ -469,7 +469,7 @@ struct screen_consumer
 
     std::future<bool> send(core::video_field field, const core::const_frame& frame)
     {
-        auto frame2 = frame_converter_->convert_to_buffer_and_frame(frame, core::frame_conversion_format(core::frame_conversion_format::pixel_format::rgba8));
+        auto frame2 = frame_converter_->convert_to_buffer_and_frame(frame, core::frame_conversion_format(core::frame_conversion_format::pixel_format::bgra8));
         if (!frame_buffer_.try_push(frame2)) {
             graph_->set_tag(diagnostics::tag_severity::WARNING, "dropped-frame");
         }