From patchwork Tue May 8 13:31:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 8866 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp4021557jad; Tue, 8 May 2018 06:31:54 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoscFrlhtR+jQ2NULm9mud6N8jsZWLHRW+pma4j2vp/uOYhPi11DUQ69LTsUWCAfoMM2Knm X-Received: by 2002:a1c:bf52:: with SMTP id p79-v6mr3329862wmf.43.1525786314777; Tue, 08 May 2018 06:31:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525786314; cv=none; d=google.com; s=arc-20160816; b=Rie2UjxxnZVTgw+HX+83T5t6a3K6J1P9iM9Hr5k+A7Zuq7ImDkZ41t/6s+Zpco4z59 PgSrSHnjN/8JG53KStLRjuUlGDe3CWu9ngxNh91iLD4TZvBxwoqnzgx4Aw3mV4mshwXm D+iO8zmIJvpIs3WscT4pVd8tcAdyWKGtXUtpGqkC018P7qm9gbr37ZuhRdZkVc3k25pQ x4cn+5+g947OCcrkfgahWb+rPBDkQNfvJtsznzq7MEd3+VhUKW5Hd9dTgm9bslUb+E5K 1UeckCySxgMYJN0C+e74IYzU9tN65PUenBv1AA1z7ZP1gmXSbN8ZTfHUeX4x9sbN7jYm M1FQ== 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=5LNKiPpmfsXRPrALagkrYFnf83rNMtnXGHI0DcQojoI=; b=O4o3rlyz2lghzg+uCZJCSZ/RFwRn2qDytsOEDKrizfuPsBcQrq1anzN4rkAzmQEiGW IUtXeKC4cXicLDvsPJERUVXXcf+EAZ1YfNpsXGyZHKxTwT0W2csK1ny3u4p4SCs7pBcr TX/98aaASpmFxoCzKVA2XsXxEI/I4QQJRGb0jtiigNBhXWE0bnsp83dwy0bQdPZugzFf H65+csrvDoRAZojZHtSDN/WH5glmCx4kpC4g8MIgYUBJcTKbjQekZV55AR9HlsJxDtHa 72uW06yaradhQIdqIijveLjycMc6gdCBB5K2n54IyFLln1hLzDPPuvWeE7Jyhu/HjORF gNAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=sPv6eFyZ; 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 p7-v6si11926066wrf.461.2018.05.08.06.31.53; Tue, 08 May 2018 06:31:54 -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=@rothenpieler.org header.s=mail header.b=sPv6eFyZ; 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 B1C1168A6D6; Tue, 8 May 2018 16:31:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [5.9.118.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F47468A2DD for ; Tue, 8 May 2018 16:31:10 +0300 (EEST) Received: from localhost.localdomain (200116b864513a00ba975afffe10ec69.dip.versatel-1u1.de [IPv6:2001:16b8:6451:3a00:ba97:5aff:fe10:ec69]) by btbn.de (Postfix) with ESMTPSA id 5366F734C1; Tue, 8 May 2018 15:31:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rothenpieler.org; s=mail; t=1525786304; bh=kDIozcgVRRaZ67qALuaM4YVV+oy4cyDmEg5nemxoYQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=sPv6eFyZTsxWvc/xsfN/0Wf1HkWX0fkTrdjYPtUCAUJgPYs9uTt3OMc/VTb31lqGt nMTUbqVoBOVWJU2rwIZp4ytCdiOvZ5VyQxkn+Y3w0WLSO8KKZDd5oNAgZZIvOVWuC5 JOOrniY91BV9/5kIZGPCuS+hqt5lOZ0vnNKs56SM= From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 May 2018 15:31:31 +0200 Message-Id: <20180508133132.28940-5-timo@rothenpieler.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180508133132.28940-1-timo@rothenpieler.org> References: <20180508133132.28940-1-timo@rothenpieler.org> Subject: [FFmpeg-devel] [PATCH 5/6] avutil/hwcontext_cuda: explicitly synchronize cuMemcpy calls 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: Timo Rothenpieler MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavutil/hwcontext_cuda.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/libavutil/hwcontext_cuda.c b/libavutil/hwcontext_cuda.c index 8024eec79d..7f55881ba5 100644 --- a/libavutil/hwcontext_cuda.c +++ b/libavutil/hwcontext_cuda.c @@ -267,13 +267,19 @@ static int cuda_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst, .Height = src->height >> (i ? priv->shift_height : 0), }; - err = cu->cuMemcpy2D(&cpy); + err = cu->cuMemcpy2DAsync(&cpy, device_hwctx->stream); if (err != CUDA_SUCCESS) { av_log(ctx, AV_LOG_ERROR, "Error transferring the data from the CUDA frame\n"); return AVERROR_UNKNOWN; } } + err = cu->cuStreamSynchronize(device_hwctx->stream); + if (err != CUDA_SUCCESS) { + av_log(ctx, AV_LOG_ERROR, "Error synchronizing CUDA stream\n"); + return AVERROR_UNKNOWN; + } + cu->cuCtxPopCurrent(&dummy); return 0; @@ -306,13 +312,19 @@ static int cuda_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst, .Height = src->height >> (i ? priv->shift_height : 0), }; - err = cu->cuMemcpy2D(&cpy); + err = cu->cuMemcpy2DAsync(&cpy, device_hwctx->stream); if (err != CUDA_SUCCESS) { - av_log(ctx, AV_LOG_ERROR, "Error transferring the data from the CUDA frame\n"); + av_log(ctx, AV_LOG_ERROR, "Error transferring the data to the CUDA frame\n"); return AVERROR_UNKNOWN; } } + err = cu->cuStreamSynchronize(device_hwctx->stream); + if (err != CUDA_SUCCESS) { + av_log(ctx, AV_LOG_ERROR, "Error synchronizing CUDA stream\n"); + return AVERROR_UNKNOWN; + } + cu->cuCtxPopCurrent(&dummy); return 0;