From patchwork Mon Nov 21 10:07:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Miroslav_Sluge=C5=88?= X-Patchwork-Id: 1505 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1500686vsb; Mon, 21 Nov 2016 02:07:20 -0800 (PST) X-Received: by 10.28.69.130 with SMTP id l2mr14563545wmi.123.1479722840817; Mon, 21 Nov 2016 02:07:20 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ye10si19321641wjb.105.2016.11.21.02.07.20; Mon, 21 Nov 2016 02:07:20 -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=@email.cz; dkim=neutral (body hash did not verify) header.i=@email.cz; 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 dis=NONE) header.from=email.cz Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0499C689A62; Mon, 21 Nov 2016 12:07:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mxs2.seznam.cz (mxs2.seznam.cz [77.75.76.125]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF49E689935 for ; Mon, 21 Nov 2016 12:07:08 +0200 (EET) Received: from email.seznam.cz by email-smtpc4a.ng.seznam.cz (email-smtpc4a.ng.seznam.cz [10.23.10.105]) id 14ed9131203a892d147fb83c; Mon, 21 Nov 2016 11:07:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=email.cz; s=beta; t=1479722831; bh=1+8TTaDiOV4/NuldHZPdeSUDz5hBaKqZRdvyK0mYEMo=; h=DKIM-Signature:Received:From:Subject:To:Message-ID:Date: User-Agent:MIME-Version:Content-Type; b=jMiSgajdaa6ztOXLGkWzw1zgY3BReObTMLXEs4x0eKLcw4NHanE+ZJarXd4nmM6/P aQf16Qk0WFMpE6+vDlvFosMZ5H1LzFs3aaTRFAMUmyGxRImEu3hJEt52TPvexJdTgA 5CYeAsDXxt19ayi68bOX5L0VJDz6HQwnBxe+pt4Q= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=email.cz; s=beta; t=1479722831; bh=1+8TTaDiOV4/NuldHZPdeSUDz5hBaKqZRdvyK0mYEMo=; h=Received:From:Subject:To:Message-ID:Date:User-Agent:MIME-Version: Content-Type; b=h20d9qzOR+DA4fg+LW7ibXBWv7asKhHiGeFgNh1BU8hd+9gaHujOU8AF4N93jdlee T+NoliSw7ct17jUSsQMBzD3HdHC0oPSu+uD3ObJ6+M62HvCBXk+IXT1FtLZ2wSkRV/ E/x8MJAD6+tjb1KJMU87MBInuuR5hhqp6cjYaH94= Received: from [192.168.0.6] (ip-94-113-140-7.net.upcbroadband.cz [94.113.140.7]) by email-relay6.ng.seznam.cz (Seznam SMTPD 1.3.39) with ESMTP; Mon, 21 Nov 2016 11:07:10 +0100 (CET) From: =?UTF-8?Q?Miroslav_Sluge=c5=88?= To: ffmpeg-devel@ffmpeg.org Message-ID: <5832C74D.2010509@email.cz> Date: Mon, 21 Nov 2016 11:07:09 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] NVENC: Maximum usable surfaces is limited to maximum registered frames 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Maximum usable surfaces is limited to MAX_REGISTERED_FRAMES constant in nvenc.h From 96b28516942d76b65e9dce033317909e4c0e019a Mon Sep 17 00:00:00 2001 From: Miroslav Slugen Date: Mon, 21 Nov 2016 11:04:45 +0100 Subject: [PATCH] NVENC: Maximum usable surfaces is limited to maximum registered frames --- libavcodec/nvenc_h264.c | 2 +- libavcodec/nvenc_hevc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index 6914046b..71e27fd 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -80,7 +80,7 @@ static const AVOption options[] = { { "vbr_2pass", "Multi-pass variable bitrate mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_2_PASS_VBR }, 0, 0, VE, "rc" }, { "rc-lookahead", "Number of frames to look ahead for rate-control", OFFSET(rc_lookahead), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, VE }, - { "surfaces", "Number of concurrent surfaces", OFFSET(nb_surfaces), AV_OPT_TYPE_INT, { .i64 = 32 }, 0, INT_MAX, VE }, + { "surfaces", "Number of concurrent surfaces", OFFSET(nb_surfaces), AV_OPT_TYPE_INT, { .i64 = 32 }, 0, MAX_REGISTERED_FRAMES, VE }, { "cbr", "Use cbr encoding mode", OFFSET(cbr), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "2pass", "Use 2pass encoding mode", OFFSET(twopass), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VE }, { "gpu", "Selects which NVENC capable GPU to use. First GPU is 0, second is 1, and so on.", diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index 0fec77a..ef739b6 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -79,7 +79,7 @@ static const AVOption options[] = { { "vbr_2pass", "Multi-pass variable bitrate mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_2_PASS_VBR }, 0, 0, VE, "rc" }, { "rc-lookahead", "Number of frames to look ahead for rate-control", OFFSET(rc_lookahead), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, VE }, - { "surfaces", "Number of concurrent surfaces", OFFSET(nb_surfaces), AV_OPT_TYPE_INT, { .i64 = 32 }, 0, INT_MAX, VE }, + { "surfaces", "Number of concurrent surfaces", OFFSET(nb_surfaces), AV_OPT_TYPE_INT, { .i64 = 32 }, 0, MAX_REGISTERED_FRAMES, VE }, { "cbr", "Use cbr encoding mode", OFFSET(cbr), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "2pass", "Use 2pass encoding mode", OFFSET(twopass), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VE }, { "gpu", "Selects which NVENC capable GPU to use. First GPU is 0, second is 1, and so on.", -- 2.1.4