From patchwork Wed Aug 23 10:34:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 4803 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.137.29 with SMTP id o29csp1809018jaj; Wed, 23 Aug 2017 03:34:51 -0700 (PDT) X-Received: by 10.28.152.14 with SMTP id a14mr1524076wme.136.1503484491277; Wed, 23 Aug 2017 03:34:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503484491; cv=none; d=google.com; s=arc-20160816; b=N6mu5ihFvFupRFlit0IYmp4M0j5/SEmI2431BKAMxlVYrw+oXb6pZj/uoRWrrXzZ7V tRJtFf7MhmeNwJS1K+E6BPA4VQ4mDChpdDwFeAVuK1hW5h0Wey1HWcMjQG2hERh+wpb3 /R/guotTF+dIL2Igtwtp3vNL0qoNWGj43pEuMtNpBbTxbPJLeYwMU5MjduwqljpCOw4f dHv1Se4yF/tw6HhtjarO7/C9yAga9UIzLDQGZ5oCxe4HZiREeTYtI0SnD4pNyRRPlSIS G8HD9Qv0geUqBFxg5JjewkNVhJk6H2G2YgL4nVEH4Fab2Yi/WVzhl0oXD6BhcZduMU+C 7YWQ== 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=KLEcQPU7pohPzM7r2hDjBOj7EFiULNGJpkLatK1uL2I=; b=ryxZW52wKK28K/+ZHl76LSrrYwyIECOaM36p6wP1/8lWyux5V1qmGYb0cEKGuxmQm7 3Ez1hYaKDbQg0IcpEpn8SsVDWpR1X47nwBLMUIK4irnEpI1R6KktMlYEx2aE1eMv1Frj vVf82KpxXLWOv/4p+lxcDpNTwgKQfNoRwp8XWiKNHAUlSZZnZE/UYr6n3wgEkkdTbs2B usdd4CYf14lVZIdFmxiHWsOWtWhyN5/zTyi7746t/TEAei2KgdOPLMKzKYy0IHhg4v0d tkgdqiuvSKiZYG0uLHJc2/vIxfn7eB2/nrvA7nBnSyy0NF6P5ZwRrQchP8Gnfw5gCzkd 7BOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Mt10VtLE; 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 f24si1116484wra.26.2017.08.23.03.34.50; Wed, 23 Aug 2017 03:34:51 -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=Mt10VtLE; 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 5F4BD689DE7; Wed, 23 Aug 2017 13:34:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f177.google.com (mail-pf0-f177.google.com [209.85.192.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BAB3689BB3 for ; Wed, 23 Aug 2017 13:34:35 +0300 (EEST) Received: by mail-pf0-f177.google.com with SMTP id c28so5238218pfe.3 for ; Wed, 23 Aug 2017 03:34:43 -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=dA8H0hQfLd1iQ898pXf6oa48xFecObOFtkTF8OxUSKM=; b=Mt10VtLEu9rL5VmnyoYMEZ3OjRGrXgGxrXQsAWpXW7fZUSm/ac+J3yiwkZU1qIq03I Bi7HXlHctntW87IYR7fO8kQM/L8kfn/7NQ54MboHhYnu7P0KaSxLIh8XfAnTiZsnWaic gxkLHmqhIsqLF6wvK4yNsT80BZl/jghlP/Yk3RAA2lstUq8IhpozAApftMeMWRrx31aJ BxP3UvDStl9SBWQ4OHRKjqWNZ36rEIGwzOW3km6LIXJf0oALhNvWU2jMalZSTsJz8s7+ bQ0hiTUk8nq38OJOsvwEhWWigDO63o1By0dg5L1oagzuGr/2iDJm0kjXcrfWIBxsAX37 Vk9w== 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=dA8H0hQfLd1iQ898pXf6oa48xFecObOFtkTF8OxUSKM=; b=oiKZcL+2ecRZ0pwZIzPb4OyVvgbCyoecljgAW38KQeNVvH5tw2lbN0/DG6Il6DeuYm koyCu2v8NugtvJJOeSAbvrMh8GyX+tyBWkzJDKz6/XBuCXucbLFlMNKcFSTSvlztLRfF hhUUdawxLbcsQnyI8fEE8wcFlPLvnJC6zw6teSYbqSSR1FLjQvbvBL3ZWSCa0GCxtRNa gpMWjBewQugjD0QpM2j5RKDYPjg1JxUDzIlhTiiQwGKBqIdYYkSAkBvTED7lwHejMze8 9ABXAj98O6lYeqRlS5SsR8y4zGcwp4lpNly75+ODutrcj0qHLWopEwOjRriYKGH6IAaP jXrg== X-Gm-Message-State: AHYfb5jTlFliUGTVC3imV8Fo+MEndwB5lm9j+8AgVlFXJwNJNGEYZIxg Rwr43GC36v+pLQ== X-Received: by 10.99.96.18 with SMTP id u18mr2209688pgb.121.1503484482139; Wed, 23 Aug 2017 03:34:42 -0700 (PDT) Received: from [10.67.68.67] (fmdmzpr03-ext.fm.intel.com. [192.55.54.38]) by smtp.gmail.com with ESMTPSA id f86sm2680236pff.89.2017.08.23.03.34.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Aug 2017 03:34:41 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: Date: Wed, 23 Aug 2017 18:34:28 +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] [PATCH V4 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: [PATCH V4 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; }