From patchwork Fri Apr 20 04:30:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 8527 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp232389jad; Thu, 19 Apr 2018 21:37:11 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqiknE85riQlBK994roknUB1NC/nyRnzQlAB6ElZ48COWHDEcZbJsABvfxhqSq5olwZHH29 X-Received: by 10.28.44.3 with SMTP id s3mr794544wms.24.1524199031446; Thu, 19 Apr 2018 21:37:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524199031; cv=none; d=google.com; s=arc-20160816; b=Y/f9FfHUU+sAsdMMn+xPUFZUG42MyL18o4BkkUav53M/34fxM7zwxnxazurlTB8oG8 E9OlioDQYiIOvtnnNRBH+1WamennCSGjsuJjcKsQrTScy84lSN2aMMzZNexG48LalsIW If+aTrGeKzbghnHonPb5xcJydpMGWnIFL4FlDqbi3aJAzU9w6muKISqW2UVcYx9MDf2a nuTUQf+GTR4MnJHU0duC6NCtjxOSHLDOQDvCCV3Diic4N4BOvXfEI4EN6qNofMdU38CC 1aULOMZtp5XHLcltuXeB3Fx7AI4HHmT7mL6Ab1GibofpmJhhmUPgfbvSeDhorEEbQc5+ v4jg== 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=zqjSZJfe+oE9oRhPYpHJ0w7pRs6Ww7HJ/WnZhDT0lNKPbSl1ebHVd8nP6fWoVMoZBJ zv/f8r41cPd+JBYyilQC0o2kDmwGLHaJmdbZNBeqEd9MsqWoOyGGuLQBHDqwJocK7K3t np4rEUqpDlgFPEb6xb0Xd429Epkwd2vCf2OYx8EHcveCjvCzLUN6rKF8NYb5SNWNIKgS R4XF6fLvXFXNHy6NEkn75hcv4of8kJE+59723i5ILqNMZ0FMh78THm7A6nlRLLKr5rGW HLr52A0qSQTZa6Q/HxWt4crfOgjMm0OoUinEM2STZ+IwB/QSpeWAub/UxAmGaa7Exn7Y j/nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=CwtJYfuW; 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 n12-v6si1910952wrn.303.2018.04.19.21.37.11; Thu, 19 Apr 2018 21:37:11 -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=CwtJYfuW; 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 E8A1E68A16E; Fri, 20 Apr 2018 07:36:41 +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 224B3689DD3 for ; Fri, 20 Apr 2018 07:36:36 +0300 (EEST) Received: by mail-wr0-f196.google.com with SMTP id v15-v6so1226303wrm.10 for ; Thu, 19 Apr 2018 21:37:04 -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=CwtJYfuWIwgznqs/mAaVDYL2I3FL2J6dAeiIm1ikZzYkK0WRod3z/5I+NFkgs76tQg bzVX9ImY32znHn5Rt9snt9P6YFTDWQ7StGM13T32B2FeCyo4cBCI6qiGxQWdCLPLhKw8 Eujj230vXkpozuKwFiFFJ1P3AGA8M1+WVKFQl33m3jYavxSBJ6vx1etV3Rjvg+4ktb9U Ac/JPY/pNE07fXaMiziLzpRBqpeWfaATyU9SNbqFqno9qLZHxgyHlnU5tfrC1VLI5THO EmC0zjDE7qjYLBvx8RQthYFC7DG4DzL1Q1qyBsbyyT0gJM5+uHUdfMMi4BjbyCvASvNL O2PA== 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=Wz5ZqqY3ND0efYjGaFNyrVH6cC6II2AZ10FXdKCdvJzCYeAYWTfabcIUzMHyDCjk0o 5CZMyHsXJ2W/6MNKK2hPn2pUSyt8lGBsGFno5Xog6jt3mvBhp2wivOeKU1uawPuO/bWf 6Cz3YedwgqpP/dD5DYv9g4U+InIcytyyzgqcykKDYmPEsxPnzZEY+zHtQgUwPaEXuKNT cenc8dTbF/HgrPAZ87xDcsOE8rdQyYdoVmtnEJd4l6A9eeJ1S+r0IqCT+pvWwQUcQWvd 5C9CiGDvwqauFDZwuA4XvZSd9+ItEqpekhDKabjVkGxFRHKeeIWsaaGZD31gRrYDQ5AM a3MA== X-Gm-Message-State: ALQs6tCQ9H2q/G7Ad/kyqYgxshQO8AOCu9jUzCJBg9QD87RjcufLQWZz ksubqXTDjpGif+O8dMCXKwOioLPn X-Received: by 2002:adf:ea01:: with SMTP id q1-v6mr2024458wrm.50.1524198643737; Thu, 19 Apr 2018 21:30:43 -0700 (PDT) Received: from moonbase.pars.ee ([2a00:23c4:7c88:af00:4c9e:9728:c86:66cf]) by smtp.gmail.com with ESMTPSA id 80sm935304wml.44.2018.04.19.21.30.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Apr 2018 21:30:42 -0700 (PDT) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Apr 2018 05:30:03 +0100 Message-Id: <20180420043010.3709-2-atomnuker@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180420043010.3709-1-atomnuker@gmail.com> References: <20180420043010.3709-1-atomnuker@gmail.com> Subject: [FFmpeg-devel] [PATCH 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;