diff mbox series

[FFmpeg-devel,4/6] avfilter/vf_libplacebo: update metadata stripping logic

Message ID 20240426122803.19967-4-ffmpeg@haasn.xyz
State New
Headers show
Series [FFmpeg-devel,1/6] avutil/frame: add av_frame_remove_side_data_changed | expand

Checks

Context Check Description
yinshiyou/configure_loongarch64 warning Failed to apply patch

Commit Message

Niklas Haas April 26, 2024, 12:28 p.m. UTC 
From: Niklas Haas <git@haasn.dev>

Switches to av_frame_remove_side_data_changed(), covering a number of
cases that we previously ignored. Additionally, stop stripping metadata
when merely changing colorspace or color range, since these do not
affect the actual color volume of the image data, only the encoding.
---
 libavfilter/vf_libplacebo.c | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)
diff mbox series

Patch

diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c
index be9000aa8e..17da6fc71d 100644
--- a/libavfilter/vf_libplacebo.c
+++ b/libavfilter/vf_libplacebo.c
@@ -806,7 +806,7 @@  static void update_crops(AVFilterContext *ctx, LibplaceboInput *in,
 /* Construct and emit an output frame for a given timestamp */
 static int output_frame(AVFilterContext *ctx, int64_t pts)
 {
-    int err = 0, ok, changed_csp;
+    int err = 0, ok, changed;
     LibplaceboContext *s = ctx->priv;
     pl_options opts = s->opts;
     AVFilterLink *outlink = ctx->outputs[0];
@@ -842,6 +842,7 @@  static int output_frame(AVFilterContext *ctx, int64_t pts)
          * output colorspace defaults */
         out->color_primaries = AVCOL_PRI_BT2020;
         out->color_trc = AVCOL_TRC_SMPTE2084;
+        changed |= AV_FRAME_CHANGED_COLOR_VOLUME;
     }
 
     if (s->color_trc >= 0)
@@ -849,21 +850,13 @@  static int output_frame(AVFilterContext *ctx, int64_t pts)
     if (s->color_primaries >= 0)
         out->color_primaries = s->color_primaries;
 
-    changed_csp = ref->colorspace      != out->colorspace     ||
-                  ref->color_range     != out->color_range    ||
-                  ref->color_trc       != out->color_trc      ||
-                  ref->color_primaries != out->color_primaries;
-
     /* Strip side data if no longer relevant */
-    if (changed_csp) {
-        av_frame_remove_side_data(out, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA);
-        av_frame_remove_side_data(out, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL);
-        av_frame_remove_side_data(out, AV_FRAME_DATA_ICC_PROFILE);
-    }
-    if (s->apply_dovi || changed_csp) {
-        av_frame_remove_side_data(out, AV_FRAME_DATA_DOVI_RPU_BUFFER);
-        av_frame_remove_side_data(out, AV_FRAME_DATA_DOVI_METADATA);
-    }
+    if (out->width != ref->width || out->height != ref->height)
+        changed |= AV_FRAME_CHANGED_SIZE;
+    if (ref->color_trc != out->color_trc || ref->color_primaries != out->color_primaries)
+        changed |= AV_FRAME_CHANGED_COLOR_VOLUME;
+    av_frame_remove_side_data_changed(out, changed);
+
     if (s->apply_filmgrain)
         av_frame_remove_side_data(out, AV_FRAME_DATA_FILM_GRAIN_PARAMS);