From patchwork Thu Jun 7 23:43:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 9291 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp193022jad; Thu, 7 Jun 2018 16:44:55 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKjavj2n++jQhbIqQr2k436TUDK1/ROrSgc3+/tBS3HRE7wGy7zTF7o5N6QfYHE6AIuePOn X-Received: by 2002:adf:f98a:: with SMTP id f10-v6mr3171611wrr.105.1528415095911; Thu, 07 Jun 2018 16:44:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528415095; cv=none; d=google.com; s=arc-20160816; b=sENFpdmYTZQcqxzxzNTv6EPlcvqnnBcdim3XAJP9F05PFq1Lm07ZvTTImgfGi3lef5 12Pr1wGrpy0UhI9tJzKTzy5/PF6bErpuVKZ3hsybKcTYeXkSueC6bMq+7NrmD91vAEoS b3vQ65pb9vOHFgAMBD64craP7rRmjb3iD5HEazKOLyYnKpgI548Phcavs+r6uFPIzoo9 mo5tW/+YbNDlX3lN4G1vR50cyzhwU+8RZoAzRez1GH5c5kBaa5h6UoC23laJFhmXrFcc cwLlzA5QFp+nzCGDHIpOKMxzP3FLBQpoVqOS9LY1e5TrszgNCUmSmqKgbAmUnua8Kwvv 9szA== 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=BTSp/IokRvjdUesH0F70AjSy2fOs5r3n5vsS7LBEjzo=; b=0mO2pBoZcXNv2fpNn9dKLzKdMXow92SLp7k5YpYeVzLElftdgxXeYB1S1i5Fc5rHZm QVtghNArBSLUzRryfbxMrN6N0MdJ1ErtvC54UHUmaNPZ0wlM0yu8YR2oKT1eVVIiFxI+ ksUFPVtl9Na6dcqZ/WyC3QDqzE17i/uoRm2HIqbLreKIuk4bTqE84AT0O+bMmCDafZrk M2a4TtkywqVgi73dtIIEvy18kJDfVJRlz/xuMHTpW79bq2qAnj0li1QHe04/1FqVS+2d H69l6lxTsnUotsrgX/6QCd8nszpdnqY6ku6xRbacLmNt91KbOvUPK897+Acal8RdZXOG WYAQ== 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=T7swVidQ; 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 56-v6si13631603wrz.15.2018.06.07.16.44.55; Thu, 07 Jun 2018 16:44:55 -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=T7swVidQ; 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 450FB68A76E; Fri, 8 Jun 2018 02:43:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A19E68A643 for ; Fri, 8 Jun 2018 02:43:02 +0300 (EEST) Received: by mail-wm0-f44.google.com with SMTP id v16-v6so218096wmh.5 for ; Thu, 07 Jun 2018 16:43:50 -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=G6nJ8Jo3OX6cfFqoOTC5Hh2BdslAGOS1vg3VkPjrhks=; b=T7swVidQvbF6ljZQfQIuxBOO2rLDrpiFudLqX4ITFWgEktc3rpXwexCSMkon8vp6MG A847g3ZlYvrRTnOlxiCyRYZOdlohd7dOogOAXV3OXGLSJGIInOoVVGXP2sHmgQYC/bLr zt/xQshlotmkNBGzNd8fm1EaDS2w2nYa/jFdWS05BYv0dmwIOjdGdh191AOlsQB4Gl22 5SXF8yD+B3PD7ooml1MXm7MD6oMg1aYzhyv+mC2On7WuBYbTK2EhGaRSbqahyVJHVg2M wSif4p6vpbdKS9JW2D3KUZF4MiC46wZwuO0cm/U0QOM3KRGYw86gE5eQn8sLI3fAUmOr 3VJg== 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=G6nJ8Jo3OX6cfFqoOTC5Hh2BdslAGOS1vg3VkPjrhks=; b=JifPBUn0eOVYzfIrnFBnFKzdrwLVCRWz7WNZ5BpgarVxs2evxGQBk3wapvVLY6OhFT k7jqVKCSbDM9goMRvAfv49AjM75eEcnfhWJF5eMIDmO1awfVZj20mTAKsfw0p9uK6+ns hezQIJA+0HhU/wRwjzlAEpvkpe8GMUgl8KDR7hHqA9cLFtQ/adPkw3Ek4gIeBJk11rCm 0WfLnzLh8+1r8c1jVKW3c6n2vi2HFxdWA+cQrbhyh2SiMkK1rBE0OBepgNsXkjEoF/Nc EIMncHmsB1oXuxsiPmfonkL05fZYUVaoX5MLjxPeSup61yF/ICAEmo+PxFGze6AsCNJD 40QQ== X-Gm-Message-State: APt69E3Eu9Bgqcr07HezfxRh1ofWge95If94yk7XiZ+VYa6rYbncvuGN XtVPz89T20Pjv1OG3JgKG62n2ukM X-Received: by 2002:a1c:f45:: with SMTP id 66-v6mr2843010wmp.124.1528415029289; Thu, 07 Jun 2018 16:43:49 -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 r2-v6sm18640545wrq.55.2018.06.07.16.43.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 16:43:48 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jun 2018 00:43:05 +0100 Message-Id: <20180607234331.32139-11-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180607234331.32139-1-sw@jkqxz.net> References: <20180607234331.32139-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v2 10/36] 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 ed6d289c6b..27ce792fbe 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -969,6 +969,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; @@ -1191,20 +1205,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, @@ -1217,10 +1227,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; @@ -1476,10 +1484,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 "