From patchwork Wed Aug 22 23:44:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10070 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp1440953jap; Wed, 22 Aug 2018 16:46:09 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbOgmmxk/AQlrYHGhOYfNGs/9Pes/n+CHD23d3zhdP2SFwCBVBW/BjvMDv1Zc6w1Flq0GSC X-Received: by 2002:adf:93c2:: with SMTP id 60-v6mr8272881wrp.81.1534981569013; Wed, 22 Aug 2018 16:46:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534981568; cv=none; d=google.com; s=arc-20160816; b=eXAIbbabWZUioQbBLzCYiOGKjqUs48PEc469jtZQ+ChFTv1NUpWOhUK3d43qkUcoq2 VnGRKQ0nZHHkgaEZb7AZ45OFGmp1gcV7JoYi+oUyBpFtpJ5edn+w0PgV3K7AA0UpArKa L0ak2hkXnskJcHVCM0uvkKGRtw4liGXjmgCmY2XyO4JtDHYC2UVWfIkYu/p+hdoUsqko GNfFVuTFacNJ8rS9MOAUk2nTGXwbHVg13zS7ay78NrutL0whSfSAjWenG78XosKTiPUv 7rXlL6CCmxLqTKuDfNSLutTbHXBWwQQnoLeAFTGm08Yvx+BECAxDhChFsWwXPCUZjf0B xa9g== 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=472Z6iRfkY7WX4byjP69h94DOyC6h+GecxJFIBiYN2c=; b=v52KtGveitslJLnFEFd5tURu1noJK/H3avZmNzsUIqwcPDqTfu/D614L9IYWlU+OC9 g1hzlzvHC3FViOwWjM/j4iD1OvxdiImpxizMfZRrVIdawEG3jyLfNJeN8qD6I4HctCuP HO/k3TdIa4WYrA5TXQasF73+Kma77FLDILMVt/Ti6KvyqQh3xHuGMOQnr8H0kgLMyWPJ Sm7gXbB8koux/5xuLzqbyIOAKi9Sd2FJIF5LoBx3cSoSNVDgGcAtNvt5Hsu0iQ6fvvH8 xUvtmHBkRaj+YDoc9LpMc+k8qbdGHSFavYouvK7PPLemhfOJLjaPCvjDQdqz7vAtrqbT zo+A== 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="zOaE/fCR"; 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 w18-v6si1600059wrm.253.2018.08.22.16.46.08; Wed, 22 Aug 2018 16:46:08 -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="zOaE/fCR"; 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 53FD7689CB3; Thu, 23 Aug 2018 02:45:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 84767689B9E for ; Thu, 23 Aug 2018 02:45:24 +0300 (EEST) Received: by mail-wr1-f52.google.com with SMTP id w11-v6so2992578wrc.5 for ; Wed, 22 Aug 2018 16:45:25 -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=T9YesgIJ2hI5xS76UluVCxjYtrkGkBEVaUhjKW/4F9I=; b=zOaE/fCRlq1o5eBOiWE83tQdMFbXnN+CmC6nSM7sXgFAiqvtx31tGmAumEoiWXI8KA 0FEVnkU3IffnGYrdkGVPn/nT45XAv4mrg5ncStE+yy9TcBf6ylev6Qv9zq/MCZ8QrCyO 38tMTKybETPyTrwX1Dw/O3M8a960FUmpKA2ZiEqORVqtIRsQ7kKJlRVfEfipHzhCCDEI IE3C+hcWkVW9hM9wnCCKjdS2muMjj72a+1TxBIrB8rywhVGjgppCT2upKAh0y5MKZu2m x2MluxHVKQOHfYKsCD1qRfXvXxm2D20D6usV41gsF1j0pAt44gj82AsgkBtB2bxwmOgg GAQA== 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=T9YesgIJ2hI5xS76UluVCxjYtrkGkBEVaUhjKW/4F9I=; b=qEroWBHtAHEx+w6MQIIW4g8ltHvlUvJeYohOcbNwuztyQNE/YW2Lc1/mn0i9rakZ3a lmZo2EusIvDETPpXc9w2lBCk/KMuZS8mKWkliE05PW4c0DMvtMsnKUAC5muNNFvPxrf4 uKOpfaWzffrUnBmH7M7AI9r6GMe1z1Vrjpzprgjo4HZ66C7CWCAhUo7hStS5k0qHTkCb eg7uvCQXufHbD5416mgi5Miai0G7sjogaNEB0TY9tzvoIcpVTXXc/CXgqt7thX0ZAUT9 wsGC2WmeK8Ub+U5J8lrd3RiZVWTJm2207gMnm8lB9/c1xeendOhJodAfcSx1QtGPuMXK XkCw== X-Gm-Message-State: AOUpUlEnqvx89cJE9l1MQMVTrUgoPK5nqZBc+Adi31tvuLVhWPG/u8mv kWnotG312ZS3Lg4C8oWRK8oG/+Md1uo= X-Received: by 2002:a5d:6908:: with SMTP id t8-v6mr20346341wru.170.1534981525089; Wed, 22 Aug 2018 16:45:25 -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.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Aug 2018 16:45:24 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Aug 2018 00:44:38 +0100 Message-Id: <20180822234514.10571-6-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 05/41] vaapi_encode_vp8: Move options and common structures into context 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_vp8.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/libavcodec/vaapi_encode_vp8.c b/libavcodec/vaapi_encode_vp8.c index a2e861a8d1..ab5e0b2dda 100644 --- a/libavcodec/vaapi_encode_vp8.c +++ b/libavcodec/vaapi_encode_vp8.c @@ -32,14 +32,16 @@ typedef struct VAAPIEncodeVP8Context { - int q_index_i; - int q_index_p; -} VAAPIEncodeVP8Context; + VAAPIEncodeContext common; -typedef struct VAAPIEncodeVP8Options { + // User options. int loop_filter_level; int loop_filter_sharpness; -} VAAPIEncodeVP8Options; + + // Derived settings. + int q_index_i; + int q_index_p; +} VAAPIEncodeVP8Context; #define vseq_var(name) vseq->name, name @@ -73,9 +75,8 @@ static int vaapi_encode_vp8_init_sequence_params(AVCodecContext *avctx) static int vaapi_encode_vp8_init_picture_params(AVCodecContext *avctx, VAAPIEncodePicture *pic) { - VAAPIEncodeContext *ctx = avctx->priv_data; + VAAPIEncodeVP8Context *priv = avctx->priv_data; VAEncPictureParameterBufferVP8 *vpic = pic->codec_picture_params; - VAAPIEncodeVP8Options *opt = ctx->codec_options; int i; vpic->reconstructed_frame = pic->recon_surface; @@ -116,8 +117,8 @@ static int vaapi_encode_vp8_init_picture_params(AVCodecContext *avctx, vpic->pic_flags.bits.version = 0; vpic->pic_flags.bits.loop_filter_type = 0; for (i = 0; i < 4; i++) - vpic->loop_filter_level[i] = opt->loop_filter_level; - vpic->sharpness_level = opt->loop_filter_sharpness; + vpic->loop_filter_level[i] = priv->loop_filter_level; + vpic->sharpness_level = priv->loop_filter_sharpness; vpic->clamp_qindex_low = 0; vpic->clamp_qindex_high = 127; @@ -130,8 +131,7 @@ static int vaapi_encode_vp8_write_quant_table(AVCodecContext *avctx, int index, int *type, char *data, size_t *data_len) { - VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeVP8Context *priv = ctx->priv_data; + VAAPIEncodeVP8Context *priv = avctx->priv_data; VAQMatrixBufferVP8 quant; int i, q; @@ -161,8 +161,7 @@ static int vaapi_encode_vp8_write_quant_table(AVCodecContext *avctx, static av_cold int vaapi_encode_vp8_configure(AVCodecContext *avctx) { - VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeVP8Context *priv = ctx->priv_data; + VAAPIEncodeVP8Context *priv = avctx->priv_data; priv->q_index_p = av_clip(avctx->global_quality, 0, VP8_MAX_QUANT); if (avctx->i_quant_factor > 0.0) @@ -225,8 +224,7 @@ static av_cold int vaapi_encode_vp8_init(AVCodecContext *avctx) return ff_vaapi_encode_init(avctx); } -#define OFFSET(x) (offsetof(VAAPIEncodeContext, codec_options_data) + \ - offsetof(VAAPIEncodeVP8Options, x)) +#define OFFSET(x) offsetof(VAAPIEncodeVP8Context, x) #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM) static const AVOption vaapi_encode_vp8_options[] = { { "loop_filter_level", "Loop filter level", @@ -256,8 +254,7 @@ AVCodec ff_vp8_vaapi_encoder = { .long_name = NULL_IF_CONFIG_SMALL("VP8 (VAAPI)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VP8, - .priv_data_size = (sizeof(VAAPIEncodeContext) + - sizeof(VAAPIEncodeVP8Options)), + .priv_data_size = sizeof(VAAPIEncodeVP8Context), .init = &vaapi_encode_vp8_init, .encode2 = &ff_vaapi_encode2, .close = &ff_vaapi_encode_close,