From patchwork Fri Aug 18 02:14:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 4736 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp256470vsu; Thu, 17 Aug 2017 19:14:41 -0700 (PDT) X-Received: by 10.28.165.65 with SMTP id o62mr573643wme.154.1503022481381; Thu, 17 Aug 2017 19:14:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503022481; cv=none; d=google.com; s=arc-20160816; b=gJMNUTzhYVxZef1TfdE4ypcS0dFp9I2GbmGmu2YPnjJn4Ng4l12SUOf3KLCiPh3qyF uH62Mntr4M1M0wtYjR2PyFsf60/V6FXgYicqsuOf2Ai/d6Q7E+9UJWBGdCwq4gx22k24 if+pxyuMF8nTg2oxBBeDo5JhAsytAeQnd4eE0kMGODA+/plmvsULMsQzSPJ1LSZ4Z/Jm y9cDt1xJcylfC2LKZcvq1eS4+ILqOsMk+s5bdJSbkCwTnZSYnZRv/hTF/g+vOcd5FUVm 3iMXumO3kQVTS7pA73rs4jwFow8kVTKC17iNZ1bXTXT8ONznUpg0AZjh2IrBBFcKwZau m0NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-disposition:content-language :mime-version:user-agent:date:message-id:from:to:dkim-signature :delivered-to:arc-authentication-results; bh=ht17yoZpVigtfnheSTfityic0jfbCPSOTKUewg2UtXY=; b=ff0rdwla4lpBtTjSgSMmrOgQPW85462sS0Mcq7IQn5eqxTjfusBhOz4Q3p1qq557bZ OCtoda+BNKi5wp2RA2zWi8jhh1cBASLXaDbAC4JbZVU9DIAGePH2wzgnI+Gf3yHoWuFO WhNBO1WaHU9VZR+efL6Gb1tgcAt11Oki3/O8walU73WnMNt419AF0oNv+h5S86db93vK rNgR+2AUwDurHO/WQF5cn7CbF3BXd0pMvr1TdePBkpUMtzL+3YrHi4MC+kw2MtMl9JI8 E3NEOnoUokXjOx3gRJqCiM1AiqAfo3I3CpOstQf+sfRdm7lHprtTrXCO/ZI9CiQxrNY7 6daw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PT9MCpCz; 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 59si3550592wro.287.2017.08.17.19.14.40; Thu, 17 Aug 2017 19:14: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=@gmail.com header.s=20161025 header.b=PT9MCpCz; 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 E4F8F689A62; Fri, 18 Aug 2017 05:14:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f46.google.com (mail-pg0-f46.google.com [74.125.83.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A526689A4C for ; Fri, 18 Aug 2017 05:14:25 +0300 (EEST) Received: by mail-pg0-f46.google.com with SMTP id t3so26337532pgt.0 for ; Thu, 17 Aug 2017 19:14:30 -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=B0M9EDOYvFQCXMtRbjg1uDIHnTZCasVQvFBAQk77DMM=; b=PT9MCpCzPu1BRATBZIK7RNQkv75ldaP03PVat8vubLpuYi3yvGtmhDe45UDgjtft5M CdHdPFr9KbBpofMLaH7YweILRSOopgEmazIE+uo6qqB8i2i5sKTOCQYAJ1NZqCIWwVdG maasPv2RTAPEGlrDDGp/2EbbCKn8Y4yB47Tf0zuwpw/w2whOLG6eAk2wg+iLzO4Nkhfx 8JWxUsaRxVAYpel6plai+4fl6a/7NmrMJEXSpXOCvSymCIxwi05Npj5bXQFxB26yfK0J 1LqBXzQbcdcHqV3OpXrtIzOKvT3Wa13is+9u4sXmNTI0WoV3XcUsuJSeNia+ulD1QN8J B6XQ== 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=B0M9EDOYvFQCXMtRbjg1uDIHnTZCasVQvFBAQk77DMM=; b=f7lNPvMl6y8t8QdwwkCFGAXuHK7K7sSjNp7BsDDvZg1FC2xjGh/7I1ZZbVRsRuScVi fdTkwgIT/d1Kh3dgM32ZL9bVknPt4iRHa6qTd1qVu5A1jsL9rwqlk00C9IkUNlR4Y+m4 BDMjOJBhDeuGRnv4MPWihnMtEDBnp9SUodjAUYqaFyNvrHmJFhW18fR2iQLyCH3zTbwW BGZ4K5+x80Vju0f7XViIH5CuxFdmlZvzMlzdQBu6wlm/QYcI+SZ3N2U/wpADpclQeXFd KDjHvWIKcDQAQjr29/P9acpX8eEyQfcDkr4uWMiNZAunuRTAkTan9lcuYPp75koJFv1N bzyw== X-Gm-Message-State: AHYfb5i70hUw0VIUmX+iVUzSlJcmLMPDonUGjq5Efk6lXIirv6EoLU75 mGlFj7zsh+rXPNki X-Received: by 10.99.178.1 with SMTP id x1mr4044825pge.292.1503022469257; Thu, 17 Aug 2017 19:14:29 -0700 (PDT) Received: from [10.67.68.37] (fmdmzpr02-ext.fm.intel.com. [192.55.55.37]) by smtp.gmail.com with ESMTPSA id d86sm9083895pfk.43.2017.08.17.19.14.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Aug 2017 19:14:28 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: Date: Fri, 18 Aug 2017 10:14:25 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 Content-Language: en-US Content-Disposition: attachment; filename*0="0003-lavc-vaapi_encode_h264-respect-slices-option-in-h264.pa"; filename*1="tch" X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH V3 3/4] lavc/vaapi_encode_h264: respect "slices" option in h264 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 64c53df3134c0b478d212f141e6dbe4c3743b3c6 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Tue, 1 Aug 2017 23:05:44 -0400 Subject: [PATCH V3 3/4] lavc/vaapi_encode_h264: respect "slices" option in h264 vaapi encoder Enable multi-slice support in AVC/H.264 vaapi encoder. Signed-off-by: Wang, Yi A Signed-off-by: Jun Zhao --- libavcodec/vaapi_encode_h264.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index f9fcd805a4..74d7480321 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -141,6 +141,8 @@ typedef struct VAAPIEncodeH264Context { int mb_width; int mb_height; + int last_mb_index; + int fixed_qp_idr; int fixed_qp_p; int fixed_qp_b; @@ -957,6 +959,7 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, VAEncPictureParameterBufferH264 *vpic = pic->codec_picture_params; VAAPIEncodeH264Context *priv = ctx->priv_data; int i; + int slices; if (pic->type == PICTURE_TYPE_IDR) { av_assert0(pic->display_order == pic->encode_order); @@ -1002,7 +1005,19 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, vpic->pic_fields.bits.idr_pic_flag = (pic->type == PICTURE_TYPE_IDR); vpic->pic_fields.bits.reference_pic_flag = (pic->type != PICTURE_TYPE_B); - 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_mb_index = 0; return 0; } @@ -1052,14 +1067,17 @@ static int vaapi_encode_h264_init_slice_params(AVCodecContext *avctx, av_assert0(0 && "invalid picture type"); } - // Only one slice per frame. - vslice->macroblock_address = 0; - vslice->num_macroblocks = priv->mb_width * priv->mb_height; + vslice->macroblock_address = priv->last_mb_index; + vslice->num_macroblocks = + ((slice->index + 1) * priv->mb_width * priv->mb_height) / pic->nb_slices - priv->last_mb_index; + priv->last_mb_index += vslice->num_macroblocks; vslice->macroblock_info = VA_INVALID_ID; vslice->pic_parameter_set_id = vpic->pic_parameter_set_id; - vslice->idr_pic_id = priv->idr_pic_count++; + vslice->idr_pic_id = priv->idr_pic_count; + if (priv->last_mb_index == priv->mb_width * priv->mb_height) + priv->idr_pic_count++; vslice->pic_order_cnt_lsb = (pic->display_order - priv->last_idr_frame) & ((1 << (4 + vseq->seq_fields.bits.log2_max_pic_order_cnt_lsb_minus4)) - 1); @@ -1157,6 +1175,10 @@ static av_cold int vaapi_encode_h264_configure(AVCodecContext *avctx) #endif } + 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; }