From patchwork Wed Jul 15 14:34:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Bin X-Patchwork-Id: 21041 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 C371744A854 for ; Wed, 15 Jul 2020 17:56:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A06BF68AFE9; Wed, 15 Jul 2020 17:56:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f194.google.com (mail-il1-f194.google.com [209.85.166.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A42DD68819B for ; Wed, 15 Jul 2020 17:56:45 +0300 (EEST) Received: by mail-il1-f194.google.com with SMTP id p15so2181666ilh.13 for ; Wed, 15 Jul 2020 07:56:45 -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=yWp/bWXTzPTeIRWuEppwwbf45z++CtyZo91nZdZsHrI=; b=d1g2FysZPhf14Md9PvWXEP43Iwy+chbZO0NnakcNIvJgq+Ta/uVRVIdsbTVrUqD371 1ViUWO7dmwzMwP404C3rcFkRmuyl5D/0A/q71YtogpDFYBHTw7AN7bs0dh/0F9uaBzvb kVxMv6RIvzcDWKCXNh4KueKTI86S/Xdpn75Y6WvsZCKjtwR0RAjuc2d5fKSlAzCfVtFI W++PWaEdKxOZl0ZmQAF6ouUxkC4OOY0jRiSd3PkJ/s0gzDf89gSxWeggjBAsjX5iH0il wqbSf1nfCbyoQa2OXPlzhX4eZ8cDJKCYXdjlPZ60J2JeYr5dBFT1yVtXDOdVmgDRlARy VlQQ== 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=yWp/bWXTzPTeIRWuEppwwbf45z++CtyZo91nZdZsHrI=; b=mqcrQLywF0xFlPKS/fldkuLP7qLEWPatbOXsgC0y8SM/iWZxArQj+WQQSsOcPqKPlY L5AKSDEVc80fIuuuBrMT4h9XhKnEP0r/8+N0znfTeu5L/8ZKzGwly5NW4XCzH3OFWYKs kwYsNiU13Vw95dQVQujh7dyDoARtZm7djSiMYlMRA22PAwXGvC+W0UMN1bd6u3+bOQgf PcB5M4kaeJjUR+DEaxzJ0cQZChcIXklvwWoIbGbT3K0OYmQaL9KE+DjSrPOg5joQB5MI SOjDcOb7ChzvrPlRXxyWqvJ5qKiDvDFvKD7c4NB0+tzfxJIEdNd0OqDEpXPADYbYQsQT R9Zg== X-Gm-Message-State: AOAM530TBHkxCn8A6D4KGNhW5nhFd0/FZcJZ2jtypVuYlN51XGvvfGNX 2YpWBQiJotZJKzM36+ePMrNo1Ed+AQ== X-Google-Smtp-Source: ABdhPJzVsq1wgCgbdBaN5z1QQ9lN7t7qj6BgzU/Z9ZTmtH4lY9XYzv9c5jvD+cXFkeuLl+nS31zTNQ== X-Received: by 2002:a63:182:: with SMTP id 124mr25441pgb.288.1594823687185; Wed, 15 Jul 2020 07:34:47 -0700 (PDT) Received: from localhost.localdomain ([107.181.229.172]) by smtp.gmail.com with ESMTPSA id f207sm2454295pfa.107.2020.07.15.07.34.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jul 2020 07:34:46 -0700 (PDT) From: wangbin To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Jul 2020 22:34:02 +0800 Message-Id: <20200715143402.18582-3-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 3/3] nvenc: check sdk 10.0 ptrs at runtime 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 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index cec59f02f3..c421c292c8 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1248,11 +1248,12 @@ static av_cold int nvenc_setup_encoder(AVCodecContext *avctx) #ifdef NVENC_HAVE_NEW_PRESETS ctx->init_encode_params.tuningInfo = ctx->tuning_info; - nv_status = p_nvenc->nvEncGetEncodePresetConfigEx(ctx->nvencoder, - ctx->init_encode_params.encodeGUID, - ctx->init_encode_params.presetGUID, - ctx->init_encode_params.tuningInfo, - &preset_config); + if (p_nvenc->nvEncGetEncodePresetConfigEx) + nv_status = p_nvenc->nvEncGetEncodePresetConfigEx(ctx->nvencoder, + ctx->init_encode_params.encodeGUID, + ctx->init_encode_params.presetGUID, + ctx->init_encode_params.tuningInfo, + &preset_config); #endif } else { #ifdef NVENC_HAVE_NEW_PRESETS