From patchwork Mon Jun 1 18:05:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Koshevoy X-Patchwork-Id: 20066 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 250EB44B43B for ; Mon, 1 Jun 2020 21:05:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E135687FAA; Mon, 1 Jun 2020 21:05:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 672D368096E for ; Mon, 1 Jun 2020 21:05:39 +0300 (EEST) Received: by mail-pl1-f174.google.com with SMTP id y17so257551plb.8 for ; Mon, 01 Jun 2020 11:05:39 -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:mime-version :content-transfer-encoding; bh=fbrZVNekgHDIro1GZZQXcJ3HcxKXcxBAU+Bn0APJmX4=; b=L599IlIsaJ0/Itujsa5Z7Nl66FXkC/9Wh2xaYFPBEZEsMLS+bgm/97ZXnjS1O6qvZk bvI7rWIHFiOKweLQQEzN3LHCWoEssPHPAh4aJ39f4LtNngdzCPHOZZ/PZenq6uZarMQq m3XSrjcQF1YlaIe2NZqXoH3mov5h5dxzhvoSuYBNFZEgxrQ5bKbpeqDt6CGQvzGAKgAb iH1mRcyf2rI2Md/J3xeLs6XYuhQU73WS2YQ58gjRk+n0gHAjViWArddYZ6o9SBp86JWU 88QYdQsS/9RRsRrl8gpOMFnULNDbnYfQXmA0iDkG/QiUL/djhtmoxJcp3e0GaQN+lu6I /UNw== 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:mime-version :content-transfer-encoding; bh=fbrZVNekgHDIro1GZZQXcJ3HcxKXcxBAU+Bn0APJmX4=; b=h9AEWJ2KIikI5AMDpG2nw5xHZv6j4tBmZUkDY8vsO5AKEYhyCzR9I7VjTJVw1uhbcH HrAfYSDQiz0ewGXJrPIYhm18cg3YGZrlz6pouy6vlhFhQIlF2VQkHIhxo9QUBrkunHBk 6BU+JeRrqe4uDdC1XOqQ3uCbgtHlcqCnsHHBe7VtDr42rieGEwUqtfKBdg3vWrUiPguR /r76yeOaDgdg2vJ2Ux4AFu5KcP37KAsZ5gB7LFi/vUHgdfOnaF+zrEQo5pFAo0i6ViuW UXn606QcMITgLPTHUt1VYKnRErrYpKE7M8n4Bb+23iS0B5rUjeuAkVF8dyUH42s2TxZi S2iA== X-Gm-Message-State: AOAM531LI1lf+a3NQp+HfWTo6X+M9TBL6OW/YNcE3RB/HAE+T4fWKsmq CzYitcV4ECWO7ccYBB7Xy2em05dROsw= X-Google-Smtp-Source: ABdhPJzqUTR3Pgix5e74Tm785Z1PvGQtI5DZX/WDMnclrHdBA4oDAmGFbr+s2HqGKngzmkcT28f0+A== X-Received: by 2002:a17:902:eb03:: with SMTP id l3mr19804258plb.49.1591034736939; Mon, 01 Jun 2020 11:05:36 -0700 (PDT) Received: from homestead.aragog.com ([2605:a601:a9ae:9100:b62e:99ff:fe37:7032]) by smtp.gmail.com with ESMTPSA id hi19sm101101pjb.49.2020.06.01.11.05.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Jun 2020 11:05:36 -0700 (PDT) From: Pavel Koshevoy To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Jun 2020 12:05:31 -0600 Message-Id: <20200601180531.20595-1-pkoshevoy@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/nvenc: disable FMO unconditionally... 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" because ff_h264_decode_picture_parameter_set doesn't support FMO --- libavcodec/nvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index cbdddd33f9..c21c6dc567 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -997,12 +997,12 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx) } h264->outputPictureTimingSEI = 1; + h264->fmoMode = NV_ENC_H264_FMO_DISABLE; if (cc->rcParams.rateControlMode == NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ || cc->rcParams.rateControlMode == NV_ENC_PARAMS_RC_CBR_HQ || cc->rcParams.rateControlMode == NV_ENC_PARAMS_RC_VBR_HQ) { h264->adaptiveTransformMode = NV_ENC_H264_ADAPTIVE_TRANSFORM_ENABLE; - h264->fmoMode = NV_ENC_H264_FMO_DISABLE; } if (ctx->flags & NVENC_LOSSLESS) {