From patchwork Thu Jun 7 23:42:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 9287 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp192693jad; Thu, 7 Jun 2018 16:44:23 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKUiEHQfGOSpzKpFcXv3kwHFgCGyfvi1zC67BVfzNy1LUgK7EoKFkumPP2pzTDQHi8z1FIQ X-Received: by 2002:a1c:67c4:: with SMTP id b187-v6mr2975626wmc.146.1528415063492; Thu, 07 Jun 2018 16:44:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528415063; cv=none; d=google.com; s=arc-20160816; b=sOXoJ55TL5ZDUtoO91s4dEnRlHoJ6BMdrvj5pEz9p8TRqFYyvc9tZIkAY39FuI19Z8 fsNiNG4FH4dNGAX0fONjvoMksn4H1Me7MukX9gVOIm+Xm4s0aoMQ30D1VXHxlt0ipjHH yXvF1GToKOdiQb8D3Ch+VO7kxzRvjEF9a3gtJgOqehyCfBRpV9GXzpjWto3BymWvEOXC 6QE5zTYNSxSZUuHD6YxgdXdDr4s7WwtubywZ0jmHuOf6bV4Y523bq8XKnA30hDTm5HGC I0GhOWZe6DInMrW+5EtNmqONbVnSPeSegc4LrZm64GUKZ6cCN+CT4b9rmzZEyKduNwpC F0eg== 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=KBw5MAF7YZh/hjTRReYIoic/iqPyKs7z3+G1CptRQpI=; b=cA5TV7YPlIAbX9Q6g9TBC3fFCd7bijDgzuV5P+3fOJVX0/VF02qecGcpCHnJCfnWv7 Ok1Th7u+L1qJq3DMo9UMPjpLq7FUVXoqSCTqJqOBFWsdjEKvUbuSXy0bmZMt4oIwaNlr bCw1Qqm8WqAq0E8kbvxo4xgDSj1io42PmrAXLdczpDGDIYFjsoaHZbrym0+exZjJaQof tm2409Vp1df/QL96/jj20wkDlmeetklUoxGRzDV9SiASShzVHHAQWQaEJtYZ9qv4XiUR hF9ZBjZHV/zgJKNp14wWMKzGT6nFt9X8lJw+A1JlRIQMwb/O0S82A7HtNy3Iz0IcpzLj vn5A== 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=jErxWE+h; 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 k29-v6si35076176wrd.393.2018.06.07.16.44.23; Thu, 07 Jun 2018 16:44:23 -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=jErxWE+h; 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 C8C3768A714; Fri, 8 Jun 2018 02:43:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f179.google.com (mail-wr0-f179.google.com [209.85.128.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E76D468A6AD for ; Fri, 8 Jun 2018 02:42:55 +0300 (EEST) Received: by mail-wr0-f179.google.com with SMTP id k16-v6so11534453wro.0 for ; Thu, 07 Jun 2018 16:43:43 -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=iHYQPXCFFAwdtHFg6NSelK3Py7CD9btbYKfYfSA2QtA=; b=jErxWE+hMMI2WpX1r3YtZI1AITH25ROM4PW6mQaLX7sSodjzyjPLFK7MDEbdMGAXxP nEIH9SFCrS6CyLFhaazgsf9YISlgcJSCQm9NQ8zlNDkPpg1olAdMrD9VG/uiSmWuf4ky KBiA9d0LeWV4jQBoBGL427NgPOocnZ0ite2H9nQXXHwZZ9dz1qkhhs6l8eHHG/wtk2hV JlZBS/5VTdLhI+DARqRX8IsvVD81eyOj9LwMHpTVr2aFWCEnhCUiGok0/xGGzoxatOal eUsOldohMNDxiiWoEztwGvnIkWhswW38W5RvqaecqCa1ahrlUO2oRDqAWF/Rq9Swqab4 6TXQ== 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=iHYQPXCFFAwdtHFg6NSelK3Py7CD9btbYKfYfSA2QtA=; b=R/H8TXc+zS0wzjEEy5FMqt/BB0X+euIdKA4avETDxbaq38BjScBr59zI6YWPI8JP+O wqykW961s3JCfn11DnPvV0YvH2JLloBYFYyqxhDZtGCxJjAMaoLNqIAOMcHcaCn32PyT nHjpc4KxX8mrlFKtnZ7o3LYWJ14Bp68BQXUjAC/vpIHOx3zDL+R/wWgpew5Q6gDGRuG7 uEv8gNeG9eWunECXRKa6c7PQs4GMQS5NRP9uUYMssEmuSjDHFioE/LXZo8/Kpqv8Gv0h bgUjBhEFCjp0Oj0VNpW77qoI8XL4joBIjIL9ArD2Q1GNN3DJdsYTmNRSZqoB7upcnrkC KnOQ== X-Gm-Message-State: APt69E3RDUnbo7gOry4aGA/w06DW8dqEjUSrTxQaU7hr0ExhBspVbpLD 9xLHhoubyn+s4lRExPv/m4FU3LYq X-Received: by 2002:adf:e644:: with SMTP id b4-v6mr3462615wrn.254.1528415023026; Thu, 07 Jun 2018 16:43:43 -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.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 16:43:42 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jun 2018 00:42:59 +0100 Message-Id: <20180607234331.32139-5-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 04/36] vaapi_encode_mjpeg: Move common structure 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_mjpeg.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libavcodec/vaapi_encode_mjpeg.c b/libavcodec/vaapi_encode_mjpeg.c index c949e89646..983c77d194 100644 --- a/libavcodec/vaapi_encode_mjpeg.c +++ b/libavcodec/vaapi_encode_mjpeg.c @@ -56,6 +56,8 @@ static const unsigned char vaapi_encode_mjpeg_quant_chrominance[64] = { }; typedef struct VAAPIEncodeMJPEGContext { + VAAPIEncodeContext common; + int quality; int component_subsample_h[3]; int component_subsample_v[3]; @@ -83,8 +85,7 @@ static av_cold void vaapi_encode_mjpeg_copy_huffman(unsigned char *dst_lengths, static av_cold void vaapi_encode_mjpeg_init_tables(AVCodecContext *avctx) { - VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeMJPEGContext *priv = ctx->priv_data; + VAAPIEncodeMJPEGContext *priv = avctx->priv_data; VAQMatrixBufferJPEG *quant = &priv->quant_tables; VAHuffmanTableBufferJPEGBaseline *huff = &priv->huffman_tables; int i; @@ -133,10 +134,9 @@ static int vaapi_encode_mjpeg_write_image_header(AVCodecContext *avctx, VAAPIEncodeSlice *slice, char *data, size_t *data_len) { - VAAPIEncodeContext *ctx = avctx->priv_data; + VAAPIEncodeMJPEGContext *priv = avctx->priv_data; VAEncPictureParameterBufferJPEG *vpic = pic->codec_picture_params; VAEncSliceParameterBufferJPEG *vslice = slice->codec_slice_params; - VAAPIEncodeMJPEGContext *priv = ctx->priv_data; PutBitContext pbc; int t, i, quant_scale; @@ -242,8 +242,7 @@ static int vaapi_encode_mjpeg_write_extra_buffer(AVCodecContext *avctx, int index, int *type, char *data, size_t *data_len) { - VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeMJPEGContext *priv = ctx->priv_data; + VAAPIEncodeMJPEGContext *priv = avctx->priv_data; if (index == 0) { // Write quantisation tables. @@ -270,9 +269,8 @@ static int vaapi_encode_mjpeg_write_extra_buffer(AVCodecContext *avctx, static int vaapi_encode_mjpeg_init_picture_params(AVCodecContext *avctx, VAAPIEncodePicture *pic) { - VAAPIEncodeContext *ctx = avctx->priv_data; + VAAPIEncodeMJPEGContext *priv = avctx->priv_data; VAEncPictureParameterBufferJPEG *vpic = pic->codec_picture_params; - VAAPIEncodeMJPEGContext *priv = ctx->priv_data; vpic->reconstructed_picture = pic->recon_surface; vpic->coded_buf = pic->output_buffer; @@ -336,7 +334,7 @@ static int vaapi_encode_mjpeg_init_slice_params(AVCodecContext *avctx, static av_cold int vaapi_encode_mjpeg_configure(AVCodecContext *avctx) { VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeMJPEGContext *priv = ctx->priv_data; + VAAPIEncodeMJPEGContext *priv = avctx->priv_data; priv->quality = avctx->global_quality; if (priv->quality < 1 || priv->quality > 100) { @@ -417,7 +415,7 @@ AVCodec ff_mjpeg_vaapi_encoder = { .long_name = NULL_IF_CONFIG_SMALL("MJPEG (VAAPI)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MJPEG, - .priv_data_size = sizeof(VAAPIEncodeContext), + .priv_data_size = sizeof(VAAPIEncodeMJPEGContext), .init = &vaapi_encode_mjpeg_init, .encode2 = &ff_vaapi_encode2, .close = &ff_vaapi_encode_close,