From patchwork Sun Apr 22 15:29:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 8571 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2854264jad; Sun, 22 Apr 2018 08:31:22 -0700 (PDT) X-Google-Smtp-Source: AIpwx49aspldFRw22TjTznwA9HgBhV3c97b+lVc0TkntHqDJpS0gKmkZupXrXMGCOQ0WqrrDQSoU X-Received: by 10.28.107.5 with SMTP id g5mr7946530wmc.133.1524411082252; Sun, 22 Apr 2018 08:31:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524411082; cv=none; d=google.com; s=arc-20160816; b=y0bwOL8jxEoubZ+iOH3NWIiD7y97/tHfxksudmq9MlpDwkCETHRxkEordzw6JXhH/I 2EzgODIHSPVQFgmKlFaN9/+BDdy9VvnxFGOV7wS3Qi7tcaU+3tHwfujslG+VtUnUB+Js d/DkV0HzETcil9y57WJGDEH1WyJHa4J0S32xGdsL4U6uzoEmEnq8mz20KmzTkBU3kvic k7nYW6Lm9TLi2WJyVfGn2gJLloLtisFk4673V98KNEv9IXnHai/NUBnl90dzvCqcbzIp ylijrokZvSdk36Y6CJeo3L6gaWewGdLiXFhYKmqU1wxQdfLsiQyJ0VAHEDNolr/JRa4a DVKA== 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=t4KjxLO8KCo1EOrwt+t+TVbvn4yXpiSjM3wPh6DQC80=; b=q8nxPoNdunjtkXzeXwdlZZxfLURwXSG7d/Np7rEMDu7z8acsdqNpHQMZTgIhyPA5Uo IGv6nLr7K/WIHI3CxulbLdfF1e+Vg/NeWf9cShp9EV2ov5h0oCQ/AZ75nTRvl7ifgSfp OkIaTf+s35kRpJ5AyQqL99ZHIheZP9Gb/TFE8fuDXwyi41KOVpOO+/fA8Fb0QC/GEyEa 1xRezsRdukJxakyzxiqWGi4FT4MAqas6ZsUIEO0yfLrqcrtTR0K5rmZs6OW8TXl2bKmq a6RHG81UNGZlDxtNPDqBT7F9s98gWQ3MLFseOhmYtxxo6EWHwU5pe8MYMHl6ceTrVbfw HLfA== 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=ZjQ+NB7W; 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 h30-v6si8074341wrh.447.2018.04.22.08.31.21; Sun, 22 Apr 2018 08:31: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=ZjQ+NB7W; 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 DAFDA68A357; Sun, 22 Apr 2018 18:29:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8AB5168A2C7 for ; Sun, 22 Apr 2018 18:29:08 +0300 (EEST) Received: by mail-wr0-f195.google.com with SMTP id u18-v6so7332542wrg.3 for ; Sun, 22 Apr 2018 08:29:37 -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=1keTvq9GDcENXozZj5wKM8N714eElGxn9MS6ji80Fww=; b=ZjQ+NB7W8HWpobBqoJBrmKgBsDZ1/89sBG2EkuJVPXBR+0ne+1IcATf6wDxZ+bBa4I Fzy8I9gi5IZeVCAbjLnnLh4Tz/33tM5RgWk6OkJanDMjr2930VMtTspGihj0oXJ/0k4U z9cN0X7B+HP/Jz9Mol11JdStdXhIV30k63nRX6CGkBr2ltyplhKDNdhllOwE89Bk1YC/ SxXmCe4qZd17/9eX60IW2NHE97/cqxVeACybeYD/LQGBbp8ITyntV3MsrwPz2ItWOI/9 eDkYzT8XE3T8FepBE5KHnNOZMf63aDg1HPxiA+29Rgnt3lqLdJb8DiIEn2ngAHQeCJgL z9dg== 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=1keTvq9GDcENXozZj5wKM8N714eElGxn9MS6ji80Fww=; b=YB7NSwdM/Q6r/I9dEun7tbCOr7Hg07X1ApRlY8jix5jxJi4AhmUrNdQwgDc6G57LLW qUfR8jzKIRLMQw7q6DxI/yZUIvQ6xD9g/kkIW8j0gf4j4rAYkbklrM24cPTQwagN1477 w1mvZi+sNY1s3Hb2le71+OrvA/GEaYA+vLZq+Vo0KRXXhc4oJjGWlKkqc4H5hWiesW9F q7o8pzBF54JUfETJA2z9H9fEKr5Ujsdyi2UZpKy69+WD5aWTGgVexUSDPwnhAaUi3F05 LQtD259lVU9fG6wgQdmbigXiy//fkifsjJSmaToA94kBU5GFQjKoDJGEWq8GrMZNK0mB C1WQ== X-Gm-Message-State: ALQs6tDsvwq0Zh0VBV4cZ8Hjgx5sOfQyqQmvaK2iCJXhtQ/3iu3zCvKS v8ChSLp+QEqPVo3IC4IHlpalcA0a X-Received: by 2002:adf:dfca:: with SMTP id q10-v6mr11441378wrn.49.1524410976939; Sun, 22 Apr 2018 08:29:36 -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.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Apr 2018 08:29:36 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Apr 2018 16:29:03 +0100 Message-Id: <20180422152921.32510-9-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 08/26] 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 609fc604c1..bb0f4c6fdf 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;