From patchwork Sun Apr 22 16:47:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 8586 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2915105jad; Sun, 22 Apr 2018 09:55:53 -0700 (PDT) X-Google-Smtp-Source: AIpwx48F7K6x2ogdvvC0BMyegCMAde7BN5n4Wj/DFxhHRUS9V3W5sWs7FrpQZtLHiCziO1mTIger X-Received: by 10.28.178.136 with SMTP id b130mr8072817wmf.68.1524416153447; Sun, 22 Apr 2018 09:55:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524416153; cv=none; d=google.com; s=arc-20160816; b=LNgeG1Pg9A2bFctaAOOTR+Vd4LEKawiVUxtmW8kJ2k42wAyrd83lX6oW4Ug32Nst4F IBXXzm+wNVPRVrR75IfaZzI5wj3EL8B3dmkdaTZIRgh1591nFegj18kJaeVpG0IDMHIy wOGDqSizVb/b1vWHzzxxiikeHcCkVaFkIqew2bCjWKIWtaygJvPBmJav8dSBz6tmj7So Ata+EkIMwT1lRUHKAQahy3Z+wWRO+CLdqbsvMeQkUPXPXobSmgCrD44L5UU5KTWFXP5d BhJWj7Iaa67/hQQCtwn7lQTovCIgDwr+bMhZqmVzIrNVbjKrt6byvqLExDe+SDegFVQ1 Xikw== 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:cc: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=IdndAm1B9tBtdIhbTUjU+kTuh17whLQKzzhYitsJOPg=; b=IQXOwTaLQr0vbxiX2rTU7S9lHjgrdPif0BZFpM3xWyLDjibi5eS4hJ3MiuLPRaRH0j l4gh91i8B2vgVr59F5cBHFwMWm8XoLefwgMeekTFelmaxcKcDRtGvkzsQw9qeWITJp9E IpagXE4pjLNa6xtEjauN4X3tXab2QEJBgrflyKMr6piU+U1VAlvk++qXpqxXy8l8D+VZ Ex72B/YXxKwOc0yP4OuUHopoLfEdtfFlvsmjB3CwDJo7xeEgEbx46o1Jag/i4AyY5fsv hTtTngTmrXzQak9qwVdGDSkPGuDA/7Zu4yFlpRVIBTNEy8F7j32VN57XWEOZxL/1GeC4 98bQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Eb1xuQLG; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t9-v6si8220851wrb.435.2018.04.22.09.55.53; Sun, 22 Apr 2018 09:55:53 -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=@gmail.com header.s=20161025 header.b=Eb1xuQLG; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 27AE268A36E; Sun, 22 Apr 2018 19:55:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 333B268A349 for ; Sun, 22 Apr 2018 19:55:10 +0300 (EEST) Received: by mail-wr0-f196.google.com with SMTP id u18-v6so7662656wrg.3 for ; Sun, 22 Apr 2018 09:55:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/2XaBsZWmlv1R3rTA0kPqSqwmH68bcHr25LDdxGm/l8=; b=Eb1xuQLGnXLVeEyKctjKR+WBkuYlN2An/ntH1KrEQufnava9QvWi04o8TOwM//stHT KfVvRTML2FVPqlBuIyWSoEsvhL8sK8+E6R3HyrG19OISPtrzQPRe47X+WpBSdvmMRsSv OxB555nBH+5hFAskM18WO+PQsh1v/yX4VBDXTXgbjGlJH3CfA9nUNkepcEAtkAkfP0Fq STctVhrJEmRPCpKJu3OR5Aq9mxG7RnIYdmZTNeAtvPmBRYvijNh8ang7COhmOLrvZ3VI Ao7kKpMQyMFT/B400gMezt8Bgg7LyRKXs01XyVT2wLuk6dW14HWkdfG/2xXSdRolumIv WBZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/2XaBsZWmlv1R3rTA0kPqSqwmH68bcHr25LDdxGm/l8=; b=cNr7t0eOwZ/YMpBBjlB4p4RUQqcDYQxv90CWk0/u6Mb9cdTGujMpMVjzdC1tUf9FmO Uh8vlLRcgJ1l2DopBTGTmyKOL/tLWh3y65o5f2U7gEVTYev2iKTLFl3o8xxm+vosG7Ej g01Jn+4kE91hniifQkQiZ9GT2xRIFEXxw6Yg1I3KRBlWJ9fDk2PZz6S2f2rM1fS7lfhN ssoAeCLcyf8l1F5onzJWGg3eQOc2dGcreKe/SHKCu1Cz/6FIR7qUnYm90qaTaYU3yA/Q jZAhxpWFetkDG/UWpqyIHFrNWVTbWcvhACYfFyC3nJgBqyiF5XZSLMwSK0JBZLzAQAd5 Srmg== X-Gm-Message-State: ALQs6tClUWrwAt3pbUrEqsbyS3nTo6YHdheYyyxSwCrwFKUA3Q6F7MQE AJQmfAcCzDFWOcIQaAt3KkavfRdW X-Received: by 2002:adf:87ab:: with SMTP id b40-v6mr15424410wrb.156.1524415713239; Sun, 22 Apr 2018 09:48:33 -0700 (PDT) Received: from moonbase.pars.ee ([2a00:23c4:7c88:af00:5419:5e6c:3fec:91ff]) by smtp.gmail.com with ESMTPSA id l41-v6sm18923022wrl.2.2018.04.22.09.48.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Apr 2018 09:48:32 -0700 (PDT) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Apr 2018 17:47:44 +0100 Message-Id: <20180422164751.22628-2-atomnuker@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180422164751.22628-1-atomnuker@gmail.com> References: <20180422164751.22628-1-atomnuker@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 1/8] hwcontext_internal: add ff_hwframe_map_replace 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 Cc: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Used to fix unmapping when no direct interop exists between APIs. Signed-off-by: Rostislav Pehlivanov --- libavutil/hwcontext.c | 7 +++++++ libavutil/hwcontext_internal.h | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index 70c556ecac..f9ce2f5b13 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -871,3 +871,10 @@ fail: av_buffer_unref(&dst_ref); return ret; } + +int ff_hwframe_map_replace(AVFrame *dst, const AVFrame *src) +{ + HWMapDescriptor *hwmap = (HWMapDescriptor*)dst->buf[0]->data; + av_frame_unref(hwmap->source); + return av_frame_ref(hwmap->source, src); +} diff --git a/libavutil/hwcontext_internal.h b/libavutil/hwcontext_internal.h index 332062ddaa..77dc47ddd6 100644 --- a/libavutil/hwcontext_internal.h +++ b/libavutil/hwcontext_internal.h @@ -156,6 +156,11 @@ int ff_hwframe_map_create(AVBufferRef *hwframe_ref, HWMapDescriptor *hwmap), void *priv); +/** + * Replace the current hwmap of dst with the one from src, used for indirect + * mappings like VAAPI->(DRM)->OpenCL/Vulkan where a direct interop is missing + */ +int ff_hwframe_map_replace(AVFrame *dst, const AVFrame *src); extern const HWContextType ff_hwcontext_type_cuda; extern const HWContextType ff_hwcontext_type_d3d11va;