From patchwork Tue Aug 13 00:25:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 14452 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 C2790447FBE for ; Tue, 13 Aug 2019 03:34:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A70D268AB93; Tue, 13 Aug 2019 03:34:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C3436800E4 for ; Tue, 13 Aug 2019 03:34:20 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id i2so48567048plt.1 for ; Mon, 12 Aug 2019 17:34:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=sVpIphDhJaaoMMmF2mLKUipk57SMLHZ2g5V9z4YQEtE=; b=bs0Mvjg6JHubBsi7NwVOsB31QtHxvO7eFgwkCB8LD+6OwttRN/ej/DwRmeafmVWW+w 9/zkfLHN8NwFozlPq3YC+4KiYPDdS9h0b7YtBuEkLkF4w9pzlEBj8i4CyUrZvw0ghAJt oxiReLGYSmjNY7gzVg1lxMYWXW3CwgwKkRnCFNOBw6l2W39YQjqNuI7oCtbCCn8pydd7 VzSRJy+QY2DYujxNCjdoVLp6gmPB2xwqkX9i1F/7eB+MPTK6kKcKY7ofz8FSJ+f1Oe4R mJeztD55b5SQcaeXSqzqy67G8T58HoHJk9a6+C9SI5S1/rYobYitiEj/mimrm6koRa1H 2FjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=sVpIphDhJaaoMMmF2mLKUipk57SMLHZ2g5V9z4YQEtE=; b=PHD4D0mF4GzJc1U3IgJkI/y4ITOG6scbOj4DTqBUn3FC+6G4Sto+yDg+4ryDqBK97q 4DX1dOzSgP0pzgQt1XgsqSaS7AmX2KQdxrlZxfLaJv3WymnPz2DtnXG8KGwJ/1EmReI9 l9lqfNzoUCrv2vQoRYAC7iL2dLxHr195JWT0+AS2Bk5cfe2fLymcUxfSMD+82Yjao7HQ BHGKHK3YxAXNbU9rytcDHaBPXT4b4IUf91xjdQKuz4lazmV/bd/S8mCekS6Xh46kB1bb i3HAeybD0i+EhIX8EaEy7w8ftTUxAMDSJr0ObABGJ1NRagQ2sDBrPl9lNt46Urp1Q+0s HRUA== X-Gm-Message-State: APjAAAUnXpg7S9eH7UCvAnl/b7kz3SVQRWMpQl5IMcqpWDqZTluQVTVk BTneNlio4jxpRiMdOJhnnfu+NrDovWg= X-Google-Smtp-Source: APXvYqzVmHOEUuJ076Ug6+ojrzP16tNqn6kun/33xwT/gRqBfAnPHFs4ynd9Ct/Pbo23Q3lu0cB/iA== X-Received: by 2002:a17:902:9a42:: with SMTP id x2mr35592374plv.106.1565655953929; Mon, 12 Aug 2019 17:25:53 -0700 (PDT) Received: from localhost.localdomain (ip184-189-221-177.sb.sd.cox.net. [184.189.221.177]) by smtp.gmail.com with ESMTPSA id q63sm139305959pfb.81.2019.08.12.17.25.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Aug 2019 17:25:52 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Aug 2019 17:25:37 -0700 Message-Id: <20190813002538.90687-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] vaapi_encode: ensure correct VBR bitrate is used in h264 SPS 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: sw@jkqxz.net, Aman Gupta , linjie.fu@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta This is a regression from 2562dd9e7831743ba6dc5680501fb7d26a2ec62c which surfaces a pathological bug in the Intel Broxton/CherryView hardware encoders, causing very low bitrates to be generated whenever VBR mode is used. /cc intel/intel-vaapi-driver#480 Signed-off-by: Aman Gupta --- libavcodec/vaapi_encode.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index e69b59fa37..231efba6cc 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1665,6 +1665,9 @@ rc_mode_found: ctx->va_rc_mode = rc_mode->va_mode; ctx->va_bit_rate = rc_bits_per_second; + if (ctx->va_rc_mode == VA_RC_VBR) + ctx->va_bit_rate = rc_bits_per_second * rc_target_percentage / 100; + av_log(avctx, AV_LOG_VERBOSE, "RC mode: %s.\n", rc_mode->name); if (rc_attr.value == VA_ATTRIB_NOT_SUPPORTED) { // This driver does not want the RC mode attribute to be set.