From patchwork Fri Oct 13 16:59:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 5554 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp904216jah; Fri, 13 Oct 2017 10:00:16 -0700 (PDT) X-Received: by 10.28.232.138 with SMTP id f10mr1904820wmi.130.1507914016333; Fri, 13 Oct 2017 10:00:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507914016; cv=none; d=google.com; s=arc-20160816; b=r14hW9MHrO80nPo0kLWTkTMcc3zh5DpA2NkCJiHbj/yHqAsubjmBRD4XfKxaNPfc81 /z8HP7mfiv3Tvgsi/UQwBlSVdfE6C4CV/8MkVGY4S0ty3IMn05IOUlGcLLp98KYr3VXz Acf0hz3ULwly/Ag72KIb3468LARG5M+olg03swW76QlbKQ7LpoRMU5pcnUZdlB8qdl8B DFo8M8K7+mXjtPoAK0++fYe2YOUUCjgJmHpMfbxqzkWjWfD9N4qCtCX5ScAEaK1k4Mcj 8Z3UbWkPBY5LX2z1bAg2BWX99eioUxse1Dl9qmu9esYcGHCRhimU58fWROG8ovTRLgYJ P/jA== 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=GuIq/su/hs3R1GfSQnZrkquqRXfL0Fqqs6YSV9UK/UE=; b=CqKuqwwYMkDP/zSmWDLDRXFOJFHis0MGopRYs4Gs8gzuQOw2BK9+847DedGfzgQWHe pKRaYYkYuLeWuAoxO/hacXgNVGIljtGs4SHIiiQ1Cu+DW9MHLQYN3OV+jnIItrPxqQIp zGXa/6ve+gnmz4xSEzZ1u4Zc60M65MpHdekmsYviPQVVP85UmtleDFRrQ28FtiC3PuMI BMR15j3oOlGaMKJlI3zfo4JWXThkEDV8p6MEfaYG1cPAxq/U21xf2PDgFIpYoJe1qjFT ASZrSznNqLOK5MyN6j2XZ5ym/TMSnPMSGdf6aeDE+DYoDB0sibGU/zUCNrGJ6i5BPoV0 j7iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=CzB9+Rtc; 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 10si1175399wmf.71.2017.10.13.10.00.15; Fri, 13 Oct 2017 10:00:16 -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=@googlemail.com header.s=20161025 header.b=CzB9+Rtc; 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 137D068A110; Fri, 13 Oct 2017 19:59:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 222C168A0C2 for ; Fri, 13 Oct 2017 19:59:22 +0300 (EEST) Received: by mail-wm0-f45.google.com with SMTP id u138so23119673wmu.4 for ; Fri, 13 Oct 2017 09:59:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=8CpPIk2v25+Su7mDSTDQvnFyZd/bmnilBpUb1mu8364=; b=CzB9+RtcwYfa5RsoxxYeRbbbwZ+74tvWr2AW2/XJixY2E02mddi1mrtdrcaoOHPEgt VaXJSblRoOHk/cdSLyGiKbKJ6VyJfoCR1e1cd/mi5IzGru7hFglrf0c1JoBZdO4xoPrD wpIWTWduCF7ZTVumOUlwCVSRCSzRVULlg7P5PRn/3mhcQrlAPR1Mlu336IKs11/Ric44 lWr9NCiCeP3QGZSNFsspBrqLAZQEAE91W8qYgmEUeuEiMty+JEUgb2vF9j3SQlA2ry90 MPNSc2xlUXoAMtx7X3JQjbv/eXbKRk0C8XQ7RXBA0ih81iOPNPVdteSpLta324mDDd7W LiXw== 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=8CpPIk2v25+Su7mDSTDQvnFyZd/bmnilBpUb1mu8364=; b=h0DguSXXPi2kb2RB98Vy03YdqrRXC4EkpxjKb0loNmIxCcfurez1efBRa89vVAt7m9 xSr3egcAnqhFduwERybrrTK81BMy0qY1J6UlQLmj8GQRzJQhuaUYFuMby+DWKCMOWeEk J/5ljdR9FRaVTbFmcr2flKlOUEa9FMDjF7d7es7a9RQhSvXjfJmHvQvR5qWFAkCsTxJN qPfW3cir59XtEP5hbyuTxfTJ+WdAsEf0lMXiwjgwT4uCxbh1UkFNf4Yu6Hy/iV4lk6Ri MFcKh5Aatl+9iQ+9mM8Z9Povxm0aNeOoeAMqgJ0N4AZLxeey6QRDd2KR+ez87DvpP45p XfPA== X-Gm-Message-State: AMCzsaVcUGN1CwpMoBtShmhYPDpnLyz48upaOG3jC8JVSKnFD+VfJY8U soobv1smDXxqRkVLL++xwgqHgw== X-Google-Smtp-Source: AOwi7QDobr5GS69VwZ3ozNYj1vTRRC1ubkUOTa5tGi1pEh1NhRG43VoEGE0BxgD3Kn7iMdqzJOmtPQ== X-Received: by 10.80.154.35 with SMTP id o32mr2934841edb.125.1507913964896; Fri, 13 Oct 2017 09:59:24 -0700 (PDT) Received: from debian.speedport.ip (p2003006CCD5CDB3359F6019A8DC244E7.dip0.t-ipconnect.de. [2003:6c:cd5c:db33:59f6:19a:8dc2:44e7]) by smtp.googlemail.com with ESMTPSA id a1sm1199243edb.37.2017.10.13.09.59.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Oct 2017 09:59:24 -0700 (PDT) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Oct 2017 18:59:19 +0200 Message-Id: <20171013165919.7642-6-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171013165919.7642-1-nfxjfg@googlemail.com> References: <20171013165919.7642-1-nfxjfg@googlemail.com> Subject: [FFmpeg-devel] [PATCH 5/5] decode: add a per-frame private data for hwaccel use 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" From: Anton Khirnov This will be useful in the CUVID hwaccel. It should also eventually replace current decoder-specific mechanisms used by various other hwaccels. Merges Libav commit 704311b2946d74a80f65906961cd9baaa18683a3. --- libavcodec/decode.c | 3 +++ libavcodec/decode.h | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 9878950c82..5e8660e091 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1649,6 +1649,9 @@ static void decode_data_free(void *opaque, uint8_t *data) if (fdd->post_process_opaque_free) fdd->post_process_opaque_free(fdd->post_process_opaque); + if (fdd->hwaccel_priv_free) + fdd->hwaccel_priv_free(fdd->hwaccel_priv); + av_freep(&fdd); } diff --git a/libavcodec/decode.h b/libavcodec/decode.h index dcfc830296..5d532c615d 100644 --- a/libavcodec/decode.h +++ b/libavcodec/decode.h @@ -49,6 +49,12 @@ typedef struct FrameDecodeData { int (*post_process)(void *logctx, AVFrame *frame); void *post_process_opaque; void (*post_process_opaque_free)(void *opaque); + + /** + * Per-frame private data for hwaccels. + */ + void *hwaccel_priv; + void (*hwaccel_priv_free)(void *priv); } FrameDecodeData; /**