a fix for colorspace=2020 in avformat consumer

mltframework · Jan 19, 2025 · b5890a1 · b5890a1
1 parent 32abe16
commit b5890a1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/framework/mlt_profile.h b/src/framework/mlt_profile.h
@@ -3,7 +3,7 @@
  * \brief video output definition
  * \see mlt_profile_s
  *
- * Copyright (C) 2007-2018 Meltytech, LLC
+ * Copyright (C) 2007-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
@@ -43,7 +43,7 @@ struct mlt_profile_s
     int sample_aspect_den;  /**< the denominator of the pixel aspect ratio */
     int display_aspect_num; /**< the numerator of the image aspect ratio in case it can not be simply derived (e.g. ITU-R 601) */
     int display_aspect_den; /**< the denominator of the image aspect ratio in case it can not be simply derived (e.g. ITU-R 601) */
-    int colorspace; /**< the Y'CbCr colorspace standard: =601 for ITU-R 601, =709 for ITU-R 709, or =240 for SMPTE240M */
+    int colorspace; /**< the Y'CbCr colorspace standard: `601` for ITU-R 601, `709` for ITU-R 709, `240` for SMPTE240M, `2020` for ITU-R BT.2020 non-constant luminance, `2021` for ITU-R BT.2020 constant luminance */
     int is_explicit; /**< used internally to indicate if the profile was requested explicitly or computed or defaulted */
 };
 

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
@@ -1,6 +1,6 @@
 /*
  * consumer_avformat.c -- an encoder based on avformat
- * Copyright (C) 2003-2024 Meltytech, LLC
+ * Copyright (C) 2003-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
@@ -330,7 +330,7 @@ static void recompute_aspect_ratio(mlt_properties properties)
 
 static void color_trc_from_colorspace(mlt_properties properties)
 {
-    // Default color transfer characteristic from colorspace.
+    // Default color transfer characteristic from MLT colorspace.
     switch (mlt_properties_get_int(properties, "colorspace")) {
     case 709:
         mlt_properties_set_int(properties, "color_trc", AVCOL_TRC_BT709);
@@ -358,7 +358,7 @@ static void color_trc_from_colorspace(mlt_properties properties)
 
 static void color_primaries_from_colorspace(mlt_properties properties)
 {
-    // Default color transfer characteristic from colorspace.
+    // Default color_primaries from MLT colorspace.
     switch (mlt_properties_get_int(properties, "colorspace")) {
     case 0: // sRGB
     case 709:
@@ -390,7 +390,7 @@ static void color_primaries_from_colorspace(mlt_properties properties)
 
 static void av_colorspace_from_colorspace(mlt_properties properties, int colorspace)
 {
-    // Default color_space from colorspace.
+    // Convert MLT colorspace to FFmpeg colorspace.
     switch (colorspace) {
     case 0: // sRGB
         mlt_properties_set_int(properties, "colorspace", AVCOL_SPC_RGB);
@@ -1015,6 +1015,12 @@ static AVStream *add_video_stream(mlt_consumer consumer,
         case 709:
             c->colorspace = AVCOL_SPC_BT709;
             break;
+        case 2020:
+            c->colorspace = AVCOL_SPC_BT2020_NCL;
+            break;
+        case 2021:
+            c->colorspace = AVCOL_SPC_BT2020_CL;
+            break;
         }
 
         if (mlt_properties_get(properties, "aspect")) {