From patchwork Mon Jan 10 07:29:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 33171 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2492340iog; Sun, 9 Jan 2022 23:29:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJy2OqJJgOwDDsEiBKwYmH+GfpXIlZ5kjxTauVpM4qVuPvIQDDKcgu0eRurTwBiPjOI8VYsX X-Received: by 2002:aa7:cac7:: with SMTP id l7mr22511995edt.302.1641799772034; Sun, 09 Jan 2022 23:29:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641799772; cv=none; d=google.com; s=arc-20160816; b=XGD/WQny4X0QwSX8FUhBQdkgOKfBJuRlpgzfu+X3+YmQL44LNVslFf7UNoJCugThln jZYigBsrgXSOFuMFjc6jg3io80ejZ9hbohXHqNzHOiAT4rnRIb+bGW8HxZ38AO+fHZqb WkhivKyd3Kqmc88nav8hXK4CRTxYy40lZAGy4TAH2smKVZtRADtu2TKaCBeB1pbOV3o+ ERwnPM8A/qs49+o6fXZ8QU0RG9YiBUM/mvgLsDLLSL5XPuHlVCepVUBUDoN1o5wUESdV KaJuv15f0nxzr+9Py62gW5vaboX4J23t5kDeTqokFhvc9STMXe3mNYuI0XVXyFzv1vpl MloQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=7T+G00dDPoUpxeBF3mZzlfk350Lz7Hs4mE0iH8cyGhI=; b=iPnZxMa6CDERkTLpD210tr7JocRsqbibNDcmGs2CsqFf7UCZi3SQgtkSECrio/YtZF H8sydgs4EDTceds3AYZTJ7agmbhxDfN3rGhWyiIAMnD5w2LpqIQ0wFsIzktzjuLmKYEs di6EMgvcNR8y8s00z8OMZ0Q/7D5tKKW7wZERRr/BKS6eAIVSJDTOEy8UK0qd60S8fh78 NshEZVVi3k5t5jFV7AT+FPNEaZL2X6gi1iSBVRBR0HgiE4l0/cGV7bho04fZFE2J+Am3 +kO2x4OMO/9F2y/COBpX4mdk7HT4Fug3pMnFVGsxTW1d51yCLHOXJyPo2Xu34/EcgVNU 213A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=J3hzvqF9; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b23si3313867edt.19.2022.01.09.23.29.31; Sun, 09 Jan 2022 23:29:32 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=J3hzvqF9; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 46D6868AE80; Mon, 10 Jan 2022 09:29:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 154116897E7 for ; Mon, 10 Jan 2022 09:29:21 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 28C374952D; Mon, 10 Jan 2022 08:29:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1641799760; bh=59pvigri0Dp4wKy+8x6K2v4kW7KGMSlHQibA6gXbj4A=; h=From:To:Cc:Subject:Date:From; b=J3hzvqF99U0mMpFmJlMQIm7D2LLde4zRlA8DXAjVzh7AW3OY9y726P9I3M1vJzz11 qg1wPV8TyRU9FHMPtYqFMedV8g1mGTM/0MmhYTpeHFVk4Tdvwy/DEKQRjqykhU9X0j ddItAMyi0aC6zaNNoLue6BoIh5KtRDHvH0IjOzg4= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jan 2022 08:29:17 +0100 Message-Id: <20220110072917.2140-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavfi/vf_libplacebo: fix side data stripping logic X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WfgLddHqWeYL From: Niklas Haas This was accidentally comparing s->colorspace against out->colorspace, which is wrong - the intent was to compare in->colorspace against out->colorspace. We also forgot to strip mastering metadata. Finally, the order is sort of wrong - we should strip this side data *before* process_frames, because otherwise it may end up being seen and used by libplacebo. Signed-off-by: Niklas Haas --- libavfilter/vf_libplacebo.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index 1386aaeb3a..31ae28ac38 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -390,7 +390,7 @@ fail: static int filter_frame(AVFilterLink *link, AVFrame *in) { - int err, changed; + int err, changed_csp; AVFilterContext *ctx = link->dst; LibplaceboContext *s = ctx->priv; AVFilterLink *outlink = ctx->outputs[0]; @@ -426,22 +426,25 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) if (s->color_primaries >= 0) out->color_primaries = s->color_primaries; - RET(process_frames(ctx, out, in)); - - int changed_csp = s->colorspace != out->colorspace || - s->color_range != out->color_range || - s->color_trc != out->color_trc || - s->color_primaries != out->color_primaries; + changed_csp = in->colorspace != out->colorspace || + in->color_range != out->color_range || + in->color_trc != out->color_trc || + in->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); + } if (s->apply_dovi || changed_csp) { - /* Strip side data if no longer relevant */ av_frame_remove_side_data(out, AV_FRAME_DATA_DOVI_RPU_BUFFER); av_frame_remove_side_data(out, AV_FRAME_DATA_DOVI_METADATA); } - if (s->apply_filmgrain) av_frame_remove_side_data(out, AV_FRAME_DATA_FILM_GRAIN_PARAMS); + RET(process_frames(ctx, out, in)); + av_frame_free(&in); return ff_filter_frame(outlink, out);