From patchwork Thu Jun 7 23:43:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 9288 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp192851jad; Thu, 7 Jun 2018 16:44:40 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJyMQoCgphiFrhCHblnpcVSFS0eVQcx8sHtPFbb0Ye7pViOtH3+BCl9QkdJnIpqjBGKXmsS X-Received: by 2002:a1c:5b0d:: with SMTP id p13-v6mr2903192wmb.53.1528415079996; Thu, 07 Jun 2018 16:44:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528415079; cv=none; d=google.com; s=arc-20160816; b=kTsTl+8QCYnl0qx6trPeAAJTMCuwUSZ9azFkVZkb1ayjW7m9zuBhASyui3/cuMqKcA VYCgbhHCZ8PlN+JtFPm7Bv2zEm3Xx9YV7cMr+qA4lADIsBsiZSBKyP+3g+GD9V2hLJhf zaA2LjtsUAmqDoLOAurZyDaHdOI2HGT2qxKcklQa/+trsK+2PHAMAXEQAXZO07P/hVXi 4VV3RMc2M8wT9hrUqc9Wg1DUyCGhBPC5zvFATI4IbNFuRasNYG/82IC/BwRllFAupHv/ r1OTr7g2igWjcTe+hPZMazi/eLg2L7iGwks7GPtnrgWHxcVoT0T5iijU2SQh/GrPTBH2 IArw== 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=f3M1CnSYII3b0aa67NC3EDYineXSiCjYxGSPj3FHg0E=; b=WjVFyZEuMkiWtJWbHCnWmldcbzC7NCIswGmVnO/s0Baf4K9BzFpxLjjb8MIlNIzZ/8 2srjB70mi/donJqHQatOApGlVOed6cVd2Remr4FXWs5QjtkJMvep4CBU+hamKkKSkC0k ygCLQheeOAGUBDHuVOOE7NaFbRaB0CCmEoomGWaGNoG1TWXzZ+04ZftJGqZT2cMIaatr Xw85G4dR4BEBPjZRzBNlIVL2jnXXnKm3RTL7wdPyIseb1kodlUKfaEnemaRntGwR//tb Mr+n5T8favnc9mEoOIVjuUkqzvoKGcEGsYumcjSx0IfvTZvIJRIioKdgo/mb7Lz2zeyr K+LQ== 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=TdMhYuE9; 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 j20-v6si33960618wrb.257.2018.06.07.16.44.39; Thu, 07 Jun 2018 16:44:39 -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=TdMhYuE9; 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 199CC68A754; Fri, 8 Jun 2018 02:43:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71A3868A6C3 for ; Fri, 8 Jun 2018 02:43:01 +0300 (EEST) Received: by mail-wm0-f42.google.com with SMTP id x6-v6so232794wmc.3 for ; Thu, 07 Jun 2018 16:43:49 -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=iiMsZp2DxsdqXJM4vxQ3fmSPaFwJfQ5dtFhLtqOB28g=; b=TdMhYuE99S2XVq+QOovg2HlqTvPC5Gs/iuRRRPCWEyBSy2A1vLICSggWdtlmRdPOj4 LHr9M3gN+OgYyFIpgTYzdQuq8rTBXvJMlPjjjtUpoIWsS/GRv78jSDiKeNgN1fc+kuxq kWKMyP3klaYgewee3OhTMwcw38gcbgYw78/XEM/qqROI5CK8zoEpxtddmsWFcDDKrS1D flBIXt8FrMh44kWm5YrrYb/buSaJaoiVCCiN8Giu72x9DQHeao+dDVaUUtzNt476Lj+I vtkcg9JNR4oaHarGskgmXjoc9b9epQN/ag598OGGJ+USfnQq2k12HrQhqT+FlKDayRSi z2XQ== 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=iiMsZp2DxsdqXJM4vxQ3fmSPaFwJfQ5dtFhLtqOB28g=; b=SE8yCeNbKnjOWjh+ap+/ugabPo2oi8ZmOdNtYN6fggrBropJLVteWuZMzU2KMZjSLt iBwQansrvyswypZOaoxeNN5J4KPf/+6Qy9IVeoRq8DpQl/g/uUqb1SU/7hjSdl3PHiI3 f8g/bg6sKRWCHVsvWx210qWk33Jdr7Kmji5PXCP+F050qVn/hB9RoF82VpdWjViB7xen /yeUbWsAWhdZgSRoRWZWM77oY2JsZrciJBq2wQMn5r4lFyEqnjCW/xWRPGeB48usM104 SA+i2KNpMB7AvpArSX5CdmUlr8G0GDbAJeJvd9DdauIR3+UC9F5Yf8gP6sqKnA0i10s4 I8dQ== X-Gm-Message-State: APt69E3ekV4sAcUH/RboyUjKMSZFLirgQd9bnRXGjFW4AZVf2aA29SkX 9mIYJ2XrRkmYWWB0gSvTCbOwc18W X-Received: by 2002:a1c:c006:: with SMTP id q6-v6mr2782588wmf.107.1528415028356; Thu, 07 Jun 2018 16:43:48 -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.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 16:43:47 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jun 2018 00:43:04 +0100 Message-Id: <20180607234331.32139-10-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 09/36] vaapi_encode: Allocate picture-private data in generic code 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 | 15 ++++++++++++--- libavcodec/vaapi_encode.h | 4 ++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index cedf3d3549..ed6d289c6b 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -528,14 +528,23 @@ static int vaapi_encode_discard(AVCodecContext *avctx, return 0; } -static VAAPIEncodePicture *vaapi_encode_alloc(void) +static VAAPIEncodePicture *vaapi_encode_alloc(AVCodecContext *avctx) { + VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodePicture *pic; pic = av_mallocz(sizeof(*pic)); if (!pic) return NULL; + if (ctx->codec->picture_priv_data_size > 0) { + pic->priv_data = av_mallocz(ctx->codec->picture_priv_data_size); + if (!pic->priv_data) { + av_freep(&pic); + return NULL; + } + } + pic->input_surface = VA_INVALID_ID; pic->recon_surface = VA_INVALID_ID; pic->output_buffer = VA_INVALID_ID; @@ -668,7 +677,7 @@ static int vaapi_encode_get_next(AVCodecContext *avctx, } } - pic = vaapi_encode_alloc(); + pic = vaapi_encode_alloc(avctx); if (!pic) return AVERROR(ENOMEM); @@ -697,7 +706,7 @@ static int vaapi_encode_get_next(AVCodecContext *avctx, for (i = 0; i < ctx->b_per_p && ctx->gop_counter < avctx->gop_size; i++) { - pic = vaapi_encode_alloc(); + pic = vaapi_encode_alloc(avctx); if (!pic) goto fail; diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index c7370a17e2..54dc4a475e 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -211,6 +211,10 @@ typedef struct VAAPIEncodeType { // add any necessary global parameters). int (*configure)(AVCodecContext *avctx); + // The size of any private data structure associated with each + // picture (can be zero if not required). + size_t picture_priv_data_size; + // The size of the parameter structures: // sizeof(VAEnc{type}ParameterBuffer{codec}). size_t sequence_params_size;