From patchwork Sun May 30 18:02:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27986 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2253636iof; Sun, 30 May 2021 11:04:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3kklZ1sVy+JDy59d1lV1taU5zCnjbRIs3GjBDOxQFX2EAEdtKyL8X/laLaKeFULwlJRe+ X-Received: by 2002:aa7:c91a:: with SMTP id b26mr21702589edt.350.1622397870043; Sun, 30 May 2021 11:04:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622397870; cv=none; d=google.com; s=arc-20160816; b=02Jy+/kP2JRvbhdvbdiExJKed2iWvXvnr7B62nPmRi1XL1YA+O+9G+/CgmuyYdlgX9 8AhJuHdp70748mDRQecZizvYlUEqFgHGODg53tA5W6Sgq8PBmegkstUFX8FJPDHwJPgF ILn79N6+3KZHDWqKFdXY9DJCM9YJkLLIquXz7CfRoTRvXzLwZ30Eoil7KIBP1SYv7jnt qRgDkZYflUoIeJh1u7ffT95ibu1WMPzUb9aNHD6R16QJGn8uOK+gr6H6/kkxIft6tgyA /+uhqo4Sh+VK+V2z/I8Zr0J90tsqeipPEt3e9w55sFiWajhFqafum3bOTLLHzdBnYMru 7Zxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=u/5tGTjq48Ax3y0elRhocegM05UIi9o+0Z9rh8vZk1A=; b=ICVpdVP3yUKnoqOfvtSlyxB9zuhnfiSyctGFMJyG/skR2FZAUs0ffpr++EuKswCLan eKZQ3lCgIXbrZ8EaDvlbBUDyuXH6JgIGCVtI62j/fm3FowtaGjqvqghOYn+4IfV7A8mB G6lQTsKyprwO+5EXbSjNa5st255BNzLDM3HaQytOES/tGjuR4w7kEWeOUpeqwJnKT0Vh zJiWMgeZlITKBDwRYV/63sLApP54yOJfMDOlrxj/k1b0ZfBHA+OODZkr/Rmu5w2+5IXG urH7Dn+7lzcajZ/aEuDDySd9yzl1PJTnu0f4LOkV0+FRipzroHor0kA4M7RdAMrDRgLD aCjw== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m7si11596460edq.472.2021.05.30.11.04.29; Sun, 30 May 2021 11:04:30 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 21A18680CDE; Sun, 30 May 2021 21:04:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A58236804AB for ; Sun, 30 May 2021 21:03:56 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lnPn2-001Od8-0D for ffmpeg-devel@ffmpeg.org; Sun, 30 May 2021 20:03:56 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id nPm4lulyeljeHnPm4lXGHO; Sun, 30 May 2021 20:02:56 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=x2V9ZmIFU0O8DRePm3MA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 30 May 2021 20:02:54 +0200 Message-Id: <20210530180255.23554-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210530180255.23554-1-michael@niedermayer.cc> References: <20210530180255.23554-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfGB3r9FcBfCWFao54JcToCzCDHPAZTjzOUHI8n6Rja8Q+CEfn47H6wVYULwUz1nN25Y3fq/C/XH9wz6l1ZKhqbDiMXkiUSde+z0czDgUoaqPT9KYtI2t /uv/Jsn/7Ln7HvLT/Neu3nHuomeclHvWA1NaJQDjmB526Gj6Cao0sZWN Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/mpegvideo_enc: Limit bitrate tolerance to the representable X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bkYgweAg7XJ8 Fixes: error: 1.66789e+11 is outside the range of representable values of type 'int' Fixes: Ticket8201 Signed-off-by: Michael Niedermayer --- libavcodec/mpegvideo_enc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index c01488f483..13618394a5 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -455,9 +455,13 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) if (!s->fixed_qscale && avctx->bit_rate * av_q2d(avctx->time_base) > avctx->bit_rate_tolerance) { + double nbt = avctx->bit_rate * av_q2d(avctx->time_base) * 5; av_log(avctx, AV_LOG_WARNING, "bitrate tolerance %d too small for bitrate %"PRId64", overriding\n", avctx->bit_rate_tolerance, avctx->bit_rate); - avctx->bit_rate_tolerance = 5 * avctx->bit_rate * av_q2d(avctx->time_base); + if (nbt <= INT_MAX) { + avctx->bit_rate_tolerance = nbt; + } else + avctx->bit_rate_tolerance = INT_MAX; } if (avctx->rc_max_rate &&