From patchwork Tue Nov 22 13:07:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39389 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp3002110pzb; Tue, 22 Nov 2022 05:09:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf5myIUHfFmV5GzwDk/0wNHm0dmreMqI8QTwvTx01LDjdPdaY6FPCccS7Wj0TYYRuDoac69M X-Received: by 2002:a17:906:1e48:b0:7ad:a943:ee49 with SMTP id i8-20020a1709061e4800b007ada943ee49mr19377053ejj.311.1669122577568; Tue, 22 Nov 2022 05:09:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669122577; cv=none; d=google.com; s=arc-20160816; b=uyUXmKJn78AtHymNhyLeYWe+Ge9FEdTWHukHhy3ocqg4TzuZD7Zm14GBiTNP/p4eyk MhNlDr1Srwiqe6WtI4yzx+iWeV3h3iQ5ftzfLcBCIBQ8d1bzQpB8BPJC4WBP/ZV7mf8e /rJGmQA+NmouCqEFJI1XMJ71bzXucDmbuAU3zOCOBYdAMF+qqJplyoW5zVJYTVoPZsUv IAj+033UsZVisFNvRyyycM2fnJi2D4mN81AdogDSvukZ6CqSi3Pcm1zqQuFLytwi1iqN fRI3sIOiVgKZpXqbJuNWBUFTQJ3ZqD4tq1audKFdauj/BUhvyHgmwKV1/Q088YN4vmV7 QegA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=3H6VPksal86Ha0PRIMZn4M05b7cr+myZxUVTV2ZSgOA=; b=V5tmbgNXjoCiuKkVtn70hED4Hb0KMadOZx19x164bBw8ARz5a5XNVqF65RhI9gLGGz IInEAXpWRbh6+daFiq2L/yMrPCATPrepMzYz4hB75Cv2XfiCJwIhS/u/f4ixGepN97TP e2gCpdy/punJ5shx+Iymwo3UF6l4eazHv4DyWzXUEqZnmTyaScPcEi0DL/hWVWKXikQF 50RYTYHYzGyAYKx6oo1swtE4Velp2Mhui402aC6RXXKaADqUCqpA3Y8kikdbMXrXG0CM yA7E1jkLNarUF8SbCrktSN2ro3ljsHVYiCNYYVYZ1HJewjJzzXXtcrLwbc9NS0mFmZiY qsrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KQdW2hYI; 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 f13-20020a0564021e8d00b00468468cd389si1571048edf.205.2022.11.22.05.09.20; Tue, 22 Nov 2022 05:09:37 -0800 (PST) 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=20210112 header.b=KQdW2hYI; 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 CA2EE68B1C7; Tue, 22 Nov 2022 15:09:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f52.google.com (mail-oa1-f52.google.com [209.85.160.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5B8F68B4C8 for ; Tue, 22 Nov 2022 15:08:52 +0200 (EET) Received: by mail-oa1-f52.google.com with SMTP id 586e51a60fabf-14263779059so16346793fac.1 for ; Tue, 22 Nov 2022 05:08:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=hKyQbaouTuzRiZcxq89ZV+2KOziyD2K9iwcLqn9ofsE=; b=KQdW2hYI/nzGMcak0RK4cDfPR7am2dQ2N8uCiXAVT0a2wER/yHIBTShKlzoZwmNjiw in/Q0smO8euhKxqMEw/dJoV76/2X/kjVB2uShT3hAtE5qs1N7KN6PlI3e2mYvZ5lRBja zdU1mv0V7SsOPogy/nuJVeqOdHHAw6QgQmQKAlRJf+gGIoTScV1py+6V0HlYsE8O1uIA fZGrmjtrnq8VD6sH0+Aq/AcIxvioLCdTW0xAfSNQxxYy8MsjLASfTrNe9zhH40K9a4HD qTb8ajYzGFq4w+zuNA/dVeEMb23I8Fs8IX5q08+Tc58sd2IM5fEQLK6qp52UeizF0v55 bN+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hKyQbaouTuzRiZcxq89ZV+2KOziyD2K9iwcLqn9ofsE=; b=uzLTuekhc63/6Hm7LpoL7TcPYbEl/wzGBpwYI1uSECNzlb3v6zNvzeRxY/e4YISSuY CX+9FuQ2l4YmG/0y+XyMWPZtQYNaWPew4+n/QeBshP2T003zVF6R1eljHrytT04iSFPo aWjnpV5aF9WJvxs9yLN+QT+mkyScs2P0zlayZHQkWfPjcHCnZtULPfbnROmnYNVhLGV5 gu4w9mZRpAhbsRtBjAD+P4tqOhNIU95sxYvhitLgpcq/JRJSNWKoT3O2P/H5wDkzUcGL BrHlYg8wlE/hWF4bOEgmpKsdcYWFABY1EvTjYxBGNIOTIiaTtufn3+jffejfDKAzPn+6 6TjA== X-Gm-Message-State: ANoB5pm6tH8chaGfosHrD+5zmCp+HfVLHc4d+1gZM9ftAvQXX0+3iH6b Y1lUxDhux292jsGYfKhhvrtc+dzHpKs= X-Received: by 2002:a05:6871:4490:b0:131:cde9:c89d with SMTP id ne16-20020a056871449000b00131cde9c89dmr16247761oab.5.1669122531142; Tue, 22 Nov 2022 05:08:51 -0800 (PST) Received: from localhost.localdomain ([181.85.72.69]) by smtp.gmail.com with ESMTPSA id g4-20020a056870d20400b00142fa439ee5sm1825258oac.39.2022.11.22.05.08.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 05:08:50 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Nov 2022 10:07:31 -0300 Message-Id: <20221122130732.403-3-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221122130732.403-1-jamrial@gmail.com> References: <20221122130732.403-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avutil/cuda_check: propagate AVERROR_UNRECOVERABLE when needed X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WOb0iR1mCOik Based on a patch by Soft Works. Signed-off-by: James Almer --- libavutil/cuda_check.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavutil/cuda_check.h b/libavutil/cuda_check.h index f5a9234eaf..33aaf9c098 100644 --- a/libavutil/cuda_check.h +++ b/libavutil/cuda_check.h @@ -49,6 +49,10 @@ static inline int ff_cuda_check(void *avctx, av_log(avctx, AV_LOG_ERROR, " -> %s: %s", err_name, err_string); av_log(avctx, AV_LOG_ERROR, "\n"); + // Not recoverable + if (err == CUDA_ERROR_UNKNOWN) + return AVERROR_UNRECOVERABLE; + return AVERROR_EXTERNAL; }