From patchwork Tue May 22 02:46:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 9049 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp987302jad; Mon, 21 May 2018 19:53:47 -0700 (PDT) X-Google-Smtp-Source: AB8JxZov1lYVW41aTgtY43rZlGtrkJbOb2+3dZMt5B1VUOi2QbGyTsvMCUm6ctjtWhBokN42QhtN X-Received: by 2002:adf:8672:: with SMTP id 47-v6mr16619611wrw.102.1526957626938; Mon, 21 May 2018 19:53:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526957626; cv=none; d=google.com; s=arc-20160816; b=FK+LQ/4EfwUyEgYljUiLynkksXNHJdIFZ/aw206p0BDL9EpKz6wDdDVGuRofrj0oDr tGWZK3q7V/TlLqt81vUYGtKtnxxizues4qsHFKWzDpfbjP5eJi/6GR2a2IioOjU+2Fgf HU5fI/VtdlSgvF7W7BueLwen6naKttWTocpkV3qbUsjxzUHljlquAxMD3SYOVFlL9mbM VsrH9g5agHTBgU+gcEqY6S999eM35+OZ4OQIq2ZkM22O9A3wylFTlg3F6Sg0aJJDvOQH jAqmekYZOyLDO54LDDUNjiK/Hmp50A9DWaXI/VzzoIr9XRfk0gA0XzQgw9BRXx+U4uXU whcQ== 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=2L78Hao9GLdM9eC5EfCcad+R7dcIOckWGCImxYoOxdE=; b=Cu6fAeB5y3TYWZ/UQZj2YPbVnxF0QAiw1vBsqk5u+WGDpT5oJ/4M4X7qLZbRkSX5dZ m+rCS8VQLhl3Y7Aa30rF/SFc8GxQXXd2tn2usLV1izUqDIKVIK/YwbpMke9glf6jZbeF zdNU7R8WWwjt+ULd2048AYQxsP3EBFiHUCx7FFKSrGxz+b/Nd35Ht7DJmwRQS5h3Wwfm tZoJyR9rfsxlxCInUhZoF1U04nK9vzHxB+dI2KS6A5QI2nqsIjAkyNoEy/3fZaKNni4r MUGIFNsswakU2gmWrtgwsDKxm6Oa/OT91aW/rAGHlqXl5FQf5TFBFLAdTkj1jGmN9LcX +Zog== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PUDROJ9D; 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 88-v6si13289452wrm.183.2018.05.21.19.53.46; Mon, 21 May 2018 19:53:46 -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=PUDROJ9D; 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 21EAA689E8B; Tue, 22 May 2018 05:53:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1DAFC689E84 for ; Tue, 22 May 2018 05:52:57 +0300 (EEST) Received: by mail-wm0-f47.google.com with SMTP id f6-v6so28372532wmc.4 for ; Mon, 21 May 2018 19:53:38 -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=rpAg8ZzJFoDSOX7maOvx+WTAvKTs0l09T6hieMbzhQs=; b=PUDROJ9DjM6dRw0/4aCP2MMShdMgLiAlzfCbKz8LqCeCAumD66OlCSYGJacWg1jxWp yl0w+gmszikmiA0HVMgJvhvngr18u+98rLTjkLQ7E5Pdeps9pOg3uDAQGsg1RXeSByqp +pr1D5c0CDxajlseaiJp4Ibhymv7HsCZdIjFKZNG81zkeouGu60xbhBCwPLl6I+1GsTi sxZgRgSFLK4oqfFrWWfmGrzO63Q5Ap85aA1nfnnSL5i177FEOwYEozj+QUsZ8nQ8SiQq 1LiyCA5+ELKI6NshutxcJ3vHnuZ/d98EXfTs8H9yvtCxmK5zQWRVKaxHBX7oMqq7P7AI 4VRQ== 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=rpAg8ZzJFoDSOX7maOvx+WTAvKTs0l09T6hieMbzhQs=; b=uXjm7C77YS5umLtmq7Vb+0baV7QJkijwHjWeKvs0UBFf1G1ejjhAORbJXyjgn6+Pgk KDCAKW7AFaW8tsSvFA/ZOXasZUrxaqaC3fPtujnse12xfOqDC+y607CKPWNPFnIH1c3+ Y/gisP3uqXbRgyZP++h3XD9w+qUDFf+l8OgV6vROHiSgfLHxMpjXBuXEw0KtWjIMuays oCDWoqUQi1DNF4wsG/ASM/uyuplwoEyhgDJc3eRLBRXGKa7qvgT0FXDT1FJDcT/Rbyjh WupGkHg6x4a1wbsoHhRqbNykWx8hnq84IN/igG4hdR48PN9D/ZkHuzlkXm8Djbb/BNpJ xyXA== X-Gm-Message-State: ALKqPwfCjgVL7kOYeS7pr6+9ypzvbZ/UfWG1el52zOYhYU8AoUlOBCLn Wop35ss5p123ooxjnxoosdnwUPeg X-Received: by 2002:a1c:248b:: with SMTP id k133-v6mr654510wmk.38.1526957300860; Mon, 21 May 2018 19:48:20 -0700 (PDT) Received: from moonbase.pars.ee ([2a00:23c4:7c8c:8e00:150:af35:e548:96e6]) by smtp.gmail.com with ESMTPSA id k5-v6sm7736085wrd.13.2018.05.21.19.48.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 May 2018 19:48:20 -0700 (PDT) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 May 2018 03:46:09 +0100 Message-Id: <20180522024616.3091-2-atomnuker@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180522024616.3091-1-atomnuker@gmail.com> References: <20180522024616.3091-1-atomnuker@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 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 745016ed7e..f1e404ab20 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -870,3 +870,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;