From patchwork Fri Apr 20 07:27: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: 8530 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp363856jad; Fri, 20 Apr 2018 00:36:35 -0700 (PDT) X-Google-Smtp-Source: AIpwx49mT2rBzkyuM6K9/+SQfIsikzzVw2GWizBUfzg8lgNwfZ10RfCeXSl40eqikMZsofiQ8tiD X-Received: by 10.28.225.130 with SMTP id y124mr222892wmg.57.1524209795649; Fri, 20 Apr 2018 00:36:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524209795; cv=none; d=google.com; s=arc-20160816; b=hD9JVRsPSPgJwFgpraLONyJvn2BaFjbhSwGL8MFboEHV3DXaK+aYPspW46Jmpo+/vg RLoLyaWXqxV/KFWs8DphE0zvmqPVCfJY3yTy7J3/96FGM7C04rPemJ3x7gVlEyg1iCRm l7j8HMbiycyVbbAct9sxNTHPGPqS61+O0RosVdiYrTfpi6jYarqjA9eZ7Vg0IizXFTP8 iGVVl1OPMP5kNBnjkeq2qSpK25zthuSqc82VXPdLFy0R/L2Ve/Batg7bTlMnwJO60/Bf tp42t4/VRGgJL56aeNhnta6q59CbVgEuYIyA6wFSuzflQP9aGSNxBDRGjR2G3ew9hy3/ ovGQ== 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=owwlTOJfkHqmgQDhNP/nOZfIXvNAIeBT9J+vyPmKM2Q=; b=r008B4OZKYtZlAAJzbJpDUcRG0FRBDl88kZ6BAlKal1QDucpxlPUS4p9G2K954cEQ/ gDEC1NGTMT1bjBQyM6ABHhTLrf9g4eEH4bX73R+zoILOKX52SB64MJl6cdHR2O3iZE4d khggs+dXM/8ivag0e0VOWy5PqxEMox/WuSrcXo7tcWtx4vFGtq1yEL2K7E/05+PU/Ncj m2auQfipwihlITmCO/IXCJmibgdKnsubUL0bxYJkGXs7N5LEhJrqZZAPhJf2lv15M7+C U17tS/I4psLmyotH1SIRQKzMZ4ct8bs8kdSCex1xP6Oeb0kfATFkG1QZVKsK4CXWG7dr CeSg== 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 f76si687745wmd.72.2018.04.20.00.36.35; Fri, 20 Apr 2018 00:36:35 -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 03CBF68A161; Fri, 20 Apr 2018 10:36:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D6EC36804BF for ; Fri, 20 Apr 2018 10:35:58 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Apr 2018 00:28:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,300,1520924400"; d="scan'208";a="35689517" Received: from xhh-cfl64.sh.intel.com ([10.239.13.24]) by orsmga006.jf.intel.com with ESMTP; 20 Apr 2018 00:28:01 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Apr 2018 15:27:47 +0800 Message-Id: <20180420072747.15054-2-haihao.xiang@intel.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180420072747.15054-1-haihao.xiang@intel.com> References: <20180420072747.15054-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH 2/2] vaapi_encode_h265: Insert mastering display colour colume if needed 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" '-sei xxx' is added to control SEI insertion, so far only mastering display colour colume is available for testing. Another patch is required to change mastering display settings later. Signed-off-by: Haihao Xiang --- libavcodec/vaapi_encode_h265.c | 94 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 5203c6871d..a8cb6a6d8b 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -29,10 +29,14 @@ #include "cbs.h" #include "cbs_h265.h" #include "hevc.h" +#include "hevc_sei.h" #include "internal.h" #include "put_bits.h" #include "vaapi_encode.h" +enum { + SEI_MASTERING_DISPLAY = 0x01, +}; typedef struct VAAPIEncodeH265Context { unsigned int ctu_width; @@ -47,6 +51,9 @@ typedef struct VAAPIEncodeH265Context { H265RawSPS sps; H265RawPPS pps; H265RawSlice slice; + H265RawSEI sei; + + H265RawSEIMasteringDiplayColorVolume mastering_display; int64_t last_idr_frame; int pic_order_cnt; @@ -58,6 +65,7 @@ typedef struct VAAPIEncodeH265Context { CodedBitstreamContext *cbc; CodedBitstreamFragment current_access_unit; int aud_needed; + int sei_needed; } VAAPIEncodeH265Context; typedef struct VAAPIEncodeH265Options { @@ -65,6 +73,7 @@ typedef struct VAAPIEncodeH265Options { int aud; int profile; int level; + int sei; } VAAPIEncodeH265Options; @@ -175,6 +184,61 @@ fail: return err; } +static int vaapi_encode_h265_write_extra_header(AVCodecContext *avctx, + VAAPIEncodePicture *pic, + int index, int *type, + char *data, size_t *data_len) +{ + VAAPIEncodeContext *ctx = avctx->priv_data; + VAAPIEncodeH265Context *priv = ctx->priv_data; + VAAPIEncodeH265Options *opt = ctx->codec_options; + CodedBitstreamFragment *au = &priv->current_access_unit; + int err, i; + + if (priv->sei_needed) { + if (priv->aud_needed) { + err = vaapi_encode_h265_add_nal(avctx, au, &priv->aud); + if (err < 0) + goto fail; + priv->aud_needed = 0; + } + + memset(&priv->sei, 0, sizeof(priv->sei)); + priv->sei.nal_unit_header.nal_unit_type = HEVC_NAL_SEI_PREFIX; + priv->sei.nal_unit_header.nuh_temporal_id_plus1 = 1; + i = 0; + + if (opt->sei & SEI_MASTERING_DISPLAY && pic->type == PICTURE_TYPE_IDR) { + priv->sei.payload[i].payload_type = HEVC_SEI_TYPE_MASTERING_DISPLAY_INFO; + priv->sei.payload[i].payload.mastering_display = priv->mastering_display; + ++i; + } + + priv->sei.payload_count = i; + av_assert0(priv->sei.payload_count > 0); + + err = vaapi_encode_h265_add_nal(avctx, au, &priv->sei); + if (err < 0) + goto fail; + priv->sei_needed = 0; + + err = vaapi_encode_h265_write_access_unit(avctx, data, data_len, au); + if (err < 0) + goto fail; + + ff_cbs_fragment_uninit(priv->cbc, au); + + *type = VAEncPackedHeaderRawData; + return 0; + } else { + return AVERROR_EOF; + } + +fail: + ff_cbs_fragment_uninit(priv->cbc, au); + return err; +} + static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) { VAAPIEncodeContext *ctx = avctx->priv_data; @@ -587,6 +651,23 @@ static int vaapi_encode_h265_init_picture_params(AVCodecContext *avctx, priv->aud_needed = 0; } + if ((opt->sei & SEI_MASTERING_DISPLAY) && + (pic->type == PICTURE_TYPE_I || pic->type == PICTURE_TYPE_IDR)) { + // hard-coded value for testing, change it later + for (i = 0; i < 3; i++) { + priv->mastering_display.display_primaries[i].x = 50000; + priv->mastering_display.display_primaries[i].y = 50000; + } + + priv->mastering_display.white_point_x = 50000; + priv->mastering_display.white_point_y = 50000; + + priv->mastering_display.max_display_mastering_luminance = 5000; + priv->mastering_display.min_display_mastering_luminance = 1000; + + priv->sei_needed = 1; + } + vpic->decoded_curr_pic = (VAPictureHEVC) { .picture_id = pic->recon_surface, .pic_order_cnt = priv->pic_order_cnt, @@ -895,6 +976,8 @@ static const VAAPIEncodeType vaapi_encode_type_h265 = { .slice_header_type = VAEncPackedHeaderHEVC_Slice, .write_slice_header = &vaapi_encode_h265_write_slice_header, + + .write_extra_header = &vaapi_encode_h265_write_extra_header, }; static av_cold int vaapi_encode_h265_init(AVCodecContext *avctx) @@ -943,7 +1026,8 @@ static av_cold int vaapi_encode_h265_init(AVCodecContext *avctx) ctx->va_packed_headers = VA_ENC_PACKED_HEADER_SEQUENCE | // VPS, SPS and PPS. - VA_ENC_PACKED_HEADER_SLICE; // Slice headers. + VA_ENC_PACKED_HEADER_SLICE | // Slice headers. + VA_ENC_PACKED_HEADER_MISC; // SEI ctx->surface_width = FFALIGN(avctx->width, 16); ctx->surface_height = FFALIGN(avctx->height, 16); @@ -1003,6 +1087,14 @@ static const AVOption vaapi_encode_h265_options[] = { { LEVEL("6.2", 186) }, #undef LEVEL + { "sei", "Set SEI to include", + OFFSET(sei), AV_OPT_TYPE_FLAGS, + { .i64 = 0 }, + 0, INT_MAX, FLAGS, "sei" }, + { "mastering_display", "Include mastering display colour volumne", + 0, AV_OPT_TYPE_CONST, { .i64 = SEI_MASTERING_DISPLAY }, + INT_MIN, INT_MAX, FLAGS, "sei" }, + { NULL }, };