From patchwork Sun Sep 23 21:52:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10460 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:1286:0:0:0:0:0 with SMTP id 6-v6csp1850992jap; Sun, 23 Sep 2018 14:53:31 -0700 (PDT) X-Google-Smtp-Source: ACcGV60qQc+Vd/PuB1jM6RjjQB2EDXhohHNfZ6xPSH2mSDvRISxWhThbRCbGowZgRcofvdsvLgUa X-Received: by 2002:adf:b6a0:: with SMTP id j32-v6mr6031439wre.55.1537739611843; Sun, 23 Sep 2018 14:53:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537739611; cv=none; d=google.com; s=arc-20160816; b=lr4yhCXZMTPwRQ7kPFX/dY/P7mJdonOck91Q1DlxJL1hYF1Gr7OWV/o9mq/25PNWYC I6OHEhRHqcu5lQqvAmo8J9GhTrm6vCM/sQZERsWZVi9RVc7NchonB4g+XMazynBKTfwY hHyY1L6jxH39wzee4nVXWPY8GA5zj0NbjkgZLNmywgefLh96Xa/Hxq23fFFJ2L0GkhvL HmX20lTUkAMv8OXGfX2GObkqq+58/lwUFR+tyw5inMcBOooe5xJ8t7wszKCWxexQ/Giy 58L+wdczNZxaoa/ymWbOnebQKcyH/lRnPLpw9DYvLA+VEYo4ai36QE9VKOQMUst6UoBU xAnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=VuzJ8M3rOCxsifEc+Vj+nRXQkoq06PcBtBcXCDbT3IA=; b=DKehpPHpADcjdwnGicd0PdWPsfaAzCrGLgpsex5xlYRH3DcG+8lS7FSZPKybXubSIx 4wwphmNZiMx0Zt9usBCR7q7MOKJM+Wit7i5lFaTQv+QKgwPfvwa1jJAUD9j64zysJjnc l5tvbTazmwB6lPqmJOP2LBhaj2FmrfVyu/XaPkGPqcIrAka8+ediioI6N5oPk30QMMSD SP1F9IwHwJka5XdcSgHK2ZWSPefNHlsFU8fM5HivlZHESAYVlfj2MvSkGmUZN6CJfmAn bFi6r+mV3MsLVyvLMumti9NTIl2cT31ocMPAujdBysjybW5FP7Qb6G71O+k6DsmDRrmi 82pQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=EGAsd3oa; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v100-v6si6318883wrc.244.2018.09.23.14.53.31; Sun, 23 Sep 2018 14:53:31 -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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=EGAsd3oa; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E74068A6A0; Mon, 24 Sep 2018 00:53:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CED8368A588 for ; Mon, 24 Sep 2018 00:52:52 +0300 (EEST) Received: by mail-wr1-f46.google.com with SMTP id e1-v6so17782133wrt.3 for ; Sun, 23 Sep 2018 14:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=GC1Bc2myf/Z2Lf0df4Nxbh7tM6PYDCfmoczyr2yFCWw=; b=EGAsd3oasCFfH9XLWjK/G4gYzaFPoXmw+MH7bndW7L7YvJGyYptWADs2DFoDBfBCd0 b7N4Wv1pHWb0Cgc8OyfSGCQhFyD7CAto34dOtt4Wdjy/PjUdoM5G6jilJB7fCyceSdQs 5DcheX4nup8vYPDp4zU5SqnpR45l5dJ49lGD+jiE4QK7rrL2cA0ssK33cSEq3mkWZjbx Xyfv3NY0kIOocWCDZusqg/lLhbrO+Q5aLt0gwV0baATSqOQYHhlR/beumr7/NFI2tXhn EZ+jnRRERJbV+cEf87qB0gYOzGWi7Q66EvXEqPNePqJgn+3JU+cV8i35rr65820HkaLU QtMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=GC1Bc2myf/Z2Lf0df4Nxbh7tM6PYDCfmoczyr2yFCWw=; b=NHs2drqmft47hc9yAa9vb5e8XqDBDgOykdv7CO3akvjb6LbOFgbGTLAiboL74YBvUn WfWNTLoiw+Odte+uXbgxB/m3HFimgP/B8VF8E1+hfE/k8g9MJpfFO9fyyniCHHTUcXHt XY+QB9ZplJjuaCwCHAopUwi3bISM0Zl0kdL5hpLYxGYx9pC+A+fx6cyTzLhcKTAvQsSM oAQvuxHItV/knQkMZuFutMy87MP29Ifw77s/3HuQts6/YZ43GponezA/RWNCJR+fA8L4 DCcr54nbFV2c7vUnvkae5gR69pH7gV0nagVLYjRf/Au1fsFcvxP7T0H1JfaPFK36unYO 4ToA== X-Gm-Message-State: ABuFfojkgu7a+Nm2G6TY3i5JPmbiWI3t/7isAC+SAwBksnORbRoJUKkF moHVFZq8aTHJWo/iWcIorxXFcDRsgy0= X-Received: by 2002:adf:e505:: with SMTP id j5-v6mr6004913wrm.111.1537739587503; Sun, 23 Sep 2018 14:53:07 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id 124-v6sm14960730wmk.20.2018.09.23.14.53.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Sep 2018 14:53:06 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Sep 2018 22:52:58 +0100 Message-Id: <20180923215300.2077-3-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180923215300.2077-1-sw@jkqxz.net> References: <20180923215300.2077-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v2 3/5] vaapi_encode_h264: Enable multiple-slice support 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/vaapi_encode_h264.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 8feae0d42f..7bb77cfba2 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -733,8 +733,6 @@ 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; - return 0; } @@ -758,8 +756,7 @@ static int vaapi_encode_h264_init_slice_params(AVCodecContext *avctx, sh->nal_unit_header.nal_ref_idc = pic->type != PICTURE_TYPE_B; } - // Only one slice per frame. - sh->first_mb_in_slice = 0; + sh->first_mb_in_slice = slice->block_start; sh->slice_type = priv->slice_type; sh->pic_parameter_set_id = pps->pic_parameter_set_id; @@ -780,8 +777,8 @@ static int vaapi_encode_h264_init_slice_params(AVCodecContext *avctx, sh->slice_qp_delta = priv->fixed_qp_idr - (pps->pic_init_qp_minus26 + 26); - vslice->macroblock_address = sh->first_mb_in_slice; - vslice->num_macroblocks = priv->mb_width * priv->mb_height; + vslice->macroblock_address = slice->block_start; + vslice->num_macroblocks = slice->block_size; vslice->macroblock_info = VA_INVALID_ID; @@ -903,6 +900,8 @@ static const VAAPIEncodeProfile vaapi_encode_h264_profiles[] = { static const VAAPIEncodeType vaapi_encode_type_h264 = { .profiles = vaapi_encode_h264_profiles, + .flags = FLAG_SLICE_CONTROL, + .configure = &vaapi_encode_h264_configure, .sequence_params_size = sizeof(VAEncSequenceParameterBufferH264), @@ -978,6 +977,8 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx) ctx->surface_width = FFALIGN(avctx->width, 16); ctx->surface_height = FFALIGN(avctx->height, 16); + ctx->slice_block_height = ctx->slice_block_width = 16; + return ff_vaapi_encode_init(avctx); }