From patchwork Wed Jun 13 13:38:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 9387 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp652760jad; Wed, 13 Jun 2018 06:38:45 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJvCMty4GyuiwLxsEKcN2UlGzzmNzGIrknttItCTdcWi+n6uPX7CYBsq6TW8fULhfK8jJ4E X-Received: by 2002:a1c:b7d4:: with SMTP id h203-v6mr3448289wmf.161.1528897125306; Wed, 13 Jun 2018 06:38:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528897125; cv=none; d=google.com; s=arc-20160816; b=urTbisb3NrUHWQJ4GrKFWgWY9hrMldHwflgwih5+cq9+BsJ7hz37n8Mir3lvMk0Ma0 pth7FoH6EKFs1skHKyR2zXnQmM+bqI/ML6ZWC8oyQTs4Sv0iKAuXNCHKiiOHEz4LfAcf 6JMWB3d/cwglf0RRqjQqkLYthltYowXNMIRD1g/ln+MNb5sZ2TvgbCKPYmOv2rEeZVEq 3kE9UZfHIUFaP6PZrQw3Xk4ss53mDQNXL9R6lepUEjoZNTD620YMxIzlgt8+Gu8f4R+m chlY8iAMf+yeh/8Gal9nIrG8OzAZ0C9H2rRRdvIrmecsH9teiNShQadeOlbsS92MqWd4 889A== 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=iWWAac0YF+OdH4Co9/N3du9gZK3xgwzWFjLvRe5DDrA=; b=Aw/FG5mVd0qdc96kyrJWdeQAAa5eHp0bEu5njRhcdyWIUnPLDZQDLBljCuTM3ihmvC cJAdwbYo9447dCo+wZrnt5cmajiFFTKCvRVfVjxngK/9pLH9R4qRH4r9Pe3GnNhQkMhH kzCdr5bJpMnzR8MpjzWg+YbjEG8VbJgHemwg3Quj1goi7shA+5qFmfG5mWoP8oz8tscM HuMpFZ2bV3B1NkG+4w831FZJRks5C+kDVeB7YqrN0Nsp7g37ZUrNohABOkxIP5v1CVFe ODWx27zpK+Av1eaBKDY48roSRqgb5Ka6axovTVllsiIwKVtAjaVrgjBmigtyfemZQkHy 3wLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=YFMiZceb; 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=QUARANTINE 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 y39-v6si2240114wmh.88.2018.06.13.06.38.44; Wed, 13 Jun 2018 06:38:45 -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=YFMiZceb; 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=QUARANTINE 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 CBFA468B09D; Wed, 13 Jun 2018 16:37:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD06368B03B for ; Wed, 13 Jun 2018 16:37:45 +0300 (EEST) Received: by mail-pg0-f66.google.com with SMTP id a14-v6so1294782pgw.10 for ; Wed, 13 Jun 2018 06:38: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=B/vWROIOZ9swY9dBRPtmohAC98+mQzvUw3kDPazibZY=; b=YFMiZcebXMv6dqEbIV/IAmmFckTjaaDIEbqVGMxE2CbHTrHQCtnu07rsmlkrHrVC/n Y9n3tk2VffB6JI1TCdaO6VEGz37psBFkcDKcYXDapcnlvDDG/oaGP4BwitiY9S/7GHoc ZeUTI2he54FHwrgxLquJc2li4q7Lp4EVGqOwDTfkzo5l/PS59WqMY4nJ2lLYodejSNp2 V0Zof1QvAfoUGQAPFrDWes93WGe//hf+VSsMBnaw+CSIDyahlDEiEeYoPY2KZbLvLyED 0gGT8KqZCtJcVa7xloUlJTBo+Znjkg79FrnsvphjyvbqQJR6ADh5UvpDrqvgBoGy/PBJ toYw== 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=B/vWROIOZ9swY9dBRPtmohAC98+mQzvUw3kDPazibZY=; b=GgIQqAkv3IFM1v/aua4p0SaWJGWq5y8Tzibq5JM86yF5MtXHXpLFT5V0NsqESBQZh4 GMk3+M2xMe60PKT6v9aOAdB/T9xggYV2LzWjmFPrhx+5mZzeGgQJbGyrlA8BRvSWLaCx 7Tg82TVgUhdavdFdK0IsIKCGxB8Ql/Q1w1Oi+y6v7XstCKfG5qj/QSNXFkLhtly+IISr bGo4UCXdjv4nCXYTa7Suoxw4f2DM6L60SFva/UpUxm2CGL8CzUH4dEjPPOdYUO4ORmFS vr8+tIVAu8NrnkD8Ayqld1lQ8H1zSLieWp7sbvTyLgBEknsy2rl51moYJqRXB65aXQ2e MNSw== X-Gm-Message-State: APt69E2at8bX7ALrE8xI5xaiTTsEy+UUbBo3Q/pfyoI3Mh/2JehsNv82 5uWw4+kzaf7ghuHEF/Z8w3RDAGz7 X-Received: by 2002:a62:ec5b:: with SMTP id k88-v6mr4908532pfh.85.1528897114014; Wed, 13 Jun 2018 06:38:34 -0700 (PDT) Received: from [192.168.1.225] ([45.126.171.42]) by smtp.gmail.com with ESMTPSA id c27-v6sm8677606pfl.63.2018.06.13.06.38.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 06:38:33 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org From: Gyan Doshi Message-ID: <3c1965c0-caf0-af66-9577-8ea3d62cb9fb@gmail.com> Date: Wed, 13 Jun 2018 19:08:30 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] avcodec/libx265: apply lavc maxrate and bufsize 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" Default for both parameters in both libs is 0. Regards, Gyan From f875734cc5a1652162156118864db406b192526b Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Wed, 13 Jun 2018 19:01:17 +0530 Subject: [PATCH] avcodec/libx265: apply lavc maxrate and bufsize CLI options -maxrate and -bufsize are now picked up by the x265 wrapper --- libavcodec/libx265.c | 3 +++ libavcodec/version.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index bb457dfe5a..6c6fd88602 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -205,6 +205,9 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) ctx->params->rc.rateControlMode = X265_RC_ABR; } + ctx->params->rc.vbvBufferSize = avctx->rc_buffer_size / 1000; + ctx->params->rc.vbvMaxBitrate = avctx->rc_max_rate / 1000; + if (!(avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER)) ctx->params->bRepeatHeaders = 1; diff --git a/libavcodec/version.h b/libavcodec/version.h index 5e71b48816..219f56c37d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 20 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \