From patchwork Mon Apr 15 02:07:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 48061 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:670b:b0:1a9:af23:56c1 with SMTP id wh11csp1583736pzb; Sun, 14 Apr 2024 19:08:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX8NbL9ITta1f5kUDl6nhL32wqe+I9jBLuc8AW11RTPbDdiNhcHPQfGZ1pILyUtRM4Iu/DsmwqI424E9hVHtbcRTjniouTdsHRv9Q== X-Google-Smtp-Source: AGHT+IF4zepb+cjTtwsdPowvmsxdvIFSco49oyN3k5c7+SJA0sLtjQPOwzjvCLEI0FEX9XDPfkGJ X-Received: by 2002:a17:906:a8d:b0:a52:4318:64d4 with SMTP id y13-20020a1709060a8d00b00a52431864d4mr2653922ejf.5.1713146921195; Sun, 14 Apr 2024 19:08:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713146921; cv=none; d=google.com; s=arc-20160816; b=GIXuwR0NoshuE78Hm27Tet/f4dwKMpYG90JZVHAqREt6fNBlpvzatnOIg4cvYrM3/k D0ASczA+yqjdqIdD0fIA/8k18kXyX/WjA+SceXiTh78cThPAGYbm15CaTAZTOGm1hoKn 9XddHM9gWvnNUGZTuqtYTQZqb7Cfc+L0GVsA4U0rfBJuauflAOm+cn23eQ5dmchQ8aZt ewCyPeH41I2ui8nQboziSOtpALu/QN3FBm8ypH9gjnR/y80A1GjOBI8CrFkSVxylAGs8 IYoJv73ox1qt5T9hL51j+gw5UV2PHb8Ir9jodRH/YywSpqj5UQxLO0I3tlaS4buEyr9g /pig== 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=HKLJGHZI3hiV6V93V1wbgkvvTogElzvhMtJogBOwges=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=e0VIunrBPholWiZWgYa9xk9jooLGWIqWotYS9FlxgwfQVhOMwJXN99aFm4PHFUTTIw jWnLlFq7MI877H7oRn0ZHIN/7rhz9BJTUXGmTn89/8rZhA2C7M4yLzeayatkLE6ejzkF w9SChqCdRvztR84c7WIsyScei5sDAItCV3esf6PmNxy7zVa4hwIs216FF8Lcw5UqI0i2 qZX2jrB9hGUKmCEJV4NSZJIY2I3L7dGDkbVl099SLZ8xLktajp9PWCE31Z8tnuqO6dfO tfY+R45qEqScDsSQD2WTOd7od5CF427q8+4AJPRkSK6kMprtR+12F9aPDqgummEWGA4+ aFcg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=oEHEcDF6; 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 fi10-20020a170906da0a00b00a51e45426aasi4063672ejb.515.2024.04.14.19.08.40; Sun, 14 Apr 2024 19:08:41 -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=oEHEcDF6; 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 9DF6D68D3FA; Mon, 15 Apr 2024 05:08:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0680C68D3DE for ; Mon, 15 Apr 2024 05:08:18 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713146904; x=1744682904; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ga3EQWFDE51eGGqnh7moO9xTr/5m1Qw2HBMbmLSm0d0=; b=oEHEcDF6xHEtJ53el5bvNsUv/HyEbnmVH03urRzXFBW/BUP67V4Xbq9R JxjrwvkEAWb3EB0H3CejqsmsSEtKyQjup1oC8lCIauo5mWJ4dUzE8sDOL PwbXDpSkSykhS+SYh1bgm8GGwfbLenMy4164+mSBmyUP54rjDScApUwE2 zppc7aAUJ5JRuQsYrYy9NJOPq6Doz+E1T0TlVfU5jLcgtYgdW8alWODU3 pONxJnV3dkYLxJNmMby2hOWq393DAx63NGZfDFKzlvprwEpxS7k4slbl3 d/Xw1jH5878Z7dwKDrmmHWFMYt1/gwdFZ8aTmvghUXZRiYrqdVehcDxpt A==; X-CSE-ConnectionGUID: HtoEXtr6Qha1iXJJ6j7FgQ== X-CSE-MsgGUID: Rtb8qQO3R4iC51AkXS95Og== X-IronPort-AV: E=McAfee;i="6600,9927,11044"; a="19943110" X-IronPort-AV: E=Sophos;i="6.07,202,1708416000"; d="scan'208";a="19943110" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2024 19:08:13 -0700 X-CSE-ConnectionGUID: lIxqFO2zTUKF7Ivgl6nboQ== X-CSE-MsgGUID: UgA7RB33RCuQWz/tDWr/DQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,202,1708416000"; d="scan'208";a="26186635" Received: from unknown (HELO xhh-dg264.sh.intel.com) ([10.238.2.76]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2024 19:08:12 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Apr 2024 10:07:54 +0800 Message-Id: <20240415020754.674831-3-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240415020754.674831-1-haihao.xiang@intel.com> References: <20240415020754.674831-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] lavc/vaapi_encode_av1: insert HDR_CLL metadata if have 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: Fjj+bNrGoADi From: Haihao Xiang Only look for HDR_CLL on key frame on the output. Signed-off-by: Haihao Xiang --- libavcodec/vaapi_encode_av1.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libavcodec/vaapi_encode_av1.c b/libavcodec/vaapi_encode_av1.c index 4077d21202..b868f5b66a 100644 --- a/libavcodec/vaapi_encode_av1.c +++ b/libavcodec/vaapi_encode_av1.c @@ -707,6 +707,21 @@ static int vaapi_encode_av1_init_picture_params(AVCodecContext *avctx, mdm->min_luminance.den); } } + + sd = av_frame_get_side_data(pic->input_image, + AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + if (sd) { + AVContentLightMetadata *cllm = (AVContentLightMetadata *)sd->data; + AV1RawOBU *obu = &priv->mh[priv->nb_mh++]; + AV1RawMetadata *md = &obu->obu.metadata; + AV1RawMetadataHDRCLL *cll = &md->metadata.hdr_cll; + + memset(obu, 0, sizeof(*obu)); + obu->header.obu_type = AV1_OBU_METADATA; + md->metadata_type = AV1_METADATA_TYPE_HDR_CLL; + cll->max_cll = cllm->MaxCLL; + cll->max_fall = cllm->MaxFALL; + } } end: