From patchwork Wed Jul 15 14:34:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Bin X-Patchwork-Id: 21040 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3749D44A6D2 for ; Wed, 15 Jul 2020 17:41:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 07BB168B414; Wed, 15 Jul 2020 17:41:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6170868826C for ; Wed, 15 Jul 2020 17:41:40 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id j20so2189247pfe.5 for ; Wed, 15 Jul 2020 07:41:40 -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 :mime-version:content-transfer-encoding; bh=G0/fwBphF/xkHqBti6+QH/fv9JAUx1rc5XL5mQaKaEE=; b=K7H0Amegq+y9KSP375XEh08kE5c10h5u6w4ip3GmEsoDoLxtmrJ2C6hMv+ugSOGvZF KGJE4Q377R0u7e9WTsxpMZopbUcpHRlLZo+TpW0E+vS96q5gD5UKb8Jm3wCfu/DpquwK XHqSGgRn5/2osa1RwI/xWF8415qrZ7+s6b1A8iKRcOoEyLjril8RjWvZkcGo0DKX4USH O/NIi/680dzuCU3/zPp7A3lv7JI4YmAw+KFNpotLh57uQDt7wijTIk9BKJApzlx1WYrO /R4ryHtbuuNx6fm8pM6cdgd/EqiMZnwFrY5I48rJJqujB/dEn/UKO7Q986jsdxhkNC1a uDVA== 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:mime-version:content-transfer-encoding; bh=G0/fwBphF/xkHqBti6+QH/fv9JAUx1rc5XL5mQaKaEE=; b=NOLZ+aMwSVY6EjcxqmDZd9kZn3UaAGqvEMJ7bHs1sLzY+CTo5Gb9BDfgajRS/jUxuH 97FoiXCPQPeMWvDoOHPrBpoQFRTUGQxYTmmuLZALhQ0y+9OU40+y8AYrX3mPRbn+fpEB 74oPRRzaxlvC+7rIsa50n2twHKfso7LmjiKeHwr8CktcooQtBO+At/v5+13xx9nCrZXp 2iiNyQ1JeNmQ2p3YIaWQMF0g/IzcPZnvpHXImNVewdZ8gd9mxCgeByn1x7wNGIdH3B/i DuM0kpFC5DJxvP0PdYCJi9/GhmVYixDR47y8fAguCa/dsJiXeeUblzF36fiRH/igzQ4g GEvA== X-Gm-Message-State: AOAM531owRoYWK5gb9bH98/YTyvYR68O9Kl2SpQ4p0Dnd/M4YpmRDfmY o0HuB0tvu1FMSYlJ8sopIo4nlAnnYg== X-Google-Smtp-Source: ABdhPJxSGGlvmdFiDGXiBkHvVcwXYzSQN17TJKrWZO7NJu+rYgakwhKYUfBN/gV1AAwqrVmqrVcF/w== X-Received: by 2002:a65:6786:: with SMTP id e6mr8031625pgr.395.1594823684123; Wed, 15 Jul 2020 07:34:44 -0700 (PDT) Received: from localhost.localdomain ([107.181.229.172]) by smtp.gmail.com with ESMTPSA id f207sm2454295pfa.107.2020.07.15.07.34.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jul 2020 07:34:43 -0700 (PDT) From: wangbin To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Jul 2020 22:34:01 +0800 Message-Id: <20200715143402.18582-2-wbsecg1@gmail.com> X-Mailer: git-send-email 2.24.1 (Apple Git-126) In-Reply-To: <20200715143402.18582-1-wbsecg1@gmail.com> References: <20200715143402.18582-1-wbsecg1@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] nvenc: check runtime 9.1 function ptrs before use 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: wang-bin Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: wang-bin --- libavcodec/nvenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index ac35cb9f48..cec59f02f3 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -140,7 +140,7 @@ static int nvenc_print_error(AVCodecContext *avctx, NVENCSTATUS err, NvencContext *ctx = avctx->priv_data; NV_ENCODE_API_FUNCTION_LIST *p_nvenc = &ctx->nvenc_dload_funcs.nvenc_funcs; - if (p_nvenc && ctx->nvencoder) + if (p_nvenc && ctx->nvencoder && p_nvenc->nvEncGetLastErrorString) details = p_nvenc->nvEncGetLastErrorString(ctx->nvencoder); #endif @@ -1353,7 +1353,7 @@ static av_cold int nvenc_setup_encoder(AVCodecContext *avctx) } #ifdef NVENC_HAVE_CUSTREAM_PTR - if (ctx->cu_context) { + if (ctx->cu_context && p_nvenc->nvEncSetIOCudaStreams) { nv_status = p_nvenc->nvEncSetIOCudaStreams(ctx->nvencoder, &ctx->cu_stream, &ctx->cu_stream); if (nv_status != NV_ENC_SUCCESS) { nvenc_pop_context(avctx);