Merge branch 'master' into wip/16bit-shader-conversions2

CasparCG · Jan 21, 2025 · be43820 · be43820
2 parents 448e927 + a355a4d
commit be43820
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/accelerator/ogl/image/image_kernel.cpp b/src/accelerator/ogl/image/image_kernel.cpp
@@ -308,8 +308,7 @@ struct image_kernel::impl
         // Setup shader
         shader_->use();
 
-        shader_->set("is_straight_alpha", params.pix_desc.is_straight);
-
+        shader_->set("is_straight_alpha", params.pix_desc.is_straight_alpha);
         shader_->set("plane[0]", texture_id::plane0);
         shader_->set("plane[1]", texture_id::plane1);
         shader_->set("plane[2]", texture_id::plane2);

diff --git a/src/core/frame/pixel_format.h b/src/core/frame/pixel_format.h
@@ -88,8 +88,8 @@ struct pixel_format_desc final
     {
     }
 
-    pixel_format       format      = pixel_format::invalid;
-    bool               is_straight = false;
+    pixel_format       format            = pixel_format::invalid;
+    bool               is_straight_alpha = false;
     std::vector<plane> planes;
     core::color_space  color_space = core::color_space::bt709;
 };

diff --git a/src/modules/image/producer/image_producer.cpp b/src/modules/image/producer/image_producer.cpp
@@ -94,7 +94,7 @@ struct image_producer : public core::frame_producer
     void load(const loaded_image& image, core::frame_geometry::scale_mode scale_mode)
     {
         core::pixel_format_desc desc(image.format);
-        desc.is_straight = image.is_straight;
+        desc.is_straight_alpha = image.is_straight;
         desc.planes.emplace_back(
             FreeImage_GetWidth(image.bitmap.get()), FreeImage_GetHeight(image.bitmap.get()), image.stride, image.depth);
 

diff --git a/src/modules/image/producer/image_scroll_producer.cpp b/src/modules/image/producer/image_scroll_producer.cpp
@@ -141,11 +141,11 @@ struct image_scroll_producer : public core::frame_producer
         if (end_time_)
             speed = -1.0;
 
-        auto bitmap = load_image(filename_, false);
-        FreeImage_FlipVertical(bitmap.bitmap.get());
+        auto image = load_image(filename_, false);
+        FreeImage_FlipVertical(image.bitmap.get());
 
-        width_  = FreeImage_GetWidth(bitmap.bitmap.get());
-        height_ = FreeImage_GetHeight(bitmap.bitmap.get());
+        width_  = FreeImage_GetWidth(image.bitmap.get());
+        height_ = FreeImage_GetHeight(image.bitmap.get());
 
         bool vertical   = width_ == format_desc_.width;
         bool horizontal = height_ == format_desc_.height;
@@ -170,7 +170,7 @@ struct image_scroll_producer : public core::frame_producer
 
         speed_ = speed_tweener(speed, speed, 0, tweener(L"linear"));
 
-        auto                   bytes = FreeImage_GetBits(bitmap.bitmap.get());
+        auto                   bytes = FreeImage_GetBits(image.bitmap.get());
         auto                   count = width_ * height_ * 4;
         image_view<bgra_pixel> original_view(bytes, width_, height_);
 
@@ -194,7 +194,7 @@ struct image_scroll_producer : public core::frame_producer
             caspar::tweener        blur_tweener(L"easeInQuad");
             blur(original_view, blurred_view, angle, motion_blur_px, blur_tweener);
             bytes = blurred_copy.get();
-            bitmap.bitmap.reset();
+            image.bitmap.reset();
         }
 
         if (vertical) {

diff --git a/src/modules/image/util/image_loader.h b/src/modules/image/util/image_loader.h
@@ -46,6 +46,7 @@ struct loaded_image
 
 loaded_image load_image(const std::wstring& filename, bool allow_all_formats);
 loaded_image load_png_from_memory(const void* memory_location, size_t size, bool allow_all_formats);
-bool         is_valid_file(const boost::filesystem::path& filename);
+
+bool is_valid_file(const boost::filesystem::path& filename);
 
 }} // namespace caspar::image