From patchwork Tue Sep 18 22:31:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10383 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp14278jap; Tue, 18 Sep 2018 15:35:52 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYJCmC/iZzMuC2DeKBVotJbu5CcN4p75xMF8oSa/r7Tln5X5QJSftdrsQ6jRbb9aQ6bt09G X-Received: by 2002:a1c:2d54:: with SMTP id t81-v6mr18154130wmt.31.1537310152539; Tue, 18 Sep 2018 15:35:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537310152; cv=none; d=google.com; s=arc-20160816; b=A+HRQ1yv2R3KS0pfzS/NLgLjzUL8om6HyEv8CXF/Ymye97IBwFbmyb0aeu2fCzdMCU jye3ebhojEhf8vxvnvhBX7aZyC1clw6DZd8JdGhaidAZan8hIIOXaNiP5o2clEufAc1X kM7X0FwlA0/Q0Q31eOlf+ww2fMyMCNDLiwR3sL7cn1UHlgl33QTSeypltE+rYEbNUo80 XKkYXPivo6iVGL9GZgBIqyofjPKHZ8uX5KeXPLZ+RGIlduQyfdz4654VBeGowo6xpzTE 0HMxrUUBtahbyjHpo/piDmS4G1jl6fCXmby5qy4a+LzAaLRikb++N07T3dnz/YMQ5lJ0 bJSg== 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=r3f0QxDo0lUnHYetREF80RABBKUUHdhHZ4XAlrsJ8kFBA8irFItQWjy+AKaLlmnDGw CM0YF3xLbaGCTgC17IEdosko/GasDl84DQwBKAxYqprWTO7L3WPqb39z0L86xCPtsL6N sk5XWgIzi4Fyiht/1CtwkOMZ/Q8P4xyfBhVIfQT8sbiJBXiqIhs3NFbFEUpGevwvOG8T pY3M2oXlSk/LPnWpBXioJCyWJGz34zrQpjlrMsFaWmFk6KZ7cDtseU3ipCn29fsp3CVv voMpckNqXhBeKGHFD66v/Ha6rfbFn96OYabBf7QldXjBl+DryYX61JgcaBwRKoAJw9lL YILA== 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=bobuudfN; 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 u3-v6si1983044wmc.117.2018.09.18.15.35.52; Tue, 18 Sep 2018 15:35:52 -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=bobuudfN; 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 9D42568A67C; Wed, 19 Sep 2018 01:31:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A17D68A67B for ; Wed, 19 Sep 2018 01:31:40 +0300 (EEST) Received: by mail-wm1-f41.google.com with SMTP id f21-v6so4128450wmc.5 for ; Tue, 18 Sep 2018 15:31:53 -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=bobuudfNyGbS7OvRUdlwJuwh4xhwHBVwP0u2haJmJw2VpH1flWXTy++z3c+9S4dNZK 3zxYo7B47NkXz+DkkE7EopZh6U+Kxa8C4zmLoI4afe+Vd93ZXJgLrcm4qT5f/HaXqXtU /0htaV/4hWsg8luMWB2dZMGx4EMC9M/YjZpgAugNnrBHWYVDZURlYLEaTJS6oL9O9Gmd ctTkmSW6NuU092TOD8XC0H7ZskR92XpvAhswZDQWRUrBdyECpWYjVadlBrvqX7V+R0P5 7QdhZqUbPKr47BWGp39awblodNqMqkFSQ8sD2i57FPZtMqpiAlBvvkH/h417TqUMhjId B/yg== 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=QLR5ZS4rAnYm4CYg/WF472rkki2yahC9UChpROqAVztWxKfGURUbt8ZrlyoNswbh5/ 9bSjJkHyWZhisjSJ/FsdMx37wKi7Xa4n3pgKFP1/dpZ5XCyOsVHK1E/OCAcGmgVUe7RE p1odJsrXs4GxMQ3ohEOMhWF0o+T7leCxHWCP3BoLaaNV++rsnTJ5WvS7fpioFgMRFtrs o19RHyQLMtdTfxi6+LtVPBuyQ324TN3+i1Ufom9PwyBdpdZoc+9q1XXq75R40VcW1vif EVA56NFgAURPqasKG3yo8wTwLd9B5FMtGObphaukkSu6fi34oVdbKtDgroU5T6xW0dcx 4pNQ== X-Gm-Message-State: APzg51De3nc/5pIhQfF/0lvyu6tDYRKW2CD+BGP+UDBeqCIt+4WliW5s xwIh3UXJc+gNXOIj0c1O/K9ItLB8yXY= X-Received: by 2002:a1c:2787:: with SMTP id n129-v6mr16412000wmn.101.1537309912900; Tue, 18 Sep 2018 15:31:52 -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 e141-v6sm4863826wmd.32.2018.09.18.15.31.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Sep 2018 15:31:52 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Sep 2018 23:31:08 +0100 Message-Id: <20180918223116.14322-31-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180918223116.14322-1-sw@jkqxz.net> References: <20180918223116.14322-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v4 30/38] 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); }