From patchwork Thu Nov 30 20:35:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Trimble X-Patchwork-Id: 6476 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp324750jah; Thu, 30 Nov 2017 12:36:10 -0800 (PST) X-Google-Smtp-Source: AGs4zMaEPQZssbfCja2TX/HUjDUwVxKN1nLcY5VUIavlFa4eDZ8prh/xItEeiB8peP2POplwXaXd X-Received: by 10.223.135.250 with SMTP id c55mr2890604wrc.183.1512074170368; Thu, 30 Nov 2017 12:36:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512074170; cv=none; d=google.com; s=arc-20160816; b=TIMBw67OJbsccU3RBZq/nMNtRMGn+MPtdkyBMqDTiyPq/C2O4YNeOhyyMeq/UuCzj2 Hx89h37OyKYz9YFmU/K+JBx6HPOrznMuf2hcmn8XH9rflIXXdoA1dVEao5WCFaQnp/mE MEmaIPS8hfIpNLoYpqvoy2PToLsBddyaaGALfyCHT5p/H3YIjuanxYpgM+MgLehUK/IB G/ShTOO6lxF8vt5qx0CkkYbh2EZFOE8WDQetvs6o9SuJzLLVnyj7SMfalzxkyykNmiCB nE1Ol1k99s36FYP8cPGycCKreNY8ZTfZd1o632SeBIgdB8JFFwxW13Lt1bUMish6CIO/ rDbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:from:message-id:date:mime-version :dkim-signature:delivered-to:arc-authentication-results; bh=9z9PoT+oAL6ETsgYZs/xLGLMrX21unb8x+DlNfOKBrQ=; b=oQjvOTs8rq2HDTd2FM/sPnmDNxIfZJ/vFhrn8bOyoihPMeuO4C7qSyAlIj3rRMJcmJ khnh8+jqmNTw+Vc8IBrrqPmh7XefAEbZZjxa+YLzhihNCQzRh+ggxIgnUF03szZr16PV xgw53htcJehcSlMVTXtnruvlzgkExC6Q8uR8WXuIzD+9i8RXDWgUT7uz8jFaZTKor4u3 pWSafBqOnEWrIs81mcU2pCE+z+TWrqLduIl9zvOsnbYgKUdaCg5UkelcBeEYncWSdH35 Nju2+89NAAmAeBOThnjW5ge4zES3vRCvup34t4znxqJqIfBhqcGN/bm+I01LBIqprGuC H/Ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=gL2SiHd3; 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 x20si3539956wmc.1.2017.11.30.12.36.09; Thu, 30 Nov 2017 12:36:10 -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=@google.com header.s=20161025 header.b=gL2SiHd3; 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 2B57568A213; Thu, 30 Nov 2017 22:36:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f201.google.com (mail-qt0-f201.google.com [209.85.216.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD39E6899A3 for ; Thu, 30 Nov 2017 22:35:58 +0200 (EET) Received: by mail-qt0-f201.google.com with SMTP id v3so5386739qtb.19 for ; Thu, 30 Nov 2017 12:36:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:date:message-id:subject:from:to:cc; bh=awttduy5i0AKJVgxejWtMKPNPs+aJtvcXkc7XUHed48=; b=gL2SiHd3ERRxWD9cWpvDcEf4GRCv1/isoGt8laPkVdYBtj9d+UzXs65zdyLe/POr7s dU9m7pNrlMeQA7uW0VlalFmJ3gWhepOBj5GVgt1CzUfG1W79v5sDUHkeubWHj5jI5Zc3 kAh7Vhm3BMJsuaLlYroc9aUSGyPwMR6l9wWKj+xI0ItOuzd2rWoi7Rir4enjlDf9RMnW GztnIshYYRudrdQamlA5uDVZgDQQ10j1EDyevsCDn09fbD9nOF5/u2kgawo0r5pT1xpl XCMnKsvP5WF/zN4MS9+FYe4i2G/EAOmxfWuTf7XNAmlyGXvTy9CTQCpcLUsaByHeFn9A YEHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:date:message-id:subject:from:to:cc; bh=awttduy5i0AKJVgxejWtMKPNPs+aJtvcXkc7XUHed48=; b=PkpbN13acTDVLNPIgVUz0eXZFu+VkkiKZnk1VsVbYx6RSNuredH+MhXkqLMRXKvzZA H7+obbyhvfn1GWlN7VkpeH682jMXAH07YzpBmgNPp6Q3tI/L/nK9oFwDP2ergj3hlUZ3 rU+TAM+EWOwouqzwVXkXiNoPxvE2z5qs+nhZFZvzXpqXFwrEAl91kzRo29UGtAhfefoa rXLElJWw+7dXUHPRhCHbjt8g6OIy+AGBqAWDPwUXUyVY0omw2g928Yq26qnzKqQdLfJU yz5jLXg1RnTU9S5UllrubOb1GDiy41OwgqfKUhxSqDiw/uxqmmbZ1uxOx8B/1ON4NHDt wrAA== X-Gm-Message-State: AKGB3mKYj3AYH+Sn8Vl9WnZY7xdr4JWPshc5EC0UBOQpIJ1Kwe70Vcnh JeBOhzJdQ5HEEFLnSbTUxl/3csJMtWcyY1aj/5c6oJcL4ZiVF3sX8i4Va/NY5c8Hnvo/pk39FyK UXzTLeWWUvvPImXiRlXsLs9Q8iLngAazI+dyIH69+PZMUanDNt7eIdAYWI0CTvuNgMsRp MIME-Version: 1.0 X-Received: by 10.55.167.65 with SMTP id q62mr2494934qke.50.1512074160787; Thu, 30 Nov 2017 12:36:00 -0800 (PST) Date: Thu, 30 Nov 2017 12:35:50 -0800 Message-Id: <20171130203550.104038-1-modmaker@google.com> X-Mailer: git-send-email 2.15.0.531.g2ccb3012c9-goog From: Jacob Trimble To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] avcodec/nvdec: Fix capability check with old drivers. 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: Jacob Trimble Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Copied the check from cuviddec.c (*_cuvid decoders) to allow the capability check to be optional for older drivers. Signed-off-by: Jacob Trimble --- libavcodec/nvdec.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c index c7a02ff40f..e9e6ea0f8b 100644 --- a/libavcodec/nvdec.c +++ b/libavcodec/nvdec.c @@ -91,6 +91,18 @@ static int nvdec_test_capabilities(NVDECDecoder *decoder, caps.eChromaFormat = params->ChromaFormat; caps.nBitDepthMinus8 = params->bitDepthMinus8; + if (!decoder->cvdl->cuvidGetDecoderCaps) { + av_log(logctx, AV_LOG_WARNING, "Used Nvidia driver is too old to perform a capability check.\n"); + av_log(logctx, AV_LOG_WARNING, "The minimum required version is " +#if defined(_WIN32) || defined(__CYGWIN__) + "378.66" +#else + "378.13" +#endif + ". Continuing blind.\n"); + return 0; + } + err = decoder->cvdl->cuvidGetDecoderCaps(&caps); if (err != CUDA_SUCCESS) { av_log(logctx, AV_LOG_ERROR, "Failed querying decoder capabilities\n");