vd_lavc, mp_image: remove code duplication for AVFrame<->mp_image

Mostly affects conversion of the colorimetric parameters.

Not changing AV_FRAME_DATA_MASTERING_DISPLAY_METADATA handling - that's
too messy, as decoders typically output it for keyframes only, and would
require weird caching that can't even be done on the level of the frame
rewrapping functions.

1 files changed, 14 insertions, 0 deletions

diff --git a/video/mp_image.c b/video/mp_image.c
index 9781386129..37d8f67343 100644
--- a/video/mp_image.c
+++ b/video/mp_image.c
@@ -712,6 +712,15 @@ static void mp_image_copy_fields_from_av_frame(struct mp_image *dst,
         AVHWFramesContext *fctx = (void *)src->hw_frames_ctx->data;
         dst->params.hw_subfmt = pixfmt2imgfmt(fctx->sw_format);
     }
+
+    dst->params.color = (struct mp_colorspace){
+        .space = avcol_spc_to_mp_csp(src->colorspace),
+        .levels = avcol_range_to_mp_csp_levels(src->color_range),
+        .primaries = avcol_pri_to_mp_csp_prim(src->color_primaries),
+        .gamma = avcol_trc_to_mp_csp_trc(src->color_trc),
+    };
+
+    dst->params.chroma_location = avchroma_location_to_mp(src->chroma_location);
 }
 
 // Copy properties and data of the mp_image into the AVFrame, without taking
@@ -742,6 +751,11 @@ static void mp_image_copy_fields_to_av_frame(struct AVFrame *dst,
 
     dst->colorspace = mp_csp_to_avcol_spc(src->params.color.space);
     dst->color_range = mp_csp_levels_to_avcol_range(src->params.color.levels);
+    dst->color_primaries =
+        mp_csp_prim_to_avcol_pri(src->params.color.primaries);
+    dst->color_trc = mp_csp_trc_to_avcol_trc(src->params.color.gamma);
+
+    dst->chroma_location = mp_chroma_location_to_av(src->params.chroma_location);
 }
 
 // Create a new mp_image reference to av_frame.