From patchwork Sat Nov 3 02:52:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 10907 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 8A5F744E011 for ; Sat, 3 Nov 2018 04:52:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0821168A962; Sat, 3 Nov 2018 04:52:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D16768A8BB for ; Sat, 3 Nov 2018 04:51:59 +0200 (EET) Received: by mail-pl1-f195.google.com with SMTP id f12-v6so627735plo.1 for ; Fri, 02 Nov 2018 19:52:32 -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:in-reply-to:references; bh=Mo9nyl+1HrbBOuKn8SVPZg9TlyOISu434ajOqr69sxw=; b=Da5mX82CgVjo3if+6oNQ2hjKxyw1W2c1/FkicTBKyV/AylwnlJocAwfifrLsepj13V n/PCNefaIMK8+zFMcLDLZQiComgVpNNRbkGf2TTlPugDr91/fyrqMlKdYaid+2zPtpfT TKjLq0x82SAq3uHpFzunmuZnfRe+tA7Z+d2F9UJk98iAVJS+wehUhpqJ9w3k7cnICTyR FUZpzOlzlaT/ST4VO1lHXuB+F+JG3FrJO9c6vnRF0tKFlEmM57rsUSrFPjTtDctl0ymw KsXIC797yynrA2wqpmvOeebEuZ7c4LtZb+HIoVqW7hi0Gltvy1FBPZtjq77sDP1cdfaq 8TWA== 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:in-reply-to :references; bh=Mo9nyl+1HrbBOuKn8SVPZg9TlyOISu434ajOqr69sxw=; b=KtEIhnftQL4kP5QJwJzgGLtx03Z7oR9e0T+jZ/+CMZPRR1BPPcCKFjtjiiIplb3RFM KG4+uKd5ep4qvvKqHiNowLymu3ONvnav1GYMQfwEAbYuyRyavRI3uATuf5IED9m5kAlu pH78tfCHUEx+PiPkr71HXKxQSAOM/SukDGJ3+6LQbbMbszGa8e6dkA/E54a6rCWYTIRe Fy9weVyW2FyzpVTBfyQeF7s+Kayq5OyAWiNanaFjE/kMRm8hFrxc9CtD7S6cOh9QEhGl VG8UWHAZ1M7XTpZ860Zzl/9IYSF7y7RqJOF/krYvtQtz4SI1lwN1dsXRI7GcWy7oEFOt 4qew== X-Gm-Message-State: AGRZ1gKBLZarn1vnrB7oJgXBHve4sTIcoxRG6yz2tGoP4547dxJ5Y9S/ gRLzzkL6neWnrD+x+N4QM9dnER7r X-Google-Smtp-Source: AJdET5faO5BAJKsnkWaEPe1O+o7qDuDXyGmQgv56qZImhWJKy5ODa+B2eK528ivF4XOlDfdZfZhf+w== X-Received: by 2002:a17:902:da8:: with SMTP id 37-v6mr14085982plv.12.1541213550809; Fri, 02 Nov 2018 19:52:30 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id e127-v6sm33803195pfe.142.2018.11.02.19.52.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 19:52:29 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Nov 2018 10:52:07 +0800 Message-Id: <1541213532-23882-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1541213532-23882-1-git-send-email-mypopydev@gmail.com> References: <1541213532-23882-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/7] lavc/vaapi_encode_h264: Enable macro block level bit rate control. 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: Jun Zhao , Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Enables macro block level bit rate control, that generally improves subjective visual quality. It may have a negative impact on performance and objective visual quality metrics. Default is off and can't compatible with Constant QP. Signed-off-by: Jun Zhao --- libavcodec/vaapi_encode_h264.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 7bb77cf..060277b 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -58,6 +58,7 @@ typedef struct VAAPIEncodeH264Context { int sei; int profile; int level; + int mb_rate_control; // Derived settings. int mb_width; @@ -889,6 +890,22 @@ static av_cold int vaapi_encode_h264_configure(AVCodecContext *avctx) return 0; } +static av_cold int vaapi_encode_h264_bit_rate_control(AVCodecContext *avctx) +{ + VAAPIEncodeContext *ctx = avctx->priv_data; + VAAPIEncodeH264Context *priv = avctx->priv_data; + + if (priv->mb_rate_control) { + #if VA_CHECK_VERSION(0, 39, 2) + ctx->rc_params.rc.rc_flags.bits.mb_rate_control = priv->mb_rate_control; + #else + av_log(avctx, AV_LOG_WARNING, "The MB rate control option is not " + "supported with this VAAPI version.\n"); + #endif + } + return 0; +} + static const VAAPIEncodeProfile vaapi_encode_h264_profiles[] = { { FF_PROFILE_H264_HIGH, 8, 3, 1, 1, VAProfileH264High }, { FF_PROFILE_H264_MAIN, 8, 3, 1, 1, VAProfileH264Main }, @@ -904,6 +921,8 @@ static const VAAPIEncodeType vaapi_encode_type_h264 = { .configure = &vaapi_encode_h264_configure, + .bit_rate_control = &vaapi_encode_h264_bit_rate_control, + .sequence_params_size = sizeof(VAEncSequenceParameterBufferH264), .init_sequence_params = &vaapi_encode_h264_init_sequence_params, @@ -1001,6 +1020,8 @@ static const AVOption vaapi_encode_h264_options[] = { OFFSET(qp), AV_OPT_TYPE_INT, { .i64 = 20 }, 0, 52, FLAGS }, { "quality", "Set encode quality (trades off against speed, higher is faster)", OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS }, + { "mb_rate_control", "MB level bitrate control (only supported on GEN9+)", + OFFSET(mb_rate_control), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS, "mb_rate_control" }, { "coder", "Entropy coder type", OFFSET(coder), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, FLAGS, "coder" }, { "cavlc", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, FLAGS, "coder" },