video/mp_image: fix vf=format colorspace override for XYZ

If format is RGB but flagged as XYZ it should be used instead.

Kacper Michajłow committed 1 year ago

Commit 4e5cc9c1 parent 638ada11 file · +10 −3Browse files

Unified · Split

 static enum pl_color_system mp_image_params_get_forced_csp(struct mp_image_params *params)
 {
     int imgfmt = params->hw_subfmt ? params->hw_subfmt : params->imgfmt;
-    return mp_imgfmt_get_forced_csp(imgfmt);
+    enum pl_color_system csp = mp_imgfmt_get_forced_csp(imgfmt);
+    if (csp == PL_COLOR_SYSTEM_RGB && params->repr.sys == PL_COLOR_SYSTEM_XYZ)
+        csp = PL_COLOR_SYSTEM_XYZ;
+    return csp;
 }
 static void assign_bufref(AVBufferRef **dst, AVBufferRef *new)
         if (params->color.transfer == PL_COLOR_TRC_UNKNOWN)
             params->color.transfer = PL_COLOR_TRC_BT_1886;
     } else if (forced_csp == PL_COLOR_SYSTEM_RGB) {
-        params->repr.sys = PL_COLOR_SYSTEM_RGB;
+        if (params->repr.sys == PL_COLOR_SYSTEM_UNKNOWN)
-        params->repr.levels = PL_COLOR_LEVELS_FULL;
+            params->repr.sys = PL_COLOR_SYSTEM_RGB;
+        if (params->repr.levels == PL_COLOR_LEVELS_UNKNOWN)
+            params->repr.levels = PL_COLOR_LEVELS_FULL;
         // The majority of RGB content is either sRGB or (rarely) some other
         // color space which we don't even handle, like AdobeRGB or

Keyboard shortcuts