From patchwork Thu May 3 07:51:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pkv.stream" X-Patchwork-Id: 8761 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1505534jad; Thu, 3 May 2018 00:51:23 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpeZqj7Rm1bIAGilSwJtJ6Dx3P3EO5yUDmrEW2x2i3A0JUpahh3O3JmINH6DBa/CZsQ8vk4 X-Received: by 10.28.66.79 with SMTP id p76mr13184490wma.15.1525333883419; Thu, 03 May 2018 00:51:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525333883; cv=none; d=google.com; s=arc-20160816; b=I2zh3lyHDPRdlgxDuBYZArs3KThZ3fjubvrsoeK6i8RDbsu7DygXPicZRgYUMFW8ia KIOuaFtd3jNLVktpVf5tqjm0ofG0/8Ejt3qzefcOyCI4E1EEep3IL9Z98bQvz9ajFG5t uxZh2lT9/NIVbYIJmSCuwtT5Wq3N0/eQNOBPRS2vtlJ6z5FZiIVW8QimpNQgl12ikwQV N1rzl3R1Akaacu3EwhEBEMdLFj5/NhTq0BlQ673yTp8HsIFbIZaXPYUVCUJLIwlOdrnf 4XpIFLVLXIhvMawR8hCrEAgBXVgV3Y07mvBpU8ufLs2ogDnKXOkQGtyWcLVrihybFo6c FZrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:to:dkim-signature:delivered-to :arc-authentication-results; bh=sR9qd7zfExFtz++W9hcQEGS2Cxu60YMKH88cqmHoD5A=; b=uHxKgv1zVUbCdieb4rXuUGXlF2LYyJI/99X5pdOELnkBydo/+sRZ9lAZhc9VZ+hMG+ E86CWaFNy6RLcTAua8K2DVynHoqWHnzskQwUyp1R8WHLn5AZ/CkDcK2hT0zhJ6lCQAfs 9fnmiTUXnn8SEopxCQ3gb3teiJwHa7dqP3FCqy8tVM5GDv0dykAh8q9KMLHlndhs9bOt AgwwNvbKZ36Rt2PO+AnL8p9vzGlHtOcLJnihQHI2K9NOCQpQKsv0h5DWpnKH0XmThvhS 0jDpcr/jXRntNZG5FcCajjW6ASaaBN2xFgNp2RKtv6D0HsAXhd7xR0ESMqi4u9JyrKgt 3esA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=btwlfGMh; 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 k91-v6si11384711wrc.459.2018.05.03.00.51.22; Thu, 03 May 2018 00:51:23 -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=btwlfGMh; 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 3009C68A574; Thu, 3 May 2018 10:50:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f182.google.com (mail-wr0-f182.google.com [209.85.128.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C85E68A574 for ; Thu, 3 May 2018 10:50:41 +0300 (EEST) Received: by mail-wr0-f182.google.com with SMTP id v5-v6so16501232wrf.9 for ; Thu, 03 May 2018 00:51:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language; bh=xZ+wQTvsRvzWLaqN88Tuq6bYTe0P/y2yxZt4KsQppoA=; b=btwlfGMhw/cPkhbjOISYvcgQlFM94MDaeRJkBKFYh5Aa8Xd9FeP0gBg7Z2/Zt4eXVU pV1hkTwQCGDN7CX56PvELAXcWVeR7aWKr8OCwoed7FZ7Su+sPeOMr4ETOu0Pmx4SSsSY wTpxrERdu0avB+rKGrr3a07npyVilw1swdThxfzUSDWDncjzfpM1j64FxJLlqFQt1mKN H3KN0fVTjy84o96dYO+gk5CCB39qMQNh1eOI09V40yXVXOccpSMzU0wVtSAbNxgErFkH 3lB0cvU7DVG15Xst1QrtJWBdFlTr9TtK6NxU5vszaf9+x57rE+vaBmWojFt7adWiAiAs /JWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=xZ+wQTvsRvzWLaqN88Tuq6bYTe0P/y2yxZt4KsQppoA=; b=enmANOhcfD2IX/+KAhw/k2wvajNJXi1HwP62jNTV8o976BHm9tklSPvkBgBLzdABcJ tq1P+9fBvAP8itzvfEhg2cVvwfAIMDEHxpIOyCfT1tjlXZP9Y/iINLGh8mQ5uiWEswaQ nZR4vP0497hkTM3Jp0g4iIaENzf2mRjcro4Ydn8zKiw0NFO4ppxwPDbEH566v9qz7Wdh cSb2pBMvm1HOuFaskRfj/WmkiwsztAZ/WI+zmYgWntPZtRba8JMd7Xec/M3XL3DWiaSi MvyXR856ql4+gV8i/pjE5uJfZsB02H7K6K8k1CcJIOlBNL8OTVE9y/UbnJWCzS3j+YcN gayQ== X-Gm-Message-State: ALQs6tBl247PhhVwoGERu9K9JugXySceMEICwIMIiFI+PaOkdGwQHT4b jgmk2+JKwAEN4uTzrA+nbAcIyg== X-Received: by 2002:adf:aeea:: with SMTP id y97-v6mr18167913wrc.32.1525333873797; Thu, 03 May 2018 00:51:13 -0700 (PDT) Received: from [192.168.0.101] (176-159-7-188.abo.bbox.fr. [176.159.7.188]) by smtp.googlemail.com with ESMTPSA id v18-v6sm13978120wrf.76.2018.05.03.00.51.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 May 2018 00:51:13 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org References: <424831b2-1616-bbb8-cd76-60f6ff26b87b@gmail.com> <1e0bf32d-3110-9c5c-537f-c27facde19ca@rothenpieler.org> From: "pkv.stream" Message-ID: Date: Thu, 3 May 2018 09:51:05 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <1e0bf32d-3110-9c5c-537f-c27facde19ca@rothenpieler.org> Content-Language: fr Subject: [FFmpeg-devel] [PATCH v4]avocdec/nvenc: Reconfigure bitrate on the fly 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" Hi, in previous versions ReconfigureEncoder was called at each frame once bitrate was changed. Fixed that. The patch was rebased against https://github.com/BtbN/FFmpeg/commit/4e8265e3a63a71a40730e8eb575d8aa760bdcddc Sorry about the back and forth. Regards From 7c9653faabfe5a9413b2fdcdb7e218991c25ef46 Mon Sep 17 00:00:00 2001 From: pkviet Date: Thu, 3 May 2018 02:15:52 +0200 Subject: [PATCH] avcodec/nvenc: Change bitrate on the fly The patch enables dynamic bitrate through ReconfigureEncoder method from nvenc API. This is useful for live streaming in case of network congestion. Signed-off-by: pkviet --- libavcodec/nvenc.c | 38 ++++++++++++++++++++++++++++---------- libavcodec/nvenc.h | 1 + 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 3313c376fe..c19b600c4c 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -457,6 +457,8 @@ static av_cold int nvenc_check_device(AVCodecContext *avctx, int idx) if ((ret = nvenc_check_capabilities(avctx)) < 0) goto fail3; + ctx->dynamic_bitrate = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_DYN_BITRATE_CHANGE); + av_log(avctx, loglevel, "supports NVENC\n"); dl_fn->nvenc_device_count++; @@ -550,6 +552,8 @@ static av_cold int nvenc_setup_device(AVCodecContext *avctx) av_log(avctx, AV_LOG_FATAL, "Provided device doesn't support required NVENC features\n"); return ret; } + ctx->dynamic_bitrate = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_DYN_BITRATE_CHANGE); + } else { int i, nb_devices = 0; @@ -1935,36 +1939,50 @@ static int reconfig_encoder(AVCodecContext *avctx, const AVFrame *frame) NVENCSTATUS ret; NV_ENC_RECONFIGURE_PARAMS params = { 0 }; - int needs_reconfig = 0; - int needs_encode_config = 0; int dw, dh; + int reconfig_dar, reconfig_bitrate; params.version = NV_ENC_RECONFIGURE_PARAMS_VER; params.reInitEncodeParams = ctx->init_encode_params; compute_dar(avctx, &dw, &dh); - if (dw != ctx->init_encode_params.darWidth || dh != ctx->init_encode_params.darHeight) { + reconfig_dar = dw != ctx->init_encode_params.darWidth || dh != ctx->init_encode_params.darHeight; + if (reconfig_dar) { av_log(avctx, AV_LOG_VERBOSE, "aspect ratio change (DAR): %d:%d -> %d:%d\n", ctx->init_encode_params.darWidth, ctx->init_encode_params.darHeight, dw, dh); - params.reInitEncodeParams.darHeight = dh; params.reInitEncodeParams.darWidth = dw; - - needs_reconfig = 1; + } + reconfig_bitrate = ctx->dynamic_bitrate > 0 && ctx->rc != NV_ENC_PARAMS_RC_CONSTQP + && ctx->encode_config.rcParams.averageBitRate != avctx->bit_rate; + if (reconfig_bitrate) { + params.version = NV_ENC_RECONFIGURE_PARAMS_VER; + params.resetEncoder = 1; + params.forceIDR = 1; + params.reInitEncodeParams = ctx->init_encode_params; + params.reInitEncodeParams.encodeConfig->rcParams.averageBitRate = avctx->bit_rate; } - if (!needs_encode_config) + if (!reconfig_bitrate) params.reInitEncodeParams.encodeConfig = NULL; - if (needs_reconfig) { + if (reconfig_dar || reconfig_bitrate) { ret = p_nvenc->nvEncReconfigureEncoder(ctx->nvencoder, ¶ms); if (ret != NV_ENC_SUCCESS) { nvenc_print_error(avctx, ret, "failed to reconfigure nvenc"); } else { - ctx->init_encode_params.darHeight = dh; - ctx->init_encode_params.darWidth = dw; + if (reconfig_dar) { + ctx->init_encode_params.darHeight = dh; + ctx->init_encode_params.darWidth = dw; + av_log(avctx, AV_LOG_VERBOSE, "dar reconfigured\n"); + } + if (reconfig_bitrate) { + ctx->encode_config.rcParams.averageBitRate = avctx->bit_rate; + av_log(avctx, AV_LOG_VERBOSE, "bitrate reconfigured\n"); + } + } } diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index c7506d6a15..fd2350aaa6 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -184,6 +184,7 @@ typedef struct NvencContext int weighted_pred; int coder; int b_ref_mode; + int dynamic_bitrate; } NvencContext; int ff_nvenc_encode_init(AVCodecContext *avctx);