From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1BDAE4A019 for ; Mon, 18 Mar 2024 08:13:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2AD5268D252; Mon, 18 Mar 2024 10:13:15 +0200 (EET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E29068D212 for ; Mon, 18 Mar 2024 10:13:06 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710749593; x=1742285593; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=wsBNW5jWOgtXQHswsUHVBtY0Zxyqfn654LcBWLQBMm4=; b=Hcub45E1uvFYyG6e9gEi++jhzOUVbh4/BWCmBSPiuZvgzH1c6jNpW4BG 6ZfzXW2YtC3opURqWKffC8Q3Za8OFiDP7YnUT++yzmrK75Mr2a9qmSuZs Jl96ckEkPEGtvbPMeRnpxc0mC+9w6h4RkJlxA68iM3/eWKZ1syrEB/3fT yJ+gIvu9D+Bt18EI4KM8rdEAexkS7LGKzk1+GXbpoERnVuNX31JfVSRmb 7TUUyZNtEMzowGv0kxGLKS8Pbxb7QSCfbzo+QaxFifU7+ewQMN0/febpp WbhOnt9y2kSted9SGss/Aq95LOgYuGwdRL27LGR+WPNLGctCTZY8yYtQv Q==; X-IronPort-AV: E=McAfee;i="6600,9927,11016"; a="16270266" X-IronPort-AV: E=Sophos;i="6.07,134,1708416000"; d="scan'208";a="16270266" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Mar 2024 01:13:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,134,1708416000"; d="scan'208";a="14033606" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Mar 2024 01:13:03 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Mar 2024 16:12:44 +0800 Message-Id: <20240318081246.3649869-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavfi/tonemap_vaapi: By default use bt709 for output frame 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Haihao Xiang By default don't use the color properties from input frame as output frame properties when performing HDR to SDR conversion Signed-off-by: Haihao Xiang --- doc/filters.texi | 4 ++-- libavfilter/vf_tonemap_vaapi.c | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 913365671d..2cb84c1476 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -27839,7 +27839,7 @@ Default is nv12. @item primaries, p Set the output color primaries. -Default is same as input. +Default is bt709. @item transfer, t Set the output transfer characteristics. @@ -27849,7 +27849,7 @@ Default is bt709. @item matrix, m Set the output colorspace matrix. -Default is same as input. +Default is bt709. @end table diff --git a/libavfilter/vf_tonemap_vaapi.c b/libavfilter/vf_tonemap_vaapi.c index 0b767202d2..a21f565e3a 100644 --- a/libavfilter/vf_tonemap_vaapi.c +++ b/libavfilter/vf_tonemap_vaapi.c @@ -278,13 +278,16 @@ static int tonemap_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame if (err < 0) goto fail; + /* Use BT709 by default for HDR to SDR output frame */ + output_frame->color_primaries = AVCOL_PRI_BT709; + output_frame->color_trc = AVCOL_TRC_BT709; + output_frame->colorspace = AVCOL_SPC_BT709; + if (ctx->color_primaries != AVCOL_PRI_UNSPECIFIED) output_frame->color_primaries = ctx->color_primaries; if (ctx->color_transfer != AVCOL_TRC_UNSPECIFIED) output_frame->color_trc = ctx->color_transfer; - else - output_frame->color_trc = AVCOL_TRC_BT709; if (ctx->color_matrix != AVCOL_SPC_UNSPECIFIED) output_frame->colorspace = ctx->color_matrix; -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".