From patchwork Wed Aug 22 23:44:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10069 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp1441383jap; Wed, 22 Aug 2018 16:46:51 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZt2cFQ8mX8ZFdT3DwWDdpe9VM1jUzaqQjER+oedpxxf/ejB1KPtJsrE61oUww2m7MiH7NR X-Received: by 2002:adf:ad8e:: with SMTP id w14-v6mr50387wrc.178.1534981611293; Wed, 22 Aug 2018 16:46:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534981611; cv=none; d=google.com; s=arc-20160816; b=fXDuhi35+xp+q+ZbZLFAaI0JsFtVnGmlyhIm2+q9z13Va6l1WZ1l9NY4nI/li8T5lg pAcolIcIEQGJVYEg6BNrljHwbwk216xk2rCDRQO+kOSQpw0vNM3rFdQ6OztJuMErKw77 lPFWeP3455vNLonv3NVyAp7Zyqs3yw7bp8Lt2WGrwVkCBjp/EMcAc+RmrXL5wU//sW2s ynyV+2k2dr/Kie68dsIa2xaod7VQHulYGhEXcDZwR2bRlQa+p2A2BQUW7N9AKUiLnEkr SjQkv084IyBDjWlm0w/DwYODOvP4dCQRJg9+1+KzKpydKaPZ/IFihPESE3tFLig5o8El s8nQ== 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:arc-authentication-results; bh=gekoYetw31r+3yNGk0qzrM3VBGqoyare1L5seRmWArM=; b=tRKJOVgk3HzdLzObOypA638786tYWrEhBNR308bx+7LZSp1qhwe0sclxUuWKAqWSu4 fqHhVXaAY+YI2g0Fj5CMdSuWVOL/9JAObOtHbhFNH1HwWVVV7OWlq4jwaX9QaH61EOPx cSj76kuCB6VCI5fNvrIawdZ75JmiVsMgYRXi76G1HZHQuc0ywu94wxfcAwmRxmXPBX31 ZqlfuE6dL8GtE1GspY+9T24oafHBEErKJhd5utF3Qv7uJsDrJ0xHtQDC6YcCggc1zz74 lvopb7YxBEQWviRef55OhYTrQUanuuO8ZF7WrTOX9ZyxxCiSSO/roGkmzLGayh2/YNQ+ rT8Q== 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=19kjzErK; 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 y140-v6si2378575wmd.175.2018.08.22.16.46.50; Wed, 22 Aug 2018 16:46: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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=19kjzErK; 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 7AE7E689E0E; Thu, 23 Aug 2018 02:45:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C84A6689CBB for ; Thu, 23 Aug 2018 02:45:27 +0300 (EEST) Received: by mail-wr1-f53.google.com with SMTP id k5-v6so2974081wre.10 for ; Wed, 22 Aug 2018 16:45:29 -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=Lfy9jllcoqBeH/N6sw2CbQ0IOjLnRyq01vMpSTQiOQE=; b=19kjzErKNJkR0FOnIq/lApmlNw7D8H60q488RIP/nUIc0zYw+kwijZF6LJR64Ok3a5 DFctxu5xSbW6Wgbz+FjyAumc4DEbtI9WY9doongV16g+jIR5TkHY+K/kHgRw+Vi3Ywmx xF8eJUhk0zucPfSGmdvbASWhrsep7u+xZEpZU5SJiF8JRiJnA9TYbetUGN0ZXqHuRPik OqgZwKQl5gILkoSC9J+FiaNZ9cF6YfvkQuDHutIn+JkwGJpbURBDgIfFNGY0QE9uOk+s VXOPjLCqAUE7dQNpLMRiguMfaoqCbqFR6ATxruGOOXC2P4mG9vNeI6iSaWLqpxvt8UOM DiZw== 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=Lfy9jllcoqBeH/N6sw2CbQ0IOjLnRyq01vMpSTQiOQE=; b=fm2KzjVgo39TVnb4+tQU3ZnmIig9p8vHzkcAqhTVYbWowmds/377NI0dJGkHzSl3at 3FlMgNGGQ7N9d58SMiUSQVhNd6ma5ZmsiXNdmx6+HFMh6RSzXgJ0SK8M2FQb+e7s2gDN 8FarHbk5/uOL5g/Ma6q7krzyiyKVRPm10r2PB4AWE1EpHi1q4LJ8CihIHu3XUUoCTbpU Hnxj0L6d1LT+pxd+7dy9IhvbD9s8BdnQ4NQzOz3Lq0Hyg0oFCIDpnaD4vgrE/m/I2Y/q 2JwoOBhcFEqjNUc+NBxhTe4aFmnXwvHxSqeGTOY3PmEdm3+q6heDgzKBgOMtXiXZAymB qcvA== X-Gm-Message-State: APzg51D/H0zadNBH4mBn+eC3UH5vCATPnBL88dCOyqdIOqDUwpwDJqL/ jartUorequE3BI6JX5qFcpO2ohvtO/Q= X-Received: by 2002:adf:f5c9:: with SMTP id k9-v6mr10712408wrp.59.1534981528440; Wed, 22 Aug 2018 16:45:28 -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 x82-v6sm8184537wmd.11.2018.08.22.16.45.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Aug 2018 16:45:27 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Aug 2018 00:44:41 +0100 Message-Id: <20180822234514.10571-9-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180822234514.10571-1-sw@jkqxz.net> References: <20180822234514.10571-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v3 08/41] vaapi_encode: Factorise out adding global parameters 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.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index cedf3d3549..313f55118e 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -960,6 +960,20 @@ fail: return err; } +static av_cold void vaapi_encode_add_global_param(AVCodecContext *avctx, + VAEncMiscParameterBuffer *buffer, + size_t size) +{ + VAAPIEncodeContext *ctx = avctx->priv_data; + + av_assert0(ctx->nb_global_params < MAX_GLOBAL_PARAMS); + + ctx->global_params [ctx->nb_global_params] = buffer; + ctx->global_params_size[ctx->nb_global_params] = size; + + ++ctx->nb_global_params; +} + static av_cold int vaapi_encode_config_attributes(AVCodecContext *avctx) { VAAPIEncodeContext *ctx = avctx->priv_data; @@ -1182,20 +1196,16 @@ static av_cold int vaapi_encode_init_rate_control(AVCodecContext *avctx) .min_qp = (avctx->qmin > 0 ? avctx->qmin : 0), .basic_unit_size = 0, }; - ctx->global_params[ctx->nb_global_params] = - &ctx->rc_params.misc; - ctx->global_params_size[ctx->nb_global_params++] = - sizeof(ctx->rc_params); + vaapi_encode_add_global_param(avctx, &ctx->rc_params.misc, + sizeof(ctx->rc_params)); ctx->hrd_params.misc.type = VAEncMiscParameterTypeHRD; ctx->hrd_params.hrd = (VAEncMiscParameterHRD) { .initial_buffer_fullness = hrd_initial_buffer_fullness, .buffer_size = hrd_buffer_size, }; - ctx->global_params[ctx->nb_global_params] = - &ctx->hrd_params.misc; - ctx->global_params_size[ctx->nb_global_params++] = - sizeof(ctx->hrd_params); + vaapi_encode_add_global_param(avctx, &ctx->hrd_params.misc, + sizeof(ctx->hrd_params)); if (avctx->framerate.num > 0 && avctx->framerate.den > 0) av_reduce(&fr_num, &fr_den, @@ -1208,10 +1218,8 @@ static av_cold int vaapi_encode_init_rate_control(AVCodecContext *avctx) ctx->fr_params.fr.framerate = (unsigned int)fr_den << 16 | fr_num; #if VA_CHECK_VERSION(0, 40, 0) - ctx->global_params[ctx->nb_global_params] = - &ctx->fr_params.misc; - ctx->global_params_size[ctx->nb_global_params++] = - sizeof(ctx->fr_params); + vaapi_encode_add_global_param(avctx, &ctx->fr_params.misc, + sizeof(ctx->fr_params)); #endif return 0; @@ -1467,10 +1475,8 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx) ctx->quality_params.quality.quality_level = avctx->compression_level; - ctx->global_params[ctx->nb_global_params] = - &ctx->quality_params.misc; - ctx->global_params_size[ctx->nb_global_params++] = - sizeof(ctx->quality_params); + vaapi_encode_add_global_param(avctx, &ctx->quality_params.misc, + sizeof(ctx->quality_params)); } #else av_log(avctx, AV_LOG_WARNING, "The encode compression level "