From patchwork Thu Jun 7 23:43:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 9297 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp193325jad; Thu, 7 Jun 2018 16:45:19 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI5buzkHqzQ9i8i7rrkjXk0BXIPaSj/8NY2obSSSsNXThKTh07RHNCnSkihmTfF9SXyvi9d X-Received: by 2002:a1c:e80f:: with SMTP id f15-v6mr2774771wmh.137.1528415119344; Thu, 07 Jun 2018 16:45:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528415119; cv=none; d=google.com; s=arc-20160816; b=zkJWuw/FUwqhvM+SXQVHfoQHJMZ8BdEWve+F5g7udcMdppi6ipgmzpKIcpVYB4hYdn QlKu06uDOM3QXHP13KtMr4aj4b2wLPkscu47qAUtUfi69pHLqt8pFvCUCSUc6Cg3L9L+ iiwG3jurg8uUqZFAulGMcPa62uoovCOm2vD0Qhv+QOWmlEOyWc3OVDUEdTLm+NNDPoal LCJ/4UAZmy6Mj7YGtBLyagdHVePukCV10yNqhb+HrQLpAmFp0U7QWWXPAIOwMmZ4wu5F +YDVXQwrx9BH8AG2kNBw6LXg/O+xfrT3++8OMXup+SRIMdqRJWtlcWUXCaRZyZVI35Ef VwqA== 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=iBgxBdpFSXz7LqvA4/fisx/RK5oYg1z/mY/N70GO1SU=; b=OO7r8ow3YL3UfaYLlEFj5UlryD804nbWuqyP2oIajlTr79v1uP3G2YU0ZSXDCoqQzk C1ZenIN6KQBxoI8VMpb3fNDwRSwt0OiRBUl60RNEV4ASCZY9GkGvlHVoK7dVFmmuOfEX nwwxz44gzM3UAkxx6il3bkDMhDG+Sw4XnK5dm4l9XDwrMcT+nW6rIRomAYXyRDDgrVni EzpMLdcjS1pPPf0ZTDPtDweIvkaugVzbpSM/yGzOy0+OIQjU21pJxz1/LvhncoNj98iw VdXnfjjHbNP26XAjGgXuS+7V61z8GMiV5iXFbJ9kqMH7UGKTpST32xEFszy6iuuOguYF R8zw== 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=YYsauz0w; 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 a5-v6si22809377wrc.139.2018.06.07.16.45.19; Thu, 07 Jun 2018 16:45:19 -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=YYsauz0w; 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 CC0FA68A7B2; Fri, 8 Jun 2018 02:43:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4435768A696 for ; Fri, 8 Jun 2018 02:42:59 +0300 (EEST) Received: by mail-wm0-f43.google.com with SMTP id v16-v6so217985wmh.5 for ; Thu, 07 Jun 2018 16:43:47 -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=1Rsg213OeZiO0hPe2yiArqjbQCLyiFVViSYlhl1cER8=; b=YYsauz0wCos1Jnuvwy63ePXdbeV/ZFLdsJKw68rkzydlq47Dfkb0lGtMvC9d4NkpBc Mv0cqn+89gCmQFGEvB4BAbF3MGUBmd/lQj/ekPZ043heRCTPROs5spW/cSp77R8Abtb6 ijFgDYGFzms4DO96NH6PolimfUe1oXQ3pRdHzGJPrSkt0eBfINhFn1+3WfetGpIm/GOG GU1+uzZ5UTq2Q/9yiabLD1V+34GcHu0nZ94CKR8u8DsijgK67gPr7CHzsZumFMkNv9/i 9mXx5vbcg1CkAhLOO+DeWhih1+bPZLfBHGAnKvZT+Q7vVoyi+rszBC6fP75PBuXZ7S/I ZiHQ== 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=1Rsg213OeZiO0hPe2yiArqjbQCLyiFVViSYlhl1cER8=; b=CPsfKceifFm78VDcAWNAmkITCfa3q4WghUQyTbLcq8bpw7x3sZE1kUM1w1WlPfzx0E LUs8K2yVmV70+G68mJyIcbNNhvooglSGr9Q2CNNWPamASdPVyHJOU3QwQRyt7kvIp7GS P6Ek5JD08nwDvW6i6PusEVe7tSeyT4EbRqm+dNN67smrKOXiU9cbk1KsZtok0g3BJTWM rfAUXip2ZuBMW5NRWD6bbbpYkbRsNRW6jJmyFswvBSBwIzsuelDw07uBcrlbfuy0zMHq D7SLKRLjCTtP/sqAof/t4STGt+ArZZOSuhUSc4NGT+NMyjnWGm6gcvVePPIrUhzchs/+ S4vA== X-Gm-Message-State: APt69E0lk5e7Yil8sAEajfNdpPOB17mmq4MY8eb8Accgb1ej7HqqGxN9 feBHoalDIOK12s4ymCUxITI9UwGz X-Received: by 2002:a1c:8590:: with SMTP id h138-v6mr2756630wmd.85.1528415026303; Thu, 07 Jun 2018 16:43:46 -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.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 16:43:45 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jun 2018 00:43:02 +0100 Message-Id: <20180607234331.32139-8-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 07/36] vaapi_encode_vp9: 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_vp9.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/libavcodec/vaapi_encode_vp9.c b/libavcodec/vaapi_encode_vp9.c index 9108699ac3..6e62213bc9 100644 --- a/libavcodec/vaapi_encode_vp9.c +++ b/libavcodec/vaapi_encode_vp9.c @@ -33,21 +33,25 @@ typedef struct VAAPIEncodeVP9Context { + VAAPIEncodeContext common; + + // User options. + int loop_filter_level; + int loop_filter_sharpness; + + // Derived settings. int q_idx_idr; int q_idx_p; int q_idx_b; + // Stream state. + // Reference direction for B-like frames: // 0 - most recent P/IDR frame is last. // 1 - most recent P frame is golden. int last_ref_dir; } VAAPIEncodeVP9Context; -typedef struct VAAPIEncodeVP9Options { - int loop_filter_level; - int loop_filter_sharpness; -} VAAPIEncodeVP9Options; - #define vseq_var(name) vseq->name, name #define vseq_field(name) vseq->seq_fields.bits.name, name @@ -82,10 +86,8 @@ static int vaapi_encode_vp9_init_sequence_params(AVCodecContext *avctx) static int vaapi_encode_vp9_init_picture_params(AVCodecContext *avctx, VAAPIEncodePicture *pic) { - VAAPIEncodeContext *ctx = avctx->priv_data; + VAAPIEncodeVP9Context *priv = avctx->priv_data; VAEncPictureParameterBufferVP9 *vpic = pic->codec_picture_params; - VAAPIEncodeVP9Context *priv = ctx->priv_data; - VAAPIEncodeVP9Options *opt = ctx->codec_options; int i; vpic->reconstructed_frame = pic->recon_surface; @@ -169,8 +171,8 @@ static int vaapi_encode_vp9_init_picture_params(AVCodecContext *avctx, vpic->chroma_ac_qindex_delta = 0; vpic->chroma_dc_qindex_delta = 0; - vpic->filter_level = opt->loop_filter_level; - vpic->sharpness_level = opt->loop_filter_sharpness; + vpic->filter_level = priv->loop_filter_level; + vpic->sharpness_level = priv->loop_filter_sharpness; if (avctx->max_b_frames > 0 && pic->type == PICTURE_TYPE_P) priv->last_ref_dir = !priv->last_ref_dir; @@ -180,8 +182,7 @@ static int vaapi_encode_vp9_init_picture_params(AVCodecContext *avctx, static av_cold int vaapi_encode_vp9_configure(AVCodecContext *avctx) { - VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeVP9Context *priv = ctx->priv_data; + VAAPIEncodeVP9Context *priv = avctx->priv_data; priv->q_idx_p = av_clip(avctx->global_quality, 0, VP9_MAX_QUANT); if (avctx->i_quant_factor > 0.0) @@ -266,8 +267,7 @@ static av_cold int vaapi_encode_vp9_init(AVCodecContext *avctx) return ff_vaapi_encode_init(avctx); } -#define OFFSET(x) (offsetof(VAAPIEncodeContext, codec_options_data) + \ - offsetof(VAAPIEncodeVP9Options, x)) +#define OFFSET(x) offsetof(VAAPIEncodeVP9Context, x) #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM) static const AVOption vaapi_encode_vp9_options[] = { { "loop_filter_level", "Loop filter level", @@ -298,8 +298,7 @@ AVCodec ff_vp9_vaapi_encoder = { .long_name = NULL_IF_CONFIG_SMALL("VP9 (VAAPI)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VP9, - .priv_data_size = (sizeof(VAAPIEncodeContext) + - sizeof(VAAPIEncodeVP9Options)), + .priv_data_size = sizeof(VAAPIEncodeVP9Context), .init = &vaapi_encode_vp9_init, .encode2 = &ff_vaapi_encode2, .close = &ff_vaapi_encode_close,