From patchwork Tue Sep 18 22:31:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10392 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp14668jap; Tue, 18 Sep 2018 15:36:22 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYEIGmdNsuuGkwqkdkuOMtpwoH5k2//BBTFnhCn4nVKUMzvHybcJyOPgxV8ODFTXmCJ6I3h X-Received: by 2002:a1c:dc1:: with SMTP id 184-v6mr18437554wmn.145.1537310182909; Tue, 18 Sep 2018 15:36:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537310182; cv=none; d=google.com; s=arc-20160816; b=jdb4J/D0vLDJZ2yToiBwBIbQ57uQiT3DOvSl6VSSLx7ljPgm5B2r67Nwth+l/4c49z noZVWC3Ldt+xCyzsmpXKviJc39kKbwEQYMbowxGIw+SRhlaO2Pg6iJzBMu5kJZErhHIY 4dxxyOn+s6UClnY0/zPqAcnkrtnu+vkOjF2952tGIbMCirk8/EY6g2pH4yaS6GZOWwMC uGcATH/UXbTSk/zmw5FD7RC0sEL4CSmlxqNGRpl95bHqzCaBJ83D4EjZV50Y/jua3N8d 4HkxcyB0htB0JmDX/E+3Ges/BgwRO2Nj9xRxe5Cvp0nvQ7LUhLci2PhCNBhHsr+RU6tF L5dQ== 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; bh=eHhu7w/VkrczVK/frDPCrC+9lF7CE9g1SVlTj/eX7EI=; b=ejeYwNptIWJgt2jJz7S9lLFt3ypAsFufogW8FOkyF1EadnGl4AX7garUMazCjuGDag Z/J97aP5Tez68krOZ2eo4BK+HrZ5kSWqp99xGdzgZcnJrctPrLOX/TZ4dFgfMVx/oqXZ EoHd4remu3YhFNTCDAx5wsk/2bEK8PfYT21HWkRR86Q3hlxONzMEO0SZ0PUDbSfpbm56 ZtO/9YvKS+fyBY1xaC8dPX6fQCp1KAb3+2C0kZspVJYA2eQjlikImcVkX7X+tZieXwCj 2Kmkt3bHxx6mps1bPpQMadWgxPwNu5BKsoB3po8havThj5KMC02Zq51cz72GXM4j6rNf vdgA== 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=EgKgxfu5; 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 d136-v6si10759191wme.102.2018.09.18.15.36.18; Tue, 18 Sep 2018 15:36:22 -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=EgKgxfu5; 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 6812A68A68D; Wed, 19 Sep 2018 01:31:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F5E768A68D for ; Wed, 19 Sep 2018 01:31:43 +0300 (EEST) Received: by mail-wm1-f52.google.com with SMTP id o18-v6so4636393wmc.0 for ; Tue, 18 Sep 2018 15:31:56 -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=FxsyJaFZOpa0ixkNiLUnRHsPRzxwL7/GWt/blIu24ns=; b=EgKgxfu5gDVcfZqxo/xVITlO2e0KSj/WtKPn5YcoTxwfM4GMvSi/ClY2gU5twcSPcj 0HyaITyDKx5hVdqKj5AFMyQngxvtf6VlAHxzzHOcrM3UlJosRYGh5JibDjWJhyorEEUO R5ZPMnW+o5z4c7A9ISvNARNGOmdXh7CQcaejPKUpBJb1wJhxQbWGWpuGOKMlBQTCVcau uD7RRiKeD9H2EjX1Q783/r0BHQRCRk2CHtYPQcPyokeRHcQtiDSzrKJOleqyQoDMeTxR RVlSATkA+5R2K0RTFaxn6PcpmgYRKtSO2l/oWMT3A82IJ3YnLgyneIQqB4OTg1F5y1gq j9GA== 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=FxsyJaFZOpa0ixkNiLUnRHsPRzxwL7/GWt/blIu24ns=; b=Trbaw/hBn2o6u6MdMslPlv+35I8V2uDZnYEkPpMA08H4z64ZTa847nsqySMtsOL1K7 MzteEBZBfKRmJY44KisHSP60fNpytV66w/N9Ah0FNN4WhqVnV7k35x5NVjsE13lhXHmC n3IHnt537SA0xvaD75nVYtp84HkvSn8IrLWor+UNrT28rLVNCjT52ovmLcNrEqJRE2lG sPJZarl4tc2SdmFG53d8nXfe3quffF6hJCWCKb383XFBjbGYAsg1Wxa8tjl0ZeB/HixB 6KgEJcg/JMEvruLPH7q3ZGGfQZ1gsR2YcPCXBOb1f7lFJkTeY/Pi2CP8S3AgaWFzbzht W5iQ== X-Gm-Message-State: APzg51D1rrwn/u45QEMFYLbqbytQGsqgGICqpQ2bKYsqTAgb74JXPao7 ON4UMxs0M5f/Wc+TScvAl+YYyDTdrk4= X-Received: by 2002:a1c:ee57:: with SMTP id m84-v6mr17183877wmh.9.1537309915624; Tue, 18 Sep 2018 15:31:55 -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 e141-v6sm4863826wmd.32.2018.09.18.15.31.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Sep 2018 15:31:55 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Sep 2018 23:31:11 +0100 Message-Id: <20180918223116.14322-34-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180918223116.14322-1-sw@jkqxz.net> References: <20180918223116.14322-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v4 33/38] 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 230b322ad0..9431738472 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -570,14 +570,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; @@ -710,7 +719,7 @@ static int vaapi_encode_get_next(AVCodecContext *avctx, } } - pic = vaapi_encode_alloc(); + pic = vaapi_encode_alloc(avctx); if (!pic) return AVERROR(ENOMEM); @@ -739,7 +748,7 @@ static int vaapi_encode_get_next(AVCodecContext *avctx, for (i = 0; i < ctx->b_per_p && ctx->gop_counter < ctx->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 965fe65c0b..6204c5171f 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -268,6 +268,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;