From patchwork Thu Aug 24 01:13:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 4815 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp142485jao; Wed, 23 Aug 2017 18:13:38 -0700 (PDT) X-Received: by 10.223.174.225 with SMTP id y88mr2884724wrc.264.1503537218118; Wed, 23 Aug 2017 18:13:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503537218; cv=none; d=google.com; s=arc-20160816; b=TmACMvu9d90NoxOb6tgKP+bw6+7HRb6pg4MXbcKrKZ1I/VfgnE6RT+MmgNOgVC5415 cTjCBaoFxaBpDP5Am0sCQcZTR9D9JXP8wUoaQPWohHArOkHYK5+RFxtDerb87EbxJANj jH9/03U4Yn4+Co0b9Wg2Pd0FPKFtPEDSxSDeMFe/GlIqAjeeiVgx/03wpCWGYYm3J7dU oau5JSPKW2oPNgd5K9a720Q7d6CvyglnHXqxFFBNK+brlCz8ZvRYBLMz4jOsMcUEXXH6 wHLzXpViRGhZmRu0LmgYWz/2VvTPzsLvueo8ErmGUfGC4I8XcFoFbs5Yhb8nBhbu70y3 6kwg== 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=iZLCVAjMHJ7hIM2WqhAht4lQr6l154rwqJ5ODrHjynY=; b=n5B+fJA48lgAaUzs48xOS5mQfA1tnpspvMEPoy1rTkhC0WoqZRBWSIyq+GaMbC5Qj/ xz+2+LlvyTQ/bZkl7aH+7Uj1jCyTjgxWlSz5NGi84GZa5T4/VtLayzPTmW9EYuozbwUV Tx1jfWWQvsh+ZjVdWpdzKybX3wN6kOrTMg9DgpjUPWNs0L9xOLsOJwxaTDGOpKhzBKwn z8iIa6FPMIU+QFq7Qr8JlC8EsJ9aw3Vh9rlS5Mp2iu3JGHPJmqCT2mnool+2CJZNywdE ZFANWFv6lEJYN4hhePQO33QL8i+pjnAahTZr/eXf9Hj46KAnnYJlIazweC98Th44c/lF tfyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Ug2NBRdQ; 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 m138si2292407wmg.263.2017.08.23.18.13.37; Wed, 23 Aug 2017 18:13:38 -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=Ug2NBRdQ; 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 EE2A56899F8; Thu, 24 Aug 2017 04:13:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA0F5689960 for ; Thu, 24 Aug 2017 04:13:18 +0300 (EEST) Received: by mail-pg0-f65.google.com with SMTP id 189so1507152pgj.0 for ; Wed, 23 Aug 2017 18:13:26 -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=fT9AKv1fuNCXpAQt5tDl2RzpfvEkFDEGm2DncYTotvE=; b=Ug2NBRdQL2BmrffcEOBinbrAb/HiLby+9Y8cA+qQQpUlYxfPbMU4lcDRoTAp5qYIiW Alakvs4ItTDeqx56QgTh/+967br81NzOSS1V7q9Ro1iiinEhR+df78orAm/kGbyU6Jt3 ponCNRbB3q8q61rbVgdXW5wDzE+mGFuwpmy+0xc5UXfbz6Ie6jD7nUldjkil3DOK6Ogc ikK9cIehejwS0RZphr/t3TQAXDF+ZAFt3acCRltwelgS7R6flMemfNVxhnIK4zp6TrI5 cxdRJMsudqOmcsIN/RgdjqWZxb6C5mhZbtmYWzFTmfqZyRDaPTv0TgbkvLuUP85Ln3w+ v3wg== 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=fT9AKv1fuNCXpAQt5tDl2RzpfvEkFDEGm2DncYTotvE=; b=CrVXAgQmQKJViGhi27hyhkKV2DQzUQCef7/LU3Qmqzca5AZvXM1PEsaVgo3Y4p6EQU lLS3UVOGOwKkutZWuT+m6dkGMjH3kHIxK3BYl6Jlm4gAssBTqF6hqREyhsTwO89iOFAY cCynbVsU24nYOOiaDcHxnGWmTnkOMm366HQBxwtzcxmTicZDMxC8HaKJ5b4BjxBzVsSa +EyeUPTsfqLml4JFwIbMDJD3V2V6hIum04hJ0TQdCcipvvvbvcyAFFplXVZgliIvt1Hg 98eDj+BzO2pwK/DlJQEGs5JLFMfhFzROqJuxXS90jN93nNytQLcNb/JrKzrVFvhm8egg SSmQ== X-Gm-Message-State: AHYfb5hd09rOYHXMZ8sMq5Etx3Ez6gLazr3iGTAj8F2C+ufQtmXx1MNt tJ2mx0NkWVQDLQ== X-Received: by 10.99.42.72 with SMTP id q69mr4628492pgq.449.1503537205392; Wed, 23 Aug 2017 18:13:25 -0700 (PDT) Received: from [10.67.68.67] ([192.55.54.40]) by smtp.gmail.com with ESMTPSA id b6sm5187298pfj.148.2017.08.23.18.13.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Aug 2017 18:13:24 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson , Steven Liu From: Jun Zhao Message-ID: Date: Thu, 24 Aug 2017 09:13:20 +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 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 8795c55762da131ae29554290c1c352eab092580 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Tue, 1 Aug 2017 23:05:44 -0400 Subject: [V5 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 90c7f7e3cc..4a9531bb13 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; @@ -953,6 +955,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); @@ -998,7 +1001,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; } @@ -1048,14 +1063,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); @@ -1140,6 +1158,10 @@ static av_cold int vaapi_encode_h264_configure(AVCodecContext *avctx) if (avctx->compression_level == FF_COMPRESSION_DEFAULT) avctx->compression_level = opt->quality; + 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; }