From patchwork Thu May 3 03:07:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 8757 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1318696jad; Wed, 2 May 2018 20:08:43 -0700 (PDT) X-Google-Smtp-Source: AB8JxZp0hle0dGc7ku3XObFYk1eZZOf51uqk10gqeEeFtm5T5C9VIAyMIt6LB3cHdEwtYBEpsEyc X-Received: by 2002:adf:87e1:: with SMTP id c30-v6mr15876446wrc.246.1525316922990; Wed, 02 May 2018 20:08:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525316922; cv=none; d=google.com; s=arc-20160816; b=jVqcoiMXowQybRTXMKNq2NXYZNYHOnGHdSC6Yk6fo97esuD/EvQufq5AefKW+2FRAS FFWp8oS9/jOHFM1kMJNVEgAslqg2Q+Cz0zEwRaQgTPjwTAGr5q3Di0rJorD7tI3wLzk7 OEOPL0I4/asDi8GtGXfYD+LsPpSQtLw+ziJ4uQSB1BeE5kIPSkHlP+ykG2B1hf7fXGVd /uIFvVT9fghHl5MTlf1wl3ltIP7+pg4n+a8kQJFgXJvsWlPiC72UM8ynJ81aUNwaSgRr GLxCZQ585T7x4L0vkN7l4r7WAS5teyJZvIhVJfKbisjuPzz6DNeeSD/TUsP02mWCt9JY +1Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=bMYws647oetCwkUpUG0mq16r8nvrW25+HAy8b4xU3oc=; b=Ts8y+qjpamMsDUovGCl0zIWXxUGvyoIMK977gUd05RK4T4RZ8FNTSpkEl069HQ2ULm uDJkOiMycDe+h0zlKs6Zd0T00cHfHhToiMXuzTiPyczVcFSZ6ztGxX4ABfP7ue3cRTpT nvThz9FrBcdIAII9lUuNhugSzKtK0/xZaDIsXw/qKJcqS+H+LK2/jY7EIfwd/69KosPO X1KIPyEHmyIchQ7VkVfdujs0R4+rPi3v+ENuR5/7z9FbhN5f/vmn0wJB5t/XE9DbR8TO e910Z3Zo7ab79GprwMAz9I6xjFQbzdd0j0cvKnfZdnWw1ldXnkzqd1FUVWRI5qDXzFGd SrKA== ARC-Authentication-Results: i=1; mx.google.com; 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 s201si9231006wmd.126.2018.05.02.20.08.42; Wed, 02 May 2018 20:08:42 -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; 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 1683868A555; Thu, 3 May 2018 06:07:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD51D68A553 for ; Thu, 3 May 2018 06:07:39 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 May 2018 20:08:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,356,1520924400"; d="scan'208";a="36461707" Received: from xhh-cfl64.sh.intel.com ([10.239.13.24]) by fmsmga007.fm.intel.com with ESMTP; 02 May 2018 20:08:10 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 May 2018 11:07:30 +0800 Message-Id: <20180503030730.8504-4-haihao.xiang@intel.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180503030730.8504-1-haihao.xiang@intel.com> References: <20180503030730.8504-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH 4/4] vaapi_encode_h265: Insert content light level information X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 , Mark Thompson MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Haihao Xiang --- libavcodec/vaapi_encode_h265.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 326fe4fe66..5fe487dfc5 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -37,6 +37,7 @@ enum { SEI_MASTERING_DISPLAY = 0x08, + SEI_CONTENT_LIGHT_LEVLE = 0x10, }; typedef struct VAAPIEncodeH265Context { @@ -55,6 +56,7 @@ typedef struct VAAPIEncodeH265Context { H265RawSEI sei; H265RawSEIMasteringDiplayColourVolume mastering_display; + H265RawSEIContentLightLevelInfo content_light_level; int64_t last_idr_frame; int pic_order_cnt; @@ -218,6 +220,12 @@ static int vaapi_encode_h265_write_extra_header(AVCodecContext *avctx, ++i; } + if (priv->sei_needed & SEI_CONTENT_LIGHT_LEVLE) { + priv->sei.payload[i].payload_type = HEVC_SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO; + priv->sei.payload[i].payload.content_light_level = priv->content_light_level; + ++i; + } + priv->sei.payload_count = i; av_assert0(priv->sei.payload_count > 0); @@ -702,6 +710,22 @@ static int vaapi_encode_h265_init_picture_params(AVCodecContext *avctx, } } + if (opt->sei & SEI_CONTENT_LIGHT_LEVLE) { + AVFrameSideData *sd = + av_frame_get_side_data(pic->input_image, + AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + + if (sd) { + AVContentLightMetadata *clm = + (AVContentLightMetadata *)sd->data; + + priv->content_light_level.max_content_light_level = clm->MaxCLL; + priv->content_light_level.max_pic_average_light_level = clm->MaxFALL; + + priv->sei_needed |= SEI_CONTENT_LIGHT_LEVLE; + } + } + vpic->decoded_curr_pic = (VAPictureHEVC) { .picture_id = pic->recon_surface, .pic_order_cnt = priv->pic_order_cnt, @@ -1123,11 +1147,14 @@ static const AVOption vaapi_encode_h265_options[] = { { "sei", "Set SEI to include", OFFSET(sei), AV_OPT_TYPE_FLAGS, - { .i64 = SEI_MASTERING_DISPLAY }, + { .i64 = SEI_MASTERING_DISPLAY | SEI_CONTENT_LIGHT_LEVLE }, 0, INT_MAX, FLAGS, "sei" }, { "mastering_display", "Include mastering display colour volume", 0, AV_OPT_TYPE_CONST, { .i64 = SEI_MASTERING_DISPLAY }, INT_MIN, INT_MAX, FLAGS, "sei" }, + { "content_light_level", "Include content light level information", + 0, AV_OPT_TYPE_CONST, { .i64 = SEI_CONTENT_LIGHT_LEVLE }, + INT_MIN, INT_MAX, FLAGS, "sei" }, { NULL }, };