Ensure colorspace and trc are set consistently

Author: bmatherly

src/framework/mlt.vers

@@ -677,7 +677,12 @@ MLT_7.34.0 {
     mlt_image_colorspace_id;
     mlt_image_color_pri_name;
     mlt_image_color_pri_id;
+} MLT_7.32.0;
+
+MLT_7.36.0 {
+  global:
+    mlt_image_default_colorspace;
     mlt_image_default_trc;
     mlt_image_default_primaries;
     mlt_color_convert_trc;
-} MLT_7.32.0;
+} MLT_7.34.0;

src/framework/mlt_image.c

@@ -472,6 +472,48 @@ mlt_color_primaries mlt_image_color_pri_id(const char *name)
     return mlt_color_pri_none;
 }
 
+/** Get the default colorspace for a given image format.
+ *
+ * \public \memberof mlt_image_s
+ * \param format the format
+ * \param height the image height. Pass 0 if you do not know.
+ * \return a colorspace
+ */
+
+mlt_colorspace mlt_image_default_colorspace(mlt_image_format format, int height)
+{
+    mlt_colorspace colorspace = mlt_colorspace_bt709;
+    switch (format) {
+    case mlt_image_rgb:
+    case mlt_image_rgba:
+    case mlt_image_rgba64:
+    case mlt_image_movit:
+    case mlt_image_opengl_texture:
+        colorspace = mlt_colorspace_rgb;
+        break;
+    case mlt_image_yuv422:
+    case mlt_image_yuv420p:
+    case mlt_image_yuv422p16:
+    case mlt_image_yuv420p10:
+    case mlt_image_yuv444p10:
+        if (height < 576) {
+            // Assume NTSC
+            colorspace = mlt_colorspace_smpte170m;
+        } else if (height < 720) {
+            // Assume PAL
+            colorspace = mlt_colorspace_bt470bg;
+        } else {
+            // Assume HDTV
+            colorspace = mlt_color_trc_bt709;
+        }
+        break;
+    case mlt_image_none:
+    case mlt_image_invalid:
+        break;
+    }
+    return colorspace;
+}
+
 /** Get the default color transfer characteristics for a given colorspace.
  *
  * \public \memberof mlt_image_s

src/framework/mlt_image.h

@@ -69,7 +69,9 @@ MLT_EXPORT const char *mlt_image_colorspace_name(mlt_colorspace colorspace);
 MLT_EXPORT mlt_colorspace mlt_image_colorspace_id(const char *name);
 MLT_EXPORT const char *mlt_image_color_pri_name(mlt_color_primaries primaries);
 MLT_EXPORT mlt_color_primaries mlt_image_color_pri_id(const char *name);
+MLT_EXPORT mlt_colorspace mlt_image_default_colorspace(mlt_image_format format, int height);
 MLT_EXPORT mlt_color_trc mlt_image_default_trc(mlt_colorspace colorspace);
+MLT_EXPORT mlt_color_primaries mlt_image_default_primaries(mlt_colorspace colorspace, int height);
 MLT_EXPORT int mlt_image_rgba_opaque(uint8_t *image, int width, int height);
 MLT_EXPORT int mlt_image_full_range(const char *color_range);
 

src/modules/avformat/common.c

@@ -582,61 +582,11 @@ mlt_color_primaries av_to_mlt_color_primaries(int primaries)
     return mlt_color_pri_none;
 }
 
-mlt_color_primaries mlt_color_primaries_from_colorspace(mlt_colorspace colorspace, int height)
-{
-    switch (colorspace) {
-    case mlt_colorspace_rgb: // sRGB
-    case mlt_colorspace_bt709:
-        return mlt_color_pri_bt709;
-    case mlt_colorspace_bt470bg:
-        return mlt_color_pri_bt470bg;
-    case mlt_colorspace_smpte240m:
-        return mlt_color_pri_smpte170m;
-    case mlt_colorspace_bt601:
-        return height == 576 ? mlt_color_pri_bt470bg : mlt_color_pri_smpte170m;
-    case mlt_colorspace_smpte170m:
-        return mlt_color_pri_smpte170m;
-    case mlt_colorspace_bt2020_ncl:
-        return mlt_color_pri_bt2020;
-    case mlt_colorspace_unspecified:
-    case mlt_colorspace_reserved:
-    case mlt_colorspace_fcc:
-    case mlt_colorspace_ycgco:
-    case mlt_colorspace_bt2020_cl:
-    case mlt_colorspace_smpte2085:
-    case mlt_colorspace_invalid:
-        break;
-    }
-    return mlt_color_pri_none;
-}
-
 int mlt_to_av_color_range(int full_range)
 {
     return full_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG;
 }
 
-mlt_color_trc mlt_color_trc_from_colorspace(mlt_colorspace colorspace)
-{
-    switch (colorspace) {
-    case mlt_colorspace_bt709:
-        return mlt_color_trc_bt709;
-    case mlt_colorspace_bt470bg:
-        return mlt_color_trc_gamma28;
-    case mlt_colorspace_smpte240m:
-        return mlt_color_trc_smpte240m;
-    case mlt_colorspace_rgb: // sRGB
-        return mlt_color_trc_iec61966_2_1;
-    case mlt_colorspace_bt601:
-    case mlt_colorspace_smpte170m:
-        return mlt_color_trc_smpte170m;
-    case mlt_colorspace_bt2020_ncl:
-        return mlt_color_trc_bt2020_10;
-    default:
-        break;
-    }
-    return mlt_color_trc_none;
-}
-
 int av_to_mlt_full_range(int color_range)
 {
     return color_range == AVCOL_RANGE_JPEG;

src/modules/avformat/common.h

@@ -50,8 +50,6 @@ int mlt_to_av_colorspace(mlt_colorspace colorspace, int height);
 mlt_colorspace av_to_mlt_colorspace(int colorspace, int width, int height);
 int mlt_to_av_color_primaries(mlt_color_primaries primaries);
 mlt_color_primaries av_to_mlt_color_primaries(int primaries);
-mlt_color_primaries mlt_color_primaries_from_colorspace(mlt_colorspace colorspace, int height);
-mlt_color_trc mlt_color_trc_from_colorspace(mlt_colorspace colorspace);
 int mlt_to_av_color_range(int full_range);
 int av_to_mlt_full_range(int color_range);
 void mlt_image_to_avframe(mlt_image image, mlt_frame mltframe, AVFrame *avframe);

src/modules/avformat/consumer_avformat.c

@@ -371,7 +371,7 @@ static void color_trc_from_colorspace(mlt_properties properties)
     // Default color transfer characteristic from MLT colorspace.
     const char *colorspace_str = mlt_properties_get(properties, "colorspace");
     const mlt_colorspace colorspace = mlt_image_colorspace_id(colorspace_str);
-    const mlt_color_trc trc = mlt_color_trc_from_colorspace(colorspace);
+    const mlt_color_trc trc = mlt_image_default_trc(colorspace);
     mlt_properties_set_int(properties, "color_trc", trc);
 }
 
@@ -381,7 +381,7 @@ static void color_primaries_from_colorspace(mlt_properties properties)
     const char *colorspace_str = mlt_properties_get(properties, "colorspace");
     mlt_colorspace colorspace = mlt_image_colorspace_id(colorspace_str);
     int height = mlt_properties_get_int(properties, "height");
-    mlt_color_primaries primaries = mlt_color_primaries_from_colorspace(colorspace, height);
+    mlt_color_primaries primaries = mlt_image_default_primaries(colorspace, height);
     if (primaries != mlt_color_pri_none)
         mlt_properties_set_int(properties, "color_primaries", primaries);
 }

src/modules/avformat/filter_avcolour_space.c

@@ -155,14 +155,29 @@ static int convert_image(mlt_frame frame,
     if (*format != output_format || out_width) {
         mlt_profile profile = mlt_service_profile(
             MLT_PRODUCER_SERVICE(mlt_frame_get_original_producer(frame)));
-        mlt_colorspace profile_colorspace = profile ? profile->colorspace : mlt_colorspace_bt601;
-        const char *colorspace_str = mlt_properties_get(properties, "colorspace");
-        mlt_colorspace colorspace = mlt_image_colorspace_id(colorspace_str);
         int width = mlt_properties_get_int(properties, "width");
         int height = mlt_properties_get_int(properties, "height");
+        mlt_colorspace dst_colorspace = profile ? profile->colorspace : mlt_colorspace_bt601;
+        const char *src_colorspace_str = mlt_properties_get(properties, "colorspace");
+        mlt_colorspace src_colorspace = mlt_image_colorspace_id(src_colorspace_str);
+        if (src_colorspace == mlt_colorspace_unspecified
+            || src_colorspace == mlt_colorspace_reserved
+            || src_colorspace == mlt_colorspace_invalid) {
+            src_colorspace = mlt_image_default_colorspace(*format, height);
+        }
         int src_full_range = mlt_properties_get_int(properties, "full_range");
         const char *dst_color_range = mlt_properties_get(properties, "consumer.color_range");
         int dst_full_range = mlt_image_full_range(dst_color_range);
+        // Fix some producers that may not be setting properties correctly
+        if (output_format == mlt_image_rgb || output_format == mlt_image_rgba
+            || output_format == mlt_image_rgba64) {
+            dst_full_range = 1;
+            dst_colorspace = mlt_colorspace_rgb;
+        }
+        if (*format == mlt_image_rgb || *format == mlt_image_rgba || *format == mlt_image_rgba64) {
+            src_full_range = 1;
+            src_colorspace = mlt_colorspace_rgb;
+        }
 
         if (out_width <= 0)
             out_width = width;
@@ -178,8 +193,8 @@ static int convert_image(mlt_frame frame,
             mlt_image_format_name(output_format),
             out_width,
             out_height,
-            colorspace,
-            profile_colorspace,
+            src_colorspace,
+            dst_colorspace,
             src_full_range,
             dst_full_range,
             mlt_frame_get_position(frame));
@@ -260,15 +275,11 @@ static int convert_image(mlt_frame frame,
                               out_height,
                               width,
                               height,
-                              colorspace,
-                              profile_colorspace,
+                              src_colorspace,
+                              dst_colorspace,
                               src_full_range,
                               dst_full_range)) {
-            // The new colorspace is only valid if destination is YUV.
-            if (output_format == mlt_image_yuv422 || output_format == mlt_image_yuv420p
-                || output_format == mlt_image_yuv422p16 || output_format == mlt_image_yuv420p10
-                || output_format == mlt_image_yuv444p10)
-                mlt_properties_set_int(properties, "colorspace", profile_colorspace);
+            mlt_properties_set_int(properties, "colorspace", dst_colorspace);
             mlt_properties_set_int(properties, "full_range", dst_full_range);
         }
         mlt_frame_set_image(frame, output, size, mlt_pool_release);
@@ -344,15 +355,6 @@ static int convert_image(mlt_frame frame,
 
 static mlt_frame filter_process(mlt_filter filter, mlt_frame frame)
 {
-    // Set a default colorspace on the frame if not yet set by the producer.
-    // The producer may still change it during get_image.
-    // This way we do not have to modify each producer to set a valid colorspace.
-    mlt_properties properties = MLT_FRAME_PROPERTIES(frame);
-    if (mlt_properties_get_int(properties, "colorspace") <= 0)
-        mlt_properties_set_int(properties,
-                               "colorspace",
-                               mlt_service_profile(MLT_FILTER_SERVICE(filter))->colorspace);
-
     if (!frame->convert_image)
         frame->convert_image = convert_image;
 

src/modules/avformat/filter_avfilter.c

@@ -863,12 +863,12 @@ static int filter_get_image(mlt_frame frame,
         const char *primaries_str = mlt_properties_get(frame_properties, "color_primaries");
         mlt_color_primaries primaries = mlt_image_color_pri_id(primaries_str);
         if (primaries == mlt_color_pri_none)
-            primaries = mlt_color_primaries_from_colorspace(colorspace, *height);
+            primaries = mlt_image_default_primaries(colorspace, *height);
         pdata->avinframe->color_primaries = mlt_to_av_color_primaries(primaries);
         const char *color_trc_str = mlt_properties_get(frame_properties, "color_trc");
         mlt_color_trc trc = mlt_image_color_trc_id(color_trc_str);
         if (trc == mlt_color_trc_none)
-            trc = mlt_color_trc_from_colorspace(colorspace);
+            trc = mlt_image_default_trc(colorspace);
         pdata->avinframe->color_trc = mlt_to_av_color_trc(trc);
         pdata->avinframe->color_range = mlt_to_av_color_range(full_range);
 

src/modules/avformat/link_avfilter.c

@@ -967,13 +967,13 @@ static int link_get_image(mlt_frame frame,
         const char *primaries_str = mlt_properties_get(frame_properties, "color_primaries");
         mlt_color_primaries primaries = mlt_image_color_pri_id(primaries_str);
         if (primaries == mlt_color_pri_none)
-            primaries = mlt_color_primaries_from_colorspace(colorspace, *height);
+            primaries = mlt_image_default_primaries(colorspace, *height);
         pdata->avinframe->color_primaries = mlt_to_av_color_primaries(primaries);
         const char *color_trc_str = mlt_properties_get(frame_properties, "color_trc");
         mlt_color_trc trc = mlt_image_color_trc_id(color_trc_str);
         pdata->avinframe->color_trc = mlt_to_av_color_trc(trc);
         if (trc == mlt_color_trc_none)
-            trc = mlt_color_trc_from_colorspace(colorspace);
+            trc = mlt_image_default_trc(colorspace);
         pdata->avinframe->color_range = mlt_to_av_color_range(full_range);
         const char *colorspace_str = mlt_properties_get(frame_properties, "colorspace");
         mlt_colorspace colorspace = mlt_image_colorspace_id(colorspace_str);

src/modules/avformat/producer_avformat.c

@@ -2097,7 +2097,7 @@ static void convert_image(producer_avformat self,
     }
     mlt_log_timings_end(NULL, __FUNCTION__);
 
-    mlt_color_primaries primaries = mlt_color_primaries_from_colorspace(colorspace, height);
+    mlt_color_primaries primaries = mlt_image_default_primaries(colorspace, height);
     if (primaries == mlt_color_pri_none)
         primaries = mlt_color_pri_bt709;
     mlt_properties_set_int(frame_properties, "color_primaries", primaries);