From patchwork Sun Apr 22 15:28: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: 8563 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2853256jad; Sun, 22 Apr 2018 08:30:18 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+UgFmw5pXF+xfBfn30vbmDWOsUF/vU61VEWUvv2xMdh2+Hvymk+eUJtg69VDX04/u/wT/J X-Received: by 2002:adf:ea01:: with SMTP id q1-v6mr10708090wrm.50.1524411018527; Sun, 22 Apr 2018 08:30:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524411018; cv=none; d=google.com; s=arc-20160816; b=bN2I7LsJNlmJ94E5yZiFHRUer9vP44Rf0TKJkLMsJfn5f+E67YcRRvoWVos+/pLEFT 9dOpp9WSL/FJZNsUBoji/5v7AVJiQZinanmC4t5KlcYrYAexn84kttDpCtialmzEK9z0 YZNtFB+fX8JFd5DXIlvG1SdQGqZAaZAOzxyogVv56W+APFwZvZufcCvZTEIturkvoKjw 7mYAHv/1frxQOg9kcTxvsWA0bsvrnXz++QNSh1ncK5ef3UmRyQFr0uwEKnU21fnQO10i 4QuSe/K09uPSzy5NVO4XaZ8N9Dh/BA4nWtm4pMANoMy4cfnUmKLBZUcikr77CU8NHM0k qGXg== 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=hxTCwAFHAfTkysT9/SWD3QwzofzGqkR8L3Os0c+NgYA=; b=Et7PEjEqucrM1AzTt+/i8THUdR4fqvyx09/3qw8kL4gRNBc/71PB2Qo/JHQ30d1JRs p5A3ooegYFsDsDKrVOTgAC0+8EvIznQLPltNlcaGN1tyfHAYVMISKbIMZ1K79ILrKw8W 4krK/ChgFIeoY79fidSZ/pbpTm/6wBTFMp/KbtwEYTdYU1fx5aRL4WRAsOh9SNNAgar/ jx2dotgggoJ53pnTPYx13rGEXu80/jHW/XY1N4urIJ7xfbA/6JBfQ6j4te7QcLv9nQh4 hKjiNPHCS5TaTW9XL+sz6js1SPQFU03USnfvU6bhtPaHWTRcxOafpMp/kD5lgcZRXXrF /vgA== 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=TW0K/1QT; 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 x64si4590374wmd.17.2018.04.22.08.30.18; Sun, 22 Apr 2018 08:30:18 -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=TW0K/1QT; 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 9AC0A68A2FE; Sun, 22 Apr 2018 18:29:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f171.google.com (mail-wr0-f171.google.com [209.85.128.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB2C368A2AB for ; Sun, 22 Apr 2018 18:29:04 +0300 (EEST) Received: by mail-wr0-f171.google.com with SMTP id w3-v6so34583925wrg.2 for ; Sun, 22 Apr 2018 08:29:33 -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=fPTW3QIGt2HKjdN24qvxyIynHigHBzXj7seeRsZHXQ8=; b=TW0K/1QTXg6yBRh1UAwbZxZW4AdnIAIRsROFw5h3M6d8MFzrO4gja+XTQB+bFWxJKe gDYkxCl64Su4FL/KLLjPct4CMy9ayTutHrzj6xhWHsoy+KehTjbk0ctj++sJy+TtFc++ q/oJ0huUm67lXdpAEi/SIFnLr03n4KfndXqPqbBLhySWK03lSCZU7EJaVoNmoXs/3yBs 04aLjDGf/6mD6JQM2N9ffZyXtWPHnyrt4zBuiB9icML/gcyKkfLMHGKE3uDd+yLUWTUG P/Whazdbk8XX2GQSXPsPng9HIU5peu3fUIGFgkh0Mwr7KiFFKfkcXi5obp4mhHyYYvU4 DXxA== 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=fPTW3QIGt2HKjdN24qvxyIynHigHBzXj7seeRsZHXQ8=; b=SI1dDmX8GaZQP3V7CETDtTw+komTKcfzqXtlWL6IwvFiqmKGPUIia0yPhCT8IQY8Hs k3L6U8tMOZ76MwbiV6lHanCZSj46LjYG1GBmCWrM33ioSp2ctEEGAJYHOMyabLwLivYI O2TmtfJ1uR7URO+Hbzt1nKooTu8cZcsENz6GVE7+6E7kfYsB2b+sfOr5YWJSDXAD+mYU rs1lJilyOlaZR7jmp/dyyldATVS5yAdABwBQI4O9BIPyvCUKEcNew0iOTeAR0rnr7vJI Nm8G8/PBHe3GVxQrahPeJ3v0uWl0Kz4A5wcTx+yi7sgaq8sBnANlyBiuJZIeB+/qfxHd h/fw== X-Gm-Message-State: ALQs6tBOsvPtOgo/NFpDs2/wlkwN6jyYMF4gC9Grifegh9+eMGn0+4n6 n0+NyslyEp8re+asBZAoIm4zdInD X-Received: by 10.28.12.141 with SMTP id 135mr7181236wmm.99.1524410973172; Sun, 22 Apr 2018 08:29:33 -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 32-v6sm7021498wrf.79.2018.04.22.08.29.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Apr 2018 08:29:32 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Apr 2018 16:28:59 +0100 Message-Id: <20180422152921.32510-5-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180422152921.32510-1-sw@jkqxz.net> References: <20180422152921.32510-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 04/26] vaapi_encode_mpeg2: 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_mpeg2.c | 50 ++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/libavcodec/vaapi_encode_mpeg2.c b/libavcodec/vaapi_encode_mpeg2.c index 42df77ea49..5dd1f39cbc 100644 --- a/libavcodec/vaapi_encode_mpeg2.c +++ b/libavcodec/vaapi_encode_mpeg2.c @@ -28,6 +28,9 @@ #include "vaapi_encode.h" typedef struct VAAPIEncodeMPEG2Context { + VAAPIEncodeContext common; + + // Derived settings. int mb_width; int mb_height; @@ -35,15 +38,6 @@ typedef struct VAAPIEncodeMPEG2Context { int quant_p; int quant_b; - MPEG2RawSequenceHeader sequence_header; - MPEG2RawExtensionData sequence_extension; - MPEG2RawExtensionData sequence_display_extension; - MPEG2RawGroupOfPicturesHeader gop_header; - MPEG2RawPictureHeader picture_header; - MPEG2RawExtensionData picture_coding_extension; - - int64_t last_i_frame; - unsigned int bit_rate; unsigned int vbv_buffer_size; @@ -52,6 +46,17 @@ typedef struct VAAPIEncodeMPEG2Context { unsigned int f_code_horizontal; unsigned int f_code_vertical; + // Stream state. + int64_t last_i_frame; + + // Writer structures. + MPEG2RawSequenceHeader sequence_header; + MPEG2RawExtensionData sequence_extension; + MPEG2RawExtensionData sequence_display_extension; + MPEG2RawGroupOfPicturesHeader gop_header; + MPEG2RawPictureHeader picture_header; + MPEG2RawExtensionData picture_coding_extension; + CodedBitstreamContext *cbc; CodedBitstreamFragment current_fragment; } VAAPIEncodeMPEG2Context; @@ -61,8 +66,7 @@ static int vaapi_encode_mpeg2_write_fragment(AVCodecContext *avctx, char *data, size_t *data_len, CodedBitstreamFragment *frag) { - VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeMPEG2Context *priv = ctx->priv_data; + VAAPIEncodeMPEG2Context *priv = avctx->priv_data; int err; err = ff_cbs_write_fragment_data(priv->cbc, frag); @@ -88,8 +92,7 @@ static int vaapi_encode_mpeg2_add_header(AVCodecContext *avctx, CodedBitstreamFragment *frag, int type, void *header) { - VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeMPEG2Context *priv = ctx->priv_data; + VAAPIEncodeMPEG2Context *priv = avctx->priv_data; int err; err = ff_cbs_insert_unit_content(priv->cbc, frag, -1, type, header, NULL); @@ -105,8 +108,7 @@ static int vaapi_encode_mpeg2_add_header(AVCodecContext *avctx, static int vaapi_encode_mpeg2_write_sequence_header(AVCodecContext *avctx, char *data, size_t *data_len) { - VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeMPEG2Context *priv = ctx->priv_data; + VAAPIEncodeMPEG2Context *priv = avctx->priv_data; CodedBitstreamFragment *frag = &priv->current_fragment; int err; @@ -140,8 +142,7 @@ static int vaapi_encode_mpeg2_write_picture_header(AVCodecContext *avctx, VAAPIEncodePicture *pic, char *data, size_t *data_len) { - VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeMPEG2Context *priv = ctx->priv_data; + VAAPIEncodeMPEG2Context *priv = avctx->priv_data; CodedBitstreamFragment *frag = &priv->current_fragment; int err; @@ -164,7 +165,7 @@ fail: static int vaapi_encode_mpeg2_init_sequence_params(AVCodecContext *avctx) { VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeMPEG2Context *priv = ctx->priv_data; + VAAPIEncodeMPEG2Context *priv = avctx->priv_data; MPEG2RawSequenceHeader *sh = &priv->sequence_header; MPEG2RawSequenceExtension *se = &priv->sequence_extension.data.sequence; MPEG2RawSequenceDisplayExtension *sde = &priv->sequence_display_extension.data.sequence_display; @@ -416,8 +417,7 @@ static int vaapi_encode_mpeg2_init_sequence_params(AVCodecContext *avctx) static int vaapi_encode_mpeg2_init_picture_params(AVCodecContext *avctx, VAAPIEncodePicture *pic) { - VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeMPEG2Context *priv = ctx->priv_data; + VAAPIEncodeMPEG2Context *priv = avctx->priv_data; MPEG2RawPictureHeader *ph = &priv->picture_header; MPEG2RawPictureCodingExtension *pce = &priv->picture_coding_extension.data.picture_coding; VAEncPictureParameterBufferMPEG2 *vpic = pic->codec_picture_params; @@ -482,9 +482,8 @@ static int vaapi_encode_mpeg2_init_slice_params(AVCodecContext *avctx, VAAPIEncodePicture *pic, VAAPIEncodeSlice *slice) { - VAAPIEncodeContext *ctx = avctx->priv_data; + VAAPIEncodeMPEG2Context *priv = avctx->priv_data; VAEncSliceParameterBufferMPEG2 *vslice = slice->codec_slice_params; - VAAPIEncodeMPEG2Context *priv = ctx->priv_data; int qp; vslice->macroblock_address = priv->mb_width * slice->index; @@ -515,7 +514,7 @@ static int vaapi_encode_mpeg2_init_slice_params(AVCodecContext *avctx, static av_cold int vaapi_encode_mpeg2_configure(AVCodecContext *avctx) { VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeMPEG2Context *priv = ctx->priv_data; + VAAPIEncodeMPEG2Context *priv = avctx->priv_data; int err; err = ff_cbs_init(&priv->cbc, AV_CODEC_ID_MPEG2VIDEO, avctx); @@ -638,8 +637,7 @@ static av_cold int vaapi_encode_mpeg2_init(AVCodecContext *avctx) static av_cold int vaapi_encode_mpeg2_close(AVCodecContext *avctx) { - VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeMPEG2Context *priv = ctx->priv_data; + VAAPIEncodeMPEG2Context *priv = avctx->priv_data; if (priv) ff_cbs_close(&priv->cbc); @@ -665,7 +663,7 @@ AVCodec ff_mpeg2_vaapi_encoder = { .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 (VAAPI)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO, - .priv_data_size = sizeof(VAAPIEncodeContext), + .priv_data_size = sizeof(VAAPIEncodeMPEG2Context), .init = &vaapi_encode_mpeg2_init, .encode2 = &ff_vaapi_encode2, .close = &vaapi_encode_mpeg2_close,