From patchwork Thu May 10 05:47:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 8904 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp662290jad; Wed, 9 May 2018 22:48:43 -0700 (PDT) X-Google-Smtp-Source: AB8JxZornAWy14pabH99tZwy+B5fEXzjFjgQr+iYcE/ifrUoKy+BkNyFf9uRwCBrw6wzA39/h+pf X-Received: by 2002:adf:a4d3:: with SMTP id h19-v6mr39673wrb.7.1525931323363; Wed, 09 May 2018 22:48:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525931323; cv=none; d=google.com; s=arc-20160816; b=Y2JswTWw6Wiz8O8O4B5DghW8yAHOPNFOnOpGlPfHHZAmlD+M1Xx3W7LAaEYBS8NYX/ Gw5E8ByQqlUVeBaDBN5BpzmH/f1vsNp4UKUNl+V30YM8NzeDbF7I7RwEYexkf3IsGgJt Ce4oufOgCPgy7miog/Gi5m7t7fEQ4tCbtbnfZWuKPqf/ZF/fvrl+hkI57qguxrDdhw3b GuOh5j8pV5UURo8D/D0G/+fuYPxM73U2jYxK1bGlGFHRnHtzFJXAPFZY/LR5Cs+EHefy CsINbssOv6XI5Mco8ywYH65XaWKJXsPr+rHyWwQmb6K00uFbv+MPbPf8RWxZDFUfk44E FLDQ== 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=ZcmFHH+ioDexbEigeqqnt9tp1g0Gpbx6mPaWxqMLsYA=; b=Y8wAuJo0gZwFnJ3dOIs1PSux8qba6QYI2QxDkERbylW/NwIeoOjxhDuGL+f/FU3aGo S9iGbM6Wnc2di8sirwb/4LAAVPbl4cgWpxt+umax0It/9BmQL38Ywu9scmO5XNK/dCJ0 vSG/cbHNlTIxItRcnNKh653cmjzd3fa9wEJKCgCshCIeE9Zgpo4B2V/tJ+JpQgsYYw36 esH1feYYVJgF0Jdg2bazi1TqEZIYjwZUBsgK/6oPid6GNQWpOCGduIpn2qdlIzMgI4gf 65MxP6IMqEFxyfRCHVzUBZ2M2uJJ1FCPM/epYDfr+1/wGllSqB1663Z6Y/fEe1S+Zxpu HLgg== 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 f22-v6si225747wmh.42.2018.05.09.22.48.43; Wed, 09 May 2018 22:48:43 -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 E4A9C68A88C; Thu, 10 May 2018 08:47:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 712AB68A671 for ; Thu, 10 May 2018 08:47:41 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 May 2018 22:48:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,384,1520924400"; d="scan'208";a="227284032" Received: from xhh-cfl64.sh.intel.com ([10.239.13.24]) by fmsmga005.fm.intel.com with ESMTP; 09 May 2018 22:48:11 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 May 2018 13:47:47 +0800 Message-Id: <20180510054747.7967-4-haihao.xiang@intel.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180510054747.7967-1-haihao.xiang@intel.com> References: <20180510054747.7967-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v3 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" v2: clip the value to 16bits and look for the metadata on I/IDR frame Signed-off-by: Haihao Xiang --- libavcodec/vaapi_encode_h265.c | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 4ff569c21f..b6ce12d320 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_LEVEL = 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_LEVEL) { + 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); @@ -706,6 +714,25 @@ static int vaapi_encode_h265_init_picture_params(AVCodecContext *avctx, } } + if ((opt->sei & SEI_CONTENT_LIGHT_LEVEL) && + (pic->type == PICTURE_TYPE_I || pic->type == PICTURE_TYPE_IDR)) { + 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 = + FFMIN(clm->MaxCLL, 65535); + priv->content_light_level.max_pic_average_light_level = + FFMIN(clm->MaxFALL, 65535); + + priv->sei_needed |= SEI_CONTENT_LIGHT_LEVEL; + } + } + vpic->decoded_curr_pic = (VAPictureHEVC) { .picture_id = pic->recon_surface, .pic_order_cnt = priv->pic_order_cnt, @@ -1127,10 +1154,13 @@ 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_LEVEL }, 0, INT_MAX, FLAGS, "sei" }, - { "hdr", "Include HDR metadata for mastering display colour volume", - 0, AV_OPT_TYPE_CONST, { .i64 = SEI_MASTERING_DISPLAY }, + { "hdr", + "Include HDR metadata for mastering display colour volume " + "and content light level information", + 0, AV_OPT_TYPE_CONST, + { .i64 = SEI_MASTERING_DISPLAY | SEI_CONTENT_LIGHT_LEVEL }, INT_MIN, INT_MAX, FLAGS, "sei" }, { NULL },