From patchwork Tue Oct 31 02:37:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 5774 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp3418982jah; Mon, 30 Oct 2017 19:43:49 -0700 (PDT) X-Google-Smtp-Source: ABhQp+QcBnB2QIeSv1zzliP9n+Q4NjkN+w47zePcFR3NDwrBNpG+0kUkk3qsC4Voychm/Z/IHbME X-Received: by 10.28.63.134 with SMTP id m128mr550810wma.137.1509417829668; Mon, 30 Oct 2017 19:43:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509417829; cv=none; d=google.com; s=arc-20160816; b=jsq15Lx/PdyDb1hG2vVIUpiY+OYl5qMr+Gi4AVYyalKuGHmUiml4SXzJv6/LFpjuxo 7stGuAN5oyEMmOC1krEs9hTJmPci1C0HFyOI7B1yCjY7K59vyMplKdOPcr0+OEocoZRA n8YJk7YKNTFClZuR/oT949VA7h3a3kLOOkf2wA6nAUru6FBkCm8tSTT6zdjNbrP5my9y WXCBHTtLaKbGmg/pEmF0FExMo0wE30o6R9ZEJxpoq7IbdoHtGzTO/jbpqoGnsuqF3J0h tqfcTpAE3ojvbC4BFYRVpnTFd78cOZH7IugH0EZprQ183hnBVfscpaSTczNpcAMAP4l1 7ZMQ== 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=LkyesyzVtqeZB3J2kkkIrnGjNeJxx+BW/fUG1n3iN6c=; b=uJ0Nl0HOHvIC4OwSF5XNcW80eWvLHUFLjLuP8TSG5cyN4wSsutKgG10JhtDauvRHQa w/gUtel4coo+OJb2IpT1s+GjfAEViJ4IduZk048sng/0+zXnZhEr5qMTWLR0n0h7mcQR 7+7kTkcQrKOdxlCsYahCjUoDNH45rO04KK7hg3lZUp1X6q6C/GlGZ9Ulm33YdM/MlARr DmlqjETfrtVAWttg+/SlxStXAo6mc9Cw7X8pgRYakyDEW8klKWyCkQpZ0WoahCUkezE5 AkJgXQ78Y6wejs/47WM5Ut+RY2dDZs6gaXLmVbYKiNO4VHJu11vPu/OmbCkLnECx2F5G TMdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=t7sw5F3C; 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 o22si381311wrf.105.2017.10.30.19.43.49; Mon, 30 Oct 2017 19:43:49 -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=t7sw5F3C; 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 829E8689FE3; Tue, 31 Oct 2017 04:43:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f182.google.com (mail-pf0-f182.google.com [209.85.192.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCDC9689F89 for ; Tue, 31 Oct 2017 04:43:26 +0200 (EET) Received: by mail-pf0-f182.google.com with SMTP id b85so12583380pfj.13 for ; Mon, 30 Oct 2017 19:43:36 -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=6qkjvEi+7ebDXhcQ+kUCBMiiXsHhZ/0EENgd0cjdYPM=; b=t7sw5F3CnPB+S82rCz8dZmMgUJJLSXpEoZV/xdrG9uYB8+aM1+bsVVzjcXQD0DbEs5 mNmiF8O9Q1Z2ycxL1V4aR62ThoVajwfpRqWcKDz6RWl3o47FnHb0sos91+Fr6ULLYtyc u+ogpLcpIqLoMiNy7eNffuoiWX6/BDm1+Z7k9Q4blip9FSsdqitXj9tQe7hblBs+d/+i E7gtkgFlnOmd3M0cUPHPS9UbV/mEy1tNFMA3sYj7y5CPbcBoK9SO86x9dhguGxzbxOF3 gaUCYyp8ueQVJXnY6zrk9mtsBcUSM2++MxsayltKH9EIqw+q2CL7P2gV+HCTwobgct5h WNnw== 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=6qkjvEi+7ebDXhcQ+kUCBMiiXsHhZ/0EENgd0cjdYPM=; b=QqTBgkCrCr1SscIOEnMTwZUdZNERFI19pNiQgVeYgk08JEG99V2Jc4tL8XJtdrcIJ3 0WR/BcFowk24KxEWqtDSXeHTWjtEML6fvBpoudXQxUZ8grw/hmPkkkz8rM+IzFI1qdUO T8OLiTuGC2whBMKwsIlwkZDbrx6c5sI0el4dx8qsyfLlrFCzd5JnQjw15Zy9Z6J8v3YE 0isQ1mYLF/7m6Rbfrir40TSwguYRYw3FMEdoGW1r9cu1e/oI6CVyUuFgi5h9kXm0sGW0 kzG5f+Y0W7ltEFBeZDQvmXg/wb5ppnCaDMDODfrL7Zf2FGzHaWsX4XRu5r2mkgSmBaIN nH+A== X-Gm-Message-State: AMCzsaWvu8x9QjnU8n2N4V7jUoWdsnSWxwWn+5Bts7s9VtG7aFVgzjOT eLm1Nh6c6wlnJi57o7aY0yY= X-Received: by 10.98.236.24 with SMTP id k24mr436105pfh.220.1509417464699; Mon, 30 Oct 2017 19:37:44 -0700 (PDT) Received: from [10.67.68.21] (fmdmzpr03-ext.fm.intel.com. [192.55.54.38]) by smtp.gmail.com with ESMTPSA id d8sm396381pfh.178.2017.10.30.19.37.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Oct 2017 19:37:44 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson , "Wang, Yi A" From: Jun Zhao Message-ID: <552e2be7-6687-679b-b5e5-05cb0057a3de@gmail.com> Date: Tue, 31 Oct 2017 10:37:41 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH 2/2] lavc/vaapi_encode_h264: correct bit_rate_scale setting. 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" From d1e105057e93e7c2788d6d684292db9008fbf3ac Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Tue, 31 Oct 2017 10:19:08 +0800 Subject: [PATCH 2/2] lavc/vaapi_encode_h264: correct bit_rate_scale setting. As H264 Spec 2012 E.2.2, bit_rate_scale means the max input bit rate. Signed-off-by: Jun Zhao Signed-off-by: Wang, Yi A --- libavcodec/vaapi_encode_h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 1d43e934ef..27a810c64e 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -406,7 +406,7 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) // Try to scale these to a sensible range so that the // golomb encode of the value is not overlong. hrd->bit_rate_scale = - av_clip_uintp2(av_log2(avctx->bit_rate) - 15 - 6, 4); + av_clip_uintp2(av_log2(FFMAX(avctx->bit_rate, avctx->rc_max_rate)) - 15 - 6, 4); hrd->bit_rate_value_minus1[0] = (avctx->bit_rate >> hrd->bit_rate_scale + 6) - 1;