From patchwork Wed Aug 2 05:56:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 4583 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp809054vsu; Tue, 1 Aug 2017 22:56:30 -0700 (PDT) X-Received: by 10.223.136.212 with SMTP id g20mr17264714wrg.186.1501653390120; Tue, 01 Aug 2017 22:56:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501653390; cv=none; d=google.com; s=arc-20160816; b=SDpBDpcqLRSW1OowskM+MdFqXila5bnykd+Mbw+qSfOOr+PTvUDghcBuZoaK80mFx7 sB2tO1KBdqqEGimjr+xgOt2Vsuykg0s12whr0VnfA/x9RzyjqqAvb5NUqJYUc6RPM4at fYQZiFo+fUqId6KV/N6qB8TGahRe7bR6qjXp/FzfesPufdzTWeYfoShVw7sm16SnfC+T LcxYUOILJSeXY5uROnR4cTzRk4j3uYfzfu+GImtlZHnUiLlBV+2sQRyuccjUK43NG/Hz u6jAmkdQEQ2jdJlcSRHBiluNmB3WOxwdlmNBesrD5N7c9Np06CwYKfFdCyNvCkZ1357A yZGg== 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=1u7sCvv3A44++2x4tBXKHylY0kbxGSw0XMJnx2Tj1yQ=; b=QkvtRzNUWZH1OjN/3FdD20UwKLMk+kSPKKaIW3bBF9VKSUEihJ6dMOvQIlCULSxrY3 I3WRaoxwq+4nHxtH4Gh6GiBpex86j6mFGYaYYIWHhRHaQrHjQoi6LWey269fhyn0o1H1 X0MdOJOxzzDO2pkyiz36PxKI4Di5nh8dn5eFKhWtjkXF2FlPQxRrGgTN0oZ3cAMA+kSG XoAlj8TlyurA45uwAnAPlS+gnnR5/bSTLFt98jguazCSS3FcIsT5MwQFuhlEEtCvByNc emYNAl4o37Y2z446Y8Kv6t2P03is3nEJYag1Xv98tghR2fPWwItd5OVSYKFIQ68B8Zbv SSZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=t/9zM1gR; 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 p10si2674126wmd.3.2017.08.01.22.56.29; Tue, 01 Aug 2017 22:56:30 -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=t/9zM1gR; 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 2FD1868A364; Wed, 2 Aug 2017 08:56:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f179.google.com (mail-pf0-f179.google.com [209.85.192.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB0C068A310 for ; Wed, 2 Aug 2017 08:56:17 +0300 (EEST) Received: by mail-pf0-f179.google.com with SMTP id o86so13618435pfj.1 for ; Tue, 01 Aug 2017 22:56:21 -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=23dxIlV9lH6dLgJ4WJa2AIt0/nZqrwZ8kSn0viaUVPE=; b=t/9zM1gRzat6XN0eEz4/3ECwWDhdlehZZRVurd0xuqOgkMcy7Kd2w29SwEYHy/ToLT 7Zg23+BL6uCsiQf8G8w0v2UryIoAzdqT5P7juN8l6mheklFKpSThtE4qn15UghNz18/l Ihrd0EPJR0QnLhyCsrLfooOIgR88Ht0m5iZOfrsfQlhzDqfKRXCnuN/JyoKD6OyEbbEf rzMVxrAWVDRtMds+WM6uDUALpamAjoM/ZPetaYeGwzO7XbBfGvu5ISyR3s16tk7wqPSq p4FNVIWnuaggbs201LEMLTrKWTzUaakHCSogcJbW2oT1tKNxqaVnZ2S3ggdy1vHQIr6j wrJg== 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=23dxIlV9lH6dLgJ4WJa2AIt0/nZqrwZ8kSn0viaUVPE=; b=S8AcNM/DAmBG2MEGNxBaH65LFVZiYn9wSNsoOAUFR8XqWM7SrXwU54qabkdgWnOniR x1NXubm2VWjeflhCPVVlzFyOa8uusPE7jlyyVtnfRl7PpPrnkybyQfx5XLm4aIHj3iG0 5t3Qw8foKoUOccbkoinm//bxrE230nJsmxaR614YTAntgSgWJ+vmKcxf8rtENwrAYVKg uw6EMIMtLmz6848FKh8N8lE5wsb38uEd+ooYLT/Hc4nRfu8FmdkCKvresKAg7mB4YgA7 1F9AhmUvNE7FAaQmlnz6sb7wioW9TC840fB0qJsOA52vnHty1bcCHwz1//HByer49Fyr yWLQ== X-Gm-Message-State: AIVw1108z83l+s0hLRP6grRE1GLuSagMrrJgqhOoCuEE4G85mSusBGLV cV16Hk3LhgNHKw== X-Received: by 10.84.132.78 with SMTP id 72mr14968810ple.66.1501653379630; Tue, 01 Aug 2017 22:56:19 -0700 (PDT) Received: from [10.67.68.50] ([192.55.54.40]) by smtp.gmail.com with ESMTPSA id o24sm58666294pfk.116.2017.08.01.22.56.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2017 22:56:18 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: <868f0170-8721-273a-a9d8-c94c5c19323c@gmail.com> Date: Wed, 2 Aug 2017 13:56:16 +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] 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 f9b42385faedd64dacf613785c393c7b025237c9 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Tue, 1 Aug 2017 23:05:44 -0400 Subject: [PATCH V2 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 | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index f9fcd805a4..5dad6d10a5 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -141,6 +141,10 @@ typedef struct VAAPIEncodeH264Context { int mb_width; int mb_height; + int slice_of_mbs; + int slice_mod_mbs; + int last_mb_index; + int fixed_qp_idr; int fixed_qp_p; int fixed_qp_b; @@ -957,6 +961,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 max_slices; if (pic->type == PICTURE_TYPE_IDR) { av_assert0(pic->display_order == pic->encode_order); @@ -1002,7 +1007,22 @@ 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; + max_slices = 1; + if (ctx->max_slices) { + max_slices = FFMIN(priv->mb_height, ctx->max_slices); + if (avctx->slices > max_slices) { + av_log(avctx, AV_LOG_WARNING, "The max slices number per frame " + "cannot more than %d.\n", max_slices); + } else { + max_slices = avctx->slices; + } + } + + pic->nb_slices = max_slices; + + priv->slice_of_mbs = (priv->mb_width * priv->mb_height) / pic->nb_slices; + priv->slice_mod_mbs = (priv->mb_width * priv->mb_height) % pic->nb_slices; + priv->last_mb_index = 0; return 0; } @@ -1052,14 +1072,18 @@ 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 = priv->slice_of_mbs + (priv->slice_mod_mbs > 0 ? 1 : 0); + if (priv->slice_mod_mbs > 0) + priv->slice_mod_mbs--; + 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 +1181,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 this VAAPI version.\n"); + return 0; }