From patchwork Sun Feb 12 17:13:13 2017 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: 2519 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp552827vsb; Sun, 12 Feb 2017 09:13:29 -0800 (PST) X-Received: by 10.28.28.143 with SMTP id c137mr14792837wmc.115.1486919609061; Sun, 12 Feb 2017 09:13:29 -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 w7si10403386wrb.207.2017.02.12.09.13.28; Sun, 12 Feb 2017 09:13:29 -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 sp=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 BA5E9689DD9; Sun, 12 Feb 2017 19:13:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mxf2.seznam.cz (mxf2.seznam.cz [77.75.76.123]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DAABB6899C1 for ; Sun, 12 Feb 2017 19:13:13 +0200 (EET) Received: from email.seznam.cz by email-smtpc9a.ng.seznam.cz (email-smtpc9a.ng.seznam.cz [10.23.11.15]) id 4f6ef7d07bb9efcc4ffcdedd; Sun, 12 Feb 2017 18:13:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=email.cz; s=beta; t=1486919597; bh=FraqGJD8M2WUhK9P8IQ4f7AVyb9OTC3OEctWgoax44Y=; h=DKIM-Signature:Received:From:Subject:To:Message-ID:Date: User-Agent:MIME-Version:Content-Type; b=Y71MbR8TJ4YHD7wgPb527nhMUF2UjcSJj6isthoqzxL4KIcGRsI5WywH8kraw/vTn Wlr7P3Lj+QYjWjqX/lCWKkMt83cAf1GtlpcY7JHHVuBbwiImXINQS5K7c4y1npL+sK bBtw/YdkbblV1kRW24A2xj21vDsKRai4uIp1tNLU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=email.cz; s=beta; t=1486919596; bh=FraqGJD8M2WUhK9P8IQ4f7AVyb9OTC3OEctWgoax44Y=; h=Received:From:Subject:To:Message-ID:Date:User-Agent:MIME-Version: Content-Type; b=OSbGVqWgt9G+ai7bSmRRDvvndROoWG2tzYTAXDXXXLM061VZQJJLRPYvw7nEmFwuR oSATxSKKMcNNObnDGl3zZEG5qxVH1rV6SqlRcHTc3iXpCbcXHT72Q7XR+1+sgPw+V1 fnRoIxF9bNrJp6XyTJc/sdKGzTjzIh7MuHhd8Qo0= Received: from [192.168.0.6] (ip-94-113-140-7.net.upcbroadband.cz [94.113.140.7]) by email-relay19.ng.seznam.cz (Seznam SMTPD 1.3.56) with ESMTP; Sun, 12 Feb 2017 18:13:14 +0100 (CET) From: =?UTF-8?Q?Miroslav_Sluge=c5=88?= To: ffmpeg-devel@ffmpeg.org Message-ID: <58A097A9.5010702@email.cz> Date: Sun, 12 Feb 2017 18:13:13 +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: FIX wrong forced keyframe behavior 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" There was error in forcing key frames. If IDR was set to -1 (default) forced key frame will be never propagated to encoder. I also suggest to backport this patch to current stable version, because -forced_keyframe behavior in NVENC is actualy broken. From 60a1efef9d4146f9ad38a779ebf05407c64e385d Mon Sep 17 00:00:00 2001 From: Miroslav Slugen Date: Sun, 12 Feb 2017 18:10:15 +0100 Subject: [PATCH 1/1] nvenc: fix wrong forced keyframe behavior --- libavcodec/nvenc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 7005465..20af109 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1687,9 +1687,10 @@ int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt, pic_params.pictureStruct = NV_ENC_PIC_STRUCT_FRAME; } - if (ctx->forced_idr >= 0 && frame->pict_type == AV_PICTURE_TYPE_I) { - pic_params.encodePicFlags = - ctx->forced_idr ? NV_ENC_PIC_FLAG_FORCEIDR : NV_ENC_PIC_FLAG_FORCEINTRA; + if (frame->pict_type == AV_PICTURE_TYPE_I) { + pic_params.encodePicFlags = ctx->forced_idr > 0 + ? NV_ENC_PIC_FLAG_FORCEIDR + : NV_ENC_PIC_FLAG_FORCEINTRA; } else { pic_params.encodePicFlags = 0; } -- 2.1.4