Convert color property to linear in more filters

Author: ddennedy

src/modules/core/filter_autofade.c

@@ -129,6 +129,8 @@ static int filter_get_image(mlt_frame frame,
 
     if (image_factor < 1.0) {
         mlt_color color = mlt_properties_get_color(filter_properties, "fade_color");
+        color = mlt_color_convert_trc(color,
+                                      mlt_properties_get(MLT_FRAME_PROPERTIES(frame), "color_trc"));
         float color_factor = 1.0 - image_factor;
         float r_value = color.r * color_factor;
         float g_value = color.g * color_factor;

src/modules/frei0r/frei0r_helper.c

@@ -1,7 +1,7 @@
 /*
  * frei0r_helper.c -- frei0r helper
  * Copyright (c) 2008 Marco Gittler <g.marco@freenet.de>
- * Copyright (C) 2009-2023 Meltytech, LLC
+ * Copyright (C) 2009-2025 Meltytech, LLC
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,7 +19,6 @@
  */
 #include "frei0r_helper.h"
 #include <frei0r.h>
-#include <stdlib.h>
 #include <string.h>
 #ifdef _WIN32
 #include <windows.h>
@@ -93,6 +92,7 @@ int process_frei0r_item(mlt_service service,
 {
     int i = 0;
     mlt_properties prop = MLT_SERVICE_PROPERTIES(service);
+    mlt_properties frame_properties = MLT_FRAME_PROPERTIES(frame);
     f0r_instance_t (*f0r_construct)(unsigned int, unsigned int)
         = mlt_properties_get_data(prop, "f0r_construct", NULL);
     if (!f0r_construct) {
@@ -191,11 +191,11 @@ int process_frei0r_item(mlt_service service,
 
             // Special cairoblend handling for an override from the cairoblend_mode filter.
             if (is_cairoblend && i == 1) {
-                if (mlt_properties_get(MLT_FRAME_PROPERTIES(frame), CAIROBLEND_MODE_PROPERTY)) {
+                if (mlt_properties_get(frame_properties, CAIROBLEND_MODE_PROPERTY)) {
                     name = CAIROBLEND_MODE_PROPERTY;
-                    prop = MLT_FRAME_PROPERTIES(frame);
+                    prop = frame_properties;
                     val = mlt_properties_get(prop, name);
-                } else if (!val && !mlt_properties_get(MLT_FRAME_PROPERTIES(frame), name)) {
+                } else if (!val && !mlt_properties_get(frame_properties, name)) {
                     // Reset plugin back to its default value.
                     char *default_val = "normal";
                     char *plugin_val = NULL;
@@ -242,6 +242,10 @@ int process_frei0r_item(mlt_service service,
                         = mlt_properties_get(prop, index)
                               ? mlt_properties_anim_get_color(prop, index, position, length)
                               : mlt_properties_anim_get_color(prop, pinfo.name, position, length);
+                    if (type != mlt_service_producer_type) {
+                        const char *trc = mlt_properties_get(frame_properties, "color_trc");
+                        m_color = mlt_color_convert_trc(m_color, trc);
+                    }
                     f_color.r = (float) m_color.r / 255.0f;
                     f_color.g = (float) m_color.g / 255.0f;
                     f_color.b = (float) m_color.b / 255.0f;

src/modules/opencv/filter_opencv_tracker.cpp

@@ -516,6 +516,7 @@ static int filter_get_image(mlt_frame frame,
     if (shape_width != 0 && data->boundingBox.width > 0 && data->boundingBox.height > 0) {
         // Get the OpenCV image
         mlt_color shape_color = mlt_properties_get_color(filter_properties, "shape_color");
+        shape_color = mlt_color_convert_trc(shape_color, mlt_properties_get(MLT_FRAME_PROPERTIES(frame), "color_trc"));
         switch (mlt_properties_get_int(filter_properties, "shape")) {
         case 2:
             // Arrow

src/modules/plusgpl/filter_outline.cpp

@@ -120,7 +120,9 @@ static int filter_get_image(mlt_frame frame,
         Mlt::Frame fr(frame);
         auto position = filter.get_position(fr);
         auto length = filter.get_length2(fr);
-        slice_desc desc{.color = filter.anim_get_color("color", position, length),
+        auto color = filter.anim_get_color("color", position, length);
+        color = ::mlt_color_convert_trc(color, fr.get("color_trc"));
+        slice_desc desc{.color = color,
                         .thickness = filter.anim_get_double("thickness", position, length),
                         .original = *image};
 

src/modules/qt/filter_dropshadow.cpp

@@ -47,6 +47,7 @@ static int get_image(mlt_frame frame,
         mlt_position pos = filter.get_position(f);
         mlt_position len = filter.get_length2(f);
         auto color = filter.anim_get_color("color", pos, len);
+        color = ::mlt_color_convert_trc(color, f.get("color_trc"));
         shadow->setColor(QColor(color.r, color.g, color.b, color.a));
         shadow->setBlurRadius(filter.anim_get_double("radius", pos, len));
         shadow->setXOffset(filter.anim_get_double("x", pos, len));