From patchwork Thu Jun 7 04:38:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Koshevoy X-Patchwork-Id: 9276 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp1651009jad; Wed, 6 Jun 2018 21:38:43 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLACi+4Q9GJorcixAnNqD0NztgYFCn5L195YiGYCSwUIUwwnvqOOzy72BTFTmpAgaKyhwti X-Received: by 2002:a1c:c687:: with SMTP id w129-v6mr404576wmf.66.1528346322992; Wed, 06 Jun 2018 21:38:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528346322; cv=none; d=google.com; s=arc-20160816; b=X4KaunYVJ7Adi0NDZ13wYkZElfPwcCcLDIAp7XtpqatPQRnhivtrme5iAAmd8sZVln QZU3fKDrc7QwJEcUZVgwiVNp2EvPosnnpv/I2v1miW+Z8RlaiJT65rhaU1s8KxD8kszI 0PDmMAZvOul5cGKCx/L/bcUXdQmeMediRnfA1iLb880sn+YUp+UeoI8eczJ95jju/2xp etw06/G7NdkQvamSTjF52+zfwEXLH1WnuKF3Ei3tC5psUhPjEE1nqQ2a+q8y+53wlUYu DvQ7ElVAi7u/sEH8id6rf+lMExzYHtXJy+q8IFqJ6rMp6/b7B7F3axu7ZArcHdGJAaNn NsMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=GyVDH1Phn8E3EWhsruvijkr/o66H4t6nSQ2OHf4RQEE=; b=NGlJo5crt1TjvZagDo/cNBW/m1YhJeN+zddr56AkApAoiGdNnaHw+uBWqTFKO05use cbCQCvLQIAnQWVdLTQzZbUAmUNRJjUt6Qd6eXB4AteS4p04tUwEGwyP+FNxekWiKjzwt 8vij9wOkSQpkzblf6gmyjbIG+RuYjrzSc7blYK5PSO+sXWYIoAzB5Zkml5befQTRWpCv Q4RWZbHKhkBzC6Dpa+3TwUcHeFEVxIXMKWp6j7VfaKLdjd/KBFnyhGPRdCwDBwZGekVA WTz3u9uH9Mr2P1IarawrHk0VrH07WZeb6+rTHwGYwUxKdc4SdLS2BD1MVugn68Ow1AOd bofA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=n4LUScYu; 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 e9-v6si32900256wrg.249.2018.06.06.21.38.42; Wed, 06 Jun 2018 21:38:42 -0700 (PDT) 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=20161025 header.b=n4LUScYu; 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 45F5168A6CB; Thu, 7 Jun 2018 07:37:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f42.google.com (mail-pl0-f42.google.com [209.85.160.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 90F7E68A590 for ; Thu, 7 Jun 2018 07:37:46 +0300 (EEST) Received: by mail-pl0-f42.google.com with SMTP id c41-v6so5230758plj.10 for ; Wed, 06 Jun 2018 21:38:34 -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; bh=2gm5tn3jFI1LYKGx89h0P8xLbGXpEVWBoMUQ4r+Vi0I=; b=n4LUScYuSljP35QSsuqJWXvmuivBjrkaLy9YURGGdEU75kg5ADUKeJAPzJ5PfH/Wwu P72tvqtwkkIY06qKg7LUSHwI6S3/198QCWPekt+7WyOemkmlAE40bu7iR1WUH9QnRJNU Wu2uPo2p8u4g6z0tdvxiu7Ab5Rifqz9Bvl7s4a218Hcwlyhze5yxKNBFy8KnqFMe4JOA eS8UeGPILVaMU64odU2ZeK2HHXSzb9utNxPAkK13kl7+q45Tj8GvwiG+gTvo0M7AJAIM MZJPvinbwwOlOMHVYIkMugGUmyyMcfVd5rC0KYoUDlEdFFBbzijbR6WxCscG5hmaxIzI HYzQ== 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; bh=2gm5tn3jFI1LYKGx89h0P8xLbGXpEVWBoMUQ4r+Vi0I=; b=EIq+N3Kg+35rTY+9Ej54FGEx7utRDGwhgYPeiEocDJRBN5wZC9ts8l37q3B4blYIoW HinQANdoXa5gaKyLY5HjdBrveiSD/dTeav54uPE0QS0gQejhTDgiloRxC0g51Qem56oP XU0oXGhd7z2agUZGquTS96F7l+fA3sGf4JX2SPB7S6SYxtT4EbUj+Eu09fSI+NqG5pxX qhLlqTSze6uGh+EgDYzKzPIc/j7E+ISKGmiYttp0yQPqsN3W86GINIBYeRim5Fwf8GjO eciBWfDfWUMWHWNPcvJd0tk/YLqb9QQmlEKF2n4MZRBZ9PGJZccotu7qK+ZMZ273+JU4 LqjA== X-Gm-Message-State: APt69E0FjtA7HyvuKJLw6Q6qRFIYJS4THLfDxuPLI+P+yhViGtd/QiC2 IkzRGyG22HyoTLuosmRhT8cC+g== X-Received: by 2002:a17:902:e85:: with SMTP id 5-v6mr383138plx.318.1528346311488; Wed, 06 Jun 2018 21:38:31 -0700 (PDT) Received: from homestead.aragog.com ([2605:a601:31e0:603:12c3:7bff:fe6c:2700]) by smtp.gmail.com with ESMTPSA id u47-v6sm54880783pgn.70.2018.06.06.21.38.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Jun 2018 21:38:30 -0700 (PDT) From: Pavel Koshevoy To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Jun 2018 22:38:28 -0600 Message-Id: <20180607043828.16001-1-pkoshevoy@gmail.com> X-Mailer: git-send-email 2.16.4 Subject: [FFmpeg-devel] [PATCH] lavc/nvenc: enable nvenc encoder instance reuse after draining 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: Pavel Koshevoy MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/nvenc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index b4186c0bec..8928eacc70 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -2181,6 +2181,12 @@ int ff_nvenc_receive_packet(AVCodecContext *avctx, AVPacket *pkt) av_fifo_generic_write(ctx->unused_surface_queue, &tmp_out_surf, sizeof(tmp_out_surf), NULL); } else if (ctx->encoder_flushing) { + /* reset to initial state so the encoder can be re-used */ + ctx->encoder_flushing = 0; + ctx->first_packet_output = 0; + ctx->initial_pts[0] = AV_NOPTS_VALUE; + ctx->initial_pts[1] = AV_NOPTS_VALUE; + av_fifo_reset(ctx->timestamp_list); return AVERROR_EOF; } else { return AVERROR(EAGAIN);