From patchwork Thu Aug 24 01:13:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 4816 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp142521jao; Wed, 23 Aug 2017 18:13:45 -0700 (PDT) X-Received: by 10.223.196.165 with SMTP id m34mr2959956wrf.134.1503537224847; Wed, 23 Aug 2017 18:13:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503537224; cv=none; d=google.com; s=arc-20160816; b=0Pcg0iN2JgwdKG/0YXwclpycyzmhgxa0ybKl7hO2b2zuIGse5T7PAFSUGLlF6AytLa mgip6bdyC0iEeidHI39HaLNuRntg2rsHcKGPlYvwVCIV7rv7vLys7vlJmCoWCrjY9SGu lixQRtJWMP/43WV2jiRPPWkt3JHaqCbWScDPEqQfNcaBjjCfHSqEMgu48u+dT6thGfiW 3j8cn5ICxKOHutR9hge1OO9c5N4XuOPmckK+F637ZDPpLzc4ENJgtwLGrgw6/3ldSA1M w2AweT2zFZGj9gvA6FtSdEJyFGBNp6GVg2+ws65WemWlXS/UUwTwUWNkdntbSqT6mw4/ 0Tuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=bO6KjDyrBiT813i1WJ3NIsMJoyZLUt7BNR9rWe6fqfA=; b=ByaAxZchxp6digqITOSnP4o5yjfWytuUeAXU/fEtbGAjJy69OErdkIQPokkMU84Lwr PCLUdSPBIArV3IIZPc9CIDHXXBs5ANFXlLHP5guKgWBKuYaZ4C46tqvPVrbAzbhtD7Cg 7e6OQC5YvuzrV0eWEOg0AZtZZz+hEMOfqEsoUmMX0uBj8vVanzlUdu8reHqDWBmd1KHm JqzWxPYfcMy46Yech1HLzZd+JS1UvTPGDnrn+UXzdkQHePgohi6JKkaP6wDT5pz0YtEl uYNTUawc3ELkGdm98BgdNQdPdUmoF2OGoUtT8AHTKJ+TftGKnA70XuV10QOjsIFCsdZr 8wiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NImmziiM; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w11si657500wmd.31.2017.08.23.18.13.44; Wed, 23 Aug 2017 18:13:44 -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=@gmail.com header.s=20161025 header.b=NImmziiM; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E502689A2A; Thu, 24 Aug 2017 04:13:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 066716899A8 for ; Thu, 24 Aug 2017 04:13:23 +0300 (EEST) Received: by mail-pg0-f67.google.com with SMTP id w27so1485937pge.4 for ; Wed, 23 Aug 2017 18:13:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=PQhu8N3ASb62XvEicwdiuy5N0HUOdodAV6uwXxiuqok=; b=NImmziiMXYm4UCYYASOFCsK/repfPO0tEHkbEqiuNapsJmMzyNxzJoaGatHDjI9XFQ sZkSDMUaFhyh9M9Qllt7AyAd/U/T+5wiQ54hbh1gBoiM667x0QQtRZ42anNXCI1Dh89T gwnAeAWzRIt2HYkc/jbaXuh50rd91Py5d/SFVlzt2nY2yXZfv/KYkD3zZZ9yFiNLg6sF +Ikowk5THrNI43vUk+bLnB5zhiL+gUQqPamHamS+PS5wq0H47u8kTPLR5CkGHYtKDYxc RZK3MrWb0dPFxyhRsgD+irtpKQEqfsGtqS7n07PhHHCY+WJf7k0FPlTYlB4AU98Hv9Uj WTVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=PQhu8N3ASb62XvEicwdiuy5N0HUOdodAV6uwXxiuqok=; b=WyFHtWT1KUCHvsc8QVMWlWPBRJWDyRA/LZAJS03iShFSi2XRbcncIWpPcmxLL3iw9+ 87jOeeLci1+wGAiScL58a4Iz6SWb/q4SIDt6lpRh4chpD3loZ1EDUPu6rXMQMA7yUWju 3zsRU4OfGRRMJXH7IH2IxaBsw5nWvpGdw6oTOTtz4vRTHyx75KxHKKK5fXMrEU8AaNEd 347AjW2ZlfytPsmP7rDfjqLDsNRslODu4aiMvFqmD/YnnPocxv9nKt98RafjsQ2kvWkS /w46iwYZaQN2lGKN7UO0unahvyWPL4rtJIK/ClKhdU4mVUn7dkoonYmRci3W0qoVf+o+ sgEw== X-Gm-Message-State: AHYfb5gCchWWnHb6ACyUjsqk45IGh59+RTJMXLsn/xLm2MFTeSTprTXo /qNGG8fy3LElSA== X-Received: by 10.84.224.203 with SMTP id k11mr5001960pln.231.1503537210624; Wed, 23 Aug 2017 18:13:30 -0700 (PDT) Received: from [10.67.68.67] ([192.55.54.40]) by smtp.gmail.com with ESMTPSA id 62sm4700949pfw.34.2017.08.23.18.13.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Aug 2017 18:13:29 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson , Steven Liu From: Jun Zhao Message-ID: Date: Thu, 24 Aug 2017 09:13:27 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [V5 4/4] lavc/vaapi_encode_h265: respect "slices" option in h265 vaapi encoder 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 9baf5d8b4b2a6119a8406bb52a05d4a1b67f9a3e Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Tue, 1 Aug 2017 23:07:34 -0400 Subject: [V5 4/4] lavc/vaapi_encode_h265: respect "slices" option in h265 vaapi encoder Enable multi-slice support in AVC/H.265 vaapi encoder. Signed-off-by: Wang, Yi A Signed-off-by: Jun Zhao --- libavcodec/vaapi_encode_h265.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index cf6b9388d1..a845b58094 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -176,6 +176,8 @@ typedef struct VAAPIEncodeH265Context { unsigned int ctu_width; unsigned int ctu_height; + int last_ctu_index; + int fixed_qp_idr; int fixed_qp_p; int fixed_qp_b; @@ -962,6 +964,7 @@ static int vaapi_encode_h265_init_picture_params(AVCodecContext *avctx, VAEncPictureParameterBufferHEVC *vpic = pic->codec_picture_params; VAAPIEncodeH265Context *priv = ctx->priv_data; int i; + int slices; if (pic->type == PICTURE_TYPE_IDR) { av_assert0(pic->display_order == pic->encode_order); @@ -1024,7 +1027,19 @@ static int vaapi_encode_h265_init_picture_params(AVCodecContext *avctx, av_assert0(0 && "invalid picture type"); } - pic->nb_slices = 1; + slices = 1; + if (ctx->max_slices) { + if (avctx->slices <= ctx->max_slices) { + slices = avctx->slices; + } else { + av_log(avctx, AV_LOG_ERROR, "The max slices number per frame " + "cannot more than %d.\n", ctx->max_slices); + return AVERROR_INVALIDDATA; + } + } + pic->nb_slices = slices; + + priv->last_ctu_index = 0; return 0; } @@ -1047,9 +1062,10 @@ static int vaapi_encode_h265_init_slice_params(AVCodecContext *avctx, pslice = slice->priv_data; mslice = &pslice->misc_slice_params; - // Currently we only support one slice per frame. - vslice->slice_segment_address = 0; - vslice->num_ctu_in_slice = priv->ctu_width * priv->ctu_height; + vslice->slice_segment_address = priv->last_ctu_index; + vslice->num_ctu_in_slice = + ((slice->index + 1) * priv->ctu_width * priv->ctu_height) / pic->nb_slices - priv->last_ctu_index; + priv->last_ctu_index += vslice->num_ctu_in_slice; switch (pic->type) { case PICTURE_TYPE_IDR: @@ -1103,9 +1119,11 @@ static int vaapi_encode_h265_init_slice_params(AVCodecContext *avctx, else vslice->slice_qp_delta = priv->fixed_qp_idr - vpic->pic_init_qp; - vslice->slice_fields.bits.last_slice_of_pic_flag = 1; + if (priv->last_ctu_index == priv->ctu_width * priv->ctu_height) + vslice->slice_fields.bits.last_slice_of_pic_flag = 1; - mslice->first_slice_segment_in_pic_flag = 1; + mslice->first_slice_segment_in_pic_flag = + !!(vslice->slice_segment_address == 0); if (pic->type == PICTURE_TYPE_IDR) { // No reference pictures. @@ -1198,6 +1216,10 @@ static av_cold int vaapi_encode_h265_configure(AVCodecContext *avctx) av_assert0(0 && "Invalid RC mode."); } + if (!ctx->max_slices && avctx->slices > 0) + av_log(avctx, AV_LOG_WARNING, "The encode slice option is not " + "supported with the driver.\n"); + return 0; }