From patchwork Fri Apr 26 12:28:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 48274 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp333754pzb; Fri, 26 Apr 2024 05:29:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWbdeINKDCPpRM9I9YgXW70PZJKQ4h4TbEp0X7pnZOT39Jvk8JgRxirwZ2Rr5oU7sc/TsrwVwGv2/3xFz8JtK+Lbk28LPk0DBjkhw== X-Google-Smtp-Source: AGHT+IFstMslWnrgIfeVTaKmk3S2wO7b7xBcRRDfpEJrMC/Kgp1shmb8ieL+ZEMW6ybodccAZRkV X-Received: by 2002:a17:906:3157:b0:a52:3984:148f with SMTP id e23-20020a170906315700b00a523984148fmr1914635eje.36.1714134541693; Fri, 26 Apr 2024 05:29:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714134541; cv=none; d=google.com; s=arc-20160816; b=hWfQPOhxVyfqdULGM4o1RzGNmTZB/+QdGA1JgExiECC/PZ2bIXEx+Iq7vZ4Eu23OMj 3D8UbiBN4ytey+6J9F/Egb9IRt9RsV2l9WHI441tIkkwznuMteiWmHfqr8hMYA/YMkfz CyBLVrQkKi08eMO62ehv9i4ggnMyIpcMAOnchmh+SOXUlHcoONwFrAXHipYp7CP57ysT h7WVgd7U/Dg9JL4pMy7xdoBwTxIKfWmvzIqHGPUq+Y5ws++eWT/vet1HHaM2XBkYeLrj 72Gz5Wx0Hxx7g6ubEzJ3C/ZklRl33WZX4ooe7eG1uf6KgoGHLQv7nHy1zrukYIaAn6pk nVSw== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=ZVvHuGAnD3mtYfLFx6tAsgQM45IcQShmIL4Rc0lZYiA=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=lyZkcBBCFjL7h1bysvo21h4EAKFXrO5nFsi79e/QrKEypjg1ey/FNMCQfK1PcQSu8g Ch77pUfqnGB7/bGtcoah71hMFSCGPqBH6xBwlVdju7lMl9UKDvTRzvxeHtY38KkUW7c3 nQ1YmiJgFcCvEb8XqIPGwtOSrI2+AbG6arLcTAR/lf+4+Iu07pgJX3vhf+D4JU/Sz7B+ 0C77u48o7jSu3rvELQikInELjOwVaq87Vu7XoaRegTqqhx98ACG3/E2jwElewwu0u3IA OoFc9tHiGvmF8UO4w1cK26g3/fQ1KlEd2N0vy7hlOQSM7duZ9wnYqll5iVJG45oLqOtS B0Ww==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=I8E2SJQx; 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 q18-20020a170906a09200b00a4e28b1068bsi10624823ejy.780.2024.04.26.05.29.01; Fri, 26 Apr 2024 05:29:01 -0700 (PDT) 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=I8E2SJQx; 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 221C468D467; Fri, 26 Apr 2024 15:28:21 +0300 (EEST) 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 0A7CB68D448 for ; Fri, 26 Apr 2024 15:28:12 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1714134487; bh=qfjbHRBwOnp8MBI6FvMOwKzGmrOBL5QOFXSDwctbR+4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I8E2SJQxvwNDmF32Y5YswAEwOfgN9IU8KxIzVnYIIPWrBjxhpQ0//sl90WHNyS0ZZ UNPq+m60pyLIhiooIBM3FPIpTp9RM/nSU51MmrInC8gvLweU32X+HWPsfe0bnig8AP bz/kVHRlidXNU2yDRq33UrhnhhpplUtKVOQ+ap/Y= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 4F60343E5B; Fri, 26 Apr 2024 14:28:07 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 26 Apr 2024 14:28:03 +0200 Message-ID: <20240426122803.19967-6-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240426122803.19967-1-ffmpeg@haasn.xyz> References: <20240426122803.19967-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/6] avfilter/vf_lut*: strip color volume metadata 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: 64oYwB7PZuDH From: Niklas Haas These filters, in general, will apply some arbitrary color volume transformation. Strip corresponding metadata to be conservative/safe. --- libavfilter/vf_lut.c | 2 ++ libavfilter/vf_lut2.c | 1 + libavfilter/vf_lut3d.c | 2 ++ 3 files changed, 5 insertions(+) diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index 01df8f287d..89884dd315 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -537,6 +537,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) av_frame_copy_props(out, in); } + av_frame_remove_side_data_changed(out, AV_FRAME_CHANGED_COLOR_VOLUME); + if (s->is_rgb && s->is_16bit && !s->is_planar) { /* packed, 16-bit */ PACKED_THREAD_DATA diff --git a/libavfilter/vf_lut2.c b/libavfilter/vf_lut2.c index 1f0661a0f5..123bfb2e17 100644 --- a/libavfilter/vf_lut2.c +++ b/libavfilter/vf_lut2.c @@ -610,6 +610,7 @@ static int tlut2_filter_frame(AVFilterLink *inlink, AVFrame *frame) } av_frame_copy_props(out, frame); + av_frame_remove_side_data_changed(out, AV_FRAME_CHANGED_COLOR_VOLUME); td.out = out; td.srcx = frame; diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index b3ddd3e69f..84c1405b26 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -1175,6 +1175,8 @@ static AVFrame *apply_lut(AVFilterLink *inlink, AVFrame *in) av_frame_copy_props(out, in); } + av_frame_remove_side_data_changed(out, AV_FRAME_CHANGED_COLOR_VOLUME); + td.in = in; td.out = out; ff_filter_execute(ctx, lut3d->interp, &td, NULL,