From patchwork Thu May 11 00:29:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 3645 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp460979vsd; Wed, 10 May 2017 17:29:55 -0700 (PDT) X-Received: by 10.223.133.35 with SMTP id 32mr5636954wrh.200.1494462595028; Wed, 10 May 2017 17:29:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494462594; cv=none; d=google.com; s=arc-20160816; b=u9Ya57AGqsYpMXJZi6fHlmAzhOOcuR0FnCPfaCY3LFYbrE39ls4KIbYb913dczG4Ao MaKlxtJaI/G8ApO78ubHxRGCdwdGom4PRiddUoP0NhVMHSBahFauWX7Yumu5tJj8G1UC Urp1/iJjqcF1+yEzgVZDoOHsCEGQ+HG424hbU7cuCClRtcWRswTl+2hs1syKYdykU5rh f7J9XeC/mzO4HmwprWn82w8A5aAAQ+V/glGDc9BVHJYZ12rNccYWen5PXJq6RhD2lgxr WsccoyGzwmiCPec00RxzvriKBuuu/Eu9WA6rxyYLGHIrPH5gS6XDNF1tBMnszETaEZ9a gYNg== 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=mU4crILIHifdF5H2Ql+7lsTJ6d/Sna82QHEBpVe95c0=; b=oHBrRMBBIj3IuiQMYpIZQLbvP5eOp9fg59+x4CaLSqMmYhdMmcfgLgEXzdRI8Uvp6G DDS2ZWfaqQAcGM8a/dSbF1jc3QizkAxU92IOm47vUetL3fuVuquQqj3LvDTZBYleCNN8 orSHKxkSaHAmob1jWircZXvUOAj0wZeG32ew1BMUFUlxbUWGovQk045Romyhc6IuJPRp 6+7nlS3KZOc0rSdtPgbMfwtE27Y6v9THeFKA+zWr9vzqQMtO7GV2uV4Cg+muCWITgKko 7VI5EVSNmVrH3iXqn3CFoKhfCcnlTcrjE8XGfMsVs8H/eh5AGdkihdbuSGgajHBhX0Fi PeVQ== 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 v107si150595wrc.121.2017.05.10.17.29.54; Wed, 10 May 2017 17:29:54 -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 5FF3468973B; Thu, 11 May 2017 03:29:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f47.google.com (mail-pg0-f47.google.com [74.125.83.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD09F680956 for ; Thu, 11 May 2017 03:29:37 +0300 (EEST) Received: by mail-pg0-f47.google.com with SMTP id u28so5665276pgn.1 for ; Wed, 10 May 2017 17:29:45 -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=zziTK6oxCiMvp7fO0BPDE96lIt70azQHW/Xg+F8gDGY=; b=dcYao0FivoAQd4+Np4E3BHrDaBUDGOnCkMhzu9FrdEF/albTG6A2xJZmH3iAZ1LjCA jC3Z1dqxtBgQqHRtRHQY3wjj9CVvFil1kF3mQPBV0DlHwnc2n8rMhNdjmEfdlkHHqz4Q Rv/hMRXX4ikrWJIj8Zzfk6Blsfn3tFVk13+saRv32uFgXHF1FEMtbG44+38iIALsn4wU rTTpm70yG04kgll+DvqqtUohS5We9tuG3YWXtJk5C4KjJL1pXqhTq5n3Nt/iWBLMTR9G Y5XWBsr6GxT/Ns4IP0mG43OAkykDLZbiygSOv7zm+MYSrlR47F3GY1cq9caRgkzHzkTg 2i0A== 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=zziTK6oxCiMvp7fO0BPDE96lIt70azQHW/Xg+F8gDGY=; b=ftfSVhmNa5NeGXXWlQUMtzScwxWgaoxGFt4MO3OwqkOhHJqxpsw4FxWW0F9Vegzdxb kKqTBHN2B8+K42He3KhbHmTDiZ9Yl+RKZ0DPcG/3SBecbLghPh23u2tHRYs+LCSPqGrl s9DiIWmoSHsWJWFmmgO2Wi9XibmXzf+VcppPlxGkTNq9KyhWIAWNnFE+pjRZAbVzQKh8 RF+qypAKSaTDnfhbTtDOh6q1ygAjdAWD69rY6XG8+Vxlnr3u57RFkC0d0MD8mYbDBPuG Tn3fvc2Laxr4e4G4b0W/dm1k3pZZl55Pxl4IHRxcJjGYWJTicSGmuBMjEKQZnmuD1Snc Icyg== X-Gm-Message-State: AODbwcBg43cX5u+UUijOuBNHHTlEBW8c1ZlueaZ9QRJ3QTvNnC+4TJgz 75umqi454T4+hw== X-Received: by 10.84.193.3 with SMTP id e3mr12187115pld.21.1494462583025; Wed, 10 May 2017 17:29:43 -0700 (PDT) Received: from [10.239.205.153] ([192.55.54.40]) by smtp.gmail.com with ESMTPSA id z5sm107693pfd.76.2017.05.10.17.29.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 May 2017 17:29:41 -0700 (PDT) To: Mark Thompson , FFmpeg development discussions and patches From: Jun Zhao Message-ID: Date: Thu, 11 May 2017 08:29:38 +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] 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" Enable the MB level rate control, verified in i965 driver master branch with Skylake. From b32e4c9c1de47b3bf76327b0ecd11ccf9e3c693f Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Tue, 9 May 2017 08:19:16 +0800 Subject: [PATCH] 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 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 92e29554ed..130a9302eb 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 mbbrc; } VAAPIEncodeH264Options; @@ -1157,6 +1158,12 @@ static av_cold int vaapi_encode_h264_configure(AVCodecContext *avctx) #endif } + if (ctx->va_rc_mode == VA_RC_CQP && opt->mbbrc != 0) + av_log(avctx, AV_LOG_WARNING, "The MB level bitrate control is not " + "compatible with Constant QP, it's will ignored it.\n"); + else + ctx->rc_params.rc.rc_flags.bits.mb_rate_control = opt->mbbrc; + return 0; } @@ -1283,6 +1290,10 @@ 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 }, + { "mbbrc", "MB level bitrate control", + OFFSET(mbbrc), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, 0, 1, FLAGS, "mbbrc" }, + { "off", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, FLAGS, "mbbrc"}, + { "on", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0, FLAGS, "mbbrc"}, { NULL }, };