From patchwork Fri Jun 30 11:51:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 42346 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp2449682pzh; Fri, 30 Jun 2023 04:52:00 -0700 (PDT) X-Google-Smtp-Source: APBJJlEnIDAh2gbf4ej+mBZET73bDBq48K0lAkKRSJSelPQ0sPBn4BEh7DZd0uXutsXEQ48JWKxi X-Received: by 2002:a05:6402:4497:b0:51a:200b:d8ff with SMTP id er23-20020a056402449700b0051a200bd8ffmr1473206edb.13.1688125920499; Fri, 30 Jun 2023 04:52:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688125920; cv=none; d=google.com; s=arc-20160816; b=FFvvY/Hzu1uCKpQVOjiPB+cb/CWhZDr+OcwpMfEB2UrxPsaCOjhcOVRKkW1d76AXDb 43V0UC32m/wtJ/jktzGYFrmty0ZZDkzYDUEMcqOCF1YvD0GF3bX+MFcJ72rI6d16K2u8 57SdabeFFDIQoVMoxo2Kh/uBSvGRK3MJmJ2kmx6kXWo4e/XmzqBnZtg5s/9MEu1FEdqD jEHVZlfx3dTbIJzppnS/FBUVwt7RF9gSEcOhlrMqkTHTTGso6hG/nl/2ttR3Mk+wuEU3 jxnhepFCmc3i+zRDcsmmBXcKbtO/aXSzIHURBOKQczxJYH4vRRhbnlh3RLr4gQxdQRZZ vw0w== 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=BeUQ2bN99O5+BmdRdIvKlb+cFIXaQYDgQIJLS5Vsf/I=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=PBPm73APQzLlSfQuKBPVAPXdSWQqSFCIO0qj6NiovqwcswEt6jExjh3ap+MRdvkAZL a8sNE6pBf6TFBTfU9jRzsaZ3E2KEpe/li849v6k2EviVdDvG16Xt1g1tllL3f/Wo5gie KwGaIc/0KrN9ze+zM6ejH5ghAMrRlUwUDgvV9chRU39NNhBS6z3qsNjGgLgsIRDJGdgB ZvObhLjvBVxh4Kl2wSARcDmNTI4b4DurZgaKUHz9FgyhAiDW/DMpeIg30kcjogrxKJxL eopO81mdS9BxMvvWuo8Fr3SIV/Tlf98zwUZNlFJ8/ZbJwOP9azPJ4V52b6Tc6UaCe4WI eCXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=XnyDc416; 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 e14-20020aa7d7ce000000b0051df225e708si668209eds.46.2023.06.30.04.51.59; Fri, 30 Jun 2023 04:52:00 -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=@intel.com header.s=Intel header.b=XnyDc416; 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 8CC6168C264; Fri, 30 Jun 2023 14:51:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0466768C096 for ; Fri, 30 Jun 2023 14:51:49 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688125915; x=1719661915; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=gih5w7k4EWEdawnxoZoldYBz0tfaTA3mwj8RLYHfen0=; b=XnyDc416snBi8wCg1G3WnLmab3ijw6HDI6vJ5UAJfxrew4ebg45d/wKG SmHY/NnOcUbzUErx4HzUIZQYiIJ/swz1gKCvZxOkzKKX0ZYEenO+deHoP gNmb0M/rS8KOpyrB06o+KAQpCsUe8xdL1u06QUnTnaB5AFTxQlMwkKT/j BEFfjUZPlmMLJqhpUht6mO4BNy6cOKPGiMjk6lfCilMYko5uC8aXLE8OJ MgL+w0m0S7MfFZ+nT0A3E+PCfDn1K6JcMHphGORtSiL3G2z1z7rLXFTqw NpMu7giUl30basjfdrCEWVQCVZYQobjz6ZxMcee28CVDN+MJj5NwEjFw2 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10756"; a="426063513" X-IronPort-AV: E=Sophos;i="6.01,170,1684825200"; d="scan'208";a="426063513" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2023 04:51:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10756"; a="787698922" X-IronPort-AV: E=Sophos;i="6.01,170,1684825200"; d="scan'208";a="787698922" Received: from xhh-tgl64.sh.intel.com ([10.238.2.19]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2023 04:51:46 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Jun 2023 19:51:32 +0800 Message-Id: <20230630115132.142593-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavfi/tonemap_vaapi: remove HDR 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: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: k79QZR0T6BuT From: Haihao Xiang The HDR metadata should be removed after HDR to SDR conversion, otherwise the output frame still has HDR side data. Signed-off-by: Haihao Xiang --- libavfilter/vf_tonemap_vaapi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavfilter/vf_tonemap_vaapi.c b/libavfilter/vf_tonemap_vaapi.c index cd2f4c2195..52303a8b86 100644 --- a/libavfilter/vf_tonemap_vaapi.c +++ b/libavfilter/vf_tonemap_vaapi.c @@ -309,6 +309,9 @@ static int tonemap_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame av_get_pix_fmt_name(output_frame->format), output_frame->width, output_frame->height, output_frame->pts); + av_frame_remove_side_data(output_frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + av_frame_remove_side_data(output_frame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); + return ff_filter_frame(outlink, output_frame); fail: