From patchwork Sun May 14 04:26:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 3669 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp956606vsd; Sat, 13 May 2017 21:33:59 -0700 (PDT) X-Received: by 10.223.147.228 with SMTP id 91mr7155475wrp.47.1494736439168; Sat, 13 May 2017 21:33:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494736439; cv=none; d=google.com; s=arc-20160816; b=F1eSgHDd0MkZHPyqEibgjtpdBFiGT60BBdvVl++HRY4rm3+8zE+a12fDCCttjoQVh7 q7pjdEttBRRRTqly0UxPgbYkSGcPz1DzzEXRT82CamHJnn44LBSbrMrRAhSwxLA9uZka wlUQ2wcrxDha9yThOicETcfCbat/+bOQEkSoMjocwcwa7L0E764p7apTeIDFt7yw+Iic Q72R4oDQ/EkXsNdBI8Ucor5IbI1wam9rheNRy7HBUpf9Ua1peGwcgmAFId2WepVvEi3L zT8MKF78iS2o9d/y+aUI7DhtZCTiCAQyM0NbvB4cBX1MqOUfQKKsHeXifezhvo8Y1prZ uyOQ== 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:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=XC7CpwjZ5Jff/5GYtkCl3STAas1gDhdxZktELGjhKQU=; b=Ee34ioHTsA5YGnkHpkjmz2ps4bTh0gAeUXLbvtTGPKSNOHtuflMU6Bz/zAfggW3Fc4 rIJlw8hjqfDb0616KJtVw9vP9WnAhlpBUIKGQNwD3fpn3MRS/+SaRT+tDKTlLtrriubd 65lT4pK43/JdYr9Y9lxS0HglB3fMibUktT1OmxEF5n40jkqrJhOKkofMCZVt2I9t7hiA Z5g4aHcBLaN2fTLjD8touuIHcVxVgQ6pQawQNG5+jYr/M+MOhZp0Pzlk1sOzZBGLrWib kPzA1x2n526eXCR+PFgMsE8621V53xbefEaF9u3VT/0HOfEx+P4q5SE3/lSPH3Qpry32 DA+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; 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=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 u21si8922418wru.154.2017.05.13.21.33.58; Sat, 13 May 2017 21:33:59 -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; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 29FD6689812; Sun, 14 May 2017 07:33:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 158BA68833F for ; Sun, 14 May 2017 07:33:40 +0300 (EEST) Received: by mail-pf0-f194.google.com with SMTP id n23so10493159pfb.3 for ; Sat, 13 May 2017 21:33:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=tbk2TXpYGzKE2fOSPO1G3/wgSiOrxZBLokOsX06jaeE=; b=E6y/n5HYbo6MIbZcuICEtLEouFkGj5iEZpt8wTjNpg5lT82FtZTnMUvTcfVrvrI9lv Z4AHlXRNLKe8trywIwi9Vd2DbY80xisP5cVsOTrLdYCdpgK08vzd/7cH9Lflo3PJ0ybq oGSXtVkCrIo8nnSkvUSrB3jn0LLswr4DPeqLW58GMWjUVoPEk1mKgS90OZF9hq2cemSe oMCwwknqLNQKyo9inOktqu3besLv3Wri/o8FrwnfD0e8VeILrJBLRbYCXoT8C0qIDtWy fIsN2I8FN1VelgHBQlrUWBot72SfyYuTP1xikAaumYakof/X4oWzNouMg7/MvqftWHBd fwVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=tbk2TXpYGzKE2fOSPO1G3/wgSiOrxZBLokOsX06jaeE=; b=pb9i9wilW8kvHbpNDHEMvGOF0VqMDfJIL4EGdCqd5+TAZ7vsschPyzuou35UUGoju+ rJoFUheoMi7rxJQrzcpcqH69hYkbJdloLZWb3m9/YJoTGgVW4ptNtOY2n0gc7b1fkmOy YjWp8kcRh9BKhkZwabUmGbY6QCNW4qojQ3qmiREGmr66HjaBU0iH+GtLsAVaGJKtstgb EBotwGixKn45IuzUrjKiLIpIMqSTbCmLMInYQiwvGOlHOJJaFNUPkkkhahsQtGXfJSfu X/epVp0zshy4npyeMyJciSeSolz31SHlnaxMwoeUjP/gEEHxXts6XyIvjERqtCQDvLMe 3yFQ== X-Gm-Message-State: AODbwcDOO/QyOFuP+jadNyzJj32qcIhJfZRSj+j8oDp52qiAQ3claQRO xLBPOeZ3uFrYdA== X-Received: by 10.84.247.23 with SMTP id n23mr15808016pll.119.1494735997833; Sat, 13 May 2017 21:26:37 -0700 (PDT) Received: from [10.239.205.153] ([192.55.54.45]) by smtp.gmail.com with ESMTPSA id p3sm12376019pgd.36.2017.05.13.21.26.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 May 2017 21:26:36 -0700 (PDT) To: Mark Thompson , Michael Niedermayer , FFmpeg development discussions and patches From: Jun Zhao Message-ID: Date: Sun, 14 May 2017 12:26:33 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.1.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH V3] lavc/vaapi_encode_h264: Enable MB 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" V3: - Fix build error with old VAAPI version. V2: - Refine the name/value type to mb_rate_control/bool. - Only supported GEN9+ (SKL/APL/KBL/...) - i965 driver default use frame-level rate control algorithm (generate the QP for each frame), when enable mb_rate_control, it's will enable the MB-level RC algorithm (generate the QP for each MB). - enables MB-level bitrate control that generally improves subjective visual quality, but have negative impact on performance and objective visual quality metric. From 219b06cec04a6c3f719ce80084a98b19456498e0 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Tue, 9 May 2017 08:19:16 +0800 Subject: [PATCH V3] lavc/vaapi_encode_h264: Enable MB rate control. Enables macroblock-level bitrate 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 | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 92e29554ed..44223ada55 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -168,6 +168,7 @@ typedef struct VAAPIEncodeH264Options { int qp; int quality; int low_power; + int mb_rate_control; } VAAPIEncodeH264Options; @@ -1133,8 +1134,22 @@ static av_cold int vaapi_encode_h264_configure(AVCodecContext *avctx) priv->fixed_qp_p = 26; priv->fixed_qp_b = 26; - av_log(avctx, AV_LOG_DEBUG, "Using %s-bitrate = %"PRId64" bps.\n", + if (opt->mb_rate_control) { +#if VA_CHECK_VERSION(0, 39, 2) + ctx->rc_params.rc.rc_flags.bits.mb_rate_control = opt->mb_rate_control; +#else + av_log(avctx, AV_LOG_WARNING, "The MB rate control option is not " + "supported with this VAAPI version.\n"); +#endif + } + + av_log(avctx, AV_LOG_DEBUG, "Using %s-bitrate %s MB rate control = %"PRId64" bps.\n", ctx->va_rc_mode == VA_RC_CBR ? "constant" : "variable", +#if VA_CHECK_VERSION(0, 39, 2) + opt->mb_rate_control ? "with" : "without", +#else + "without", +#endif avctx->bit_rate); } else { @@ -1283,6 +1298,8 @@ static const AVOption vaapi_encode_h264_options[] = { { "low_power", "Use low-power encoding mode (experimental: only supported " "on some platforms, does not support all features)", OFFSET(low_power), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, 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" }, { NULL }, };