From patchwork Wed Jan 31 14:56:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 7456 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp1836685jak; Wed, 31 Jan 2018 07:15:31 -0800 (PST) X-Google-Smtp-Source: AH8x227eiPrwt1ACbFul77hrCFSnccIpZrgF37klTPoKa2+mj0yRfkko8Q7V6CnFhKbawqE0FWJj X-Received: by 10.28.4.84 with SMTP id 81mr22881409wme.150.1517411731185; Wed, 31 Jan 2018 07:15:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517411731; cv=none; d=google.com; s=arc-20160816; b=d6FgByfeXjhCXwXsYFyfadU6VE9pIJln3elxJ0RGjE13hAvhX+tTEx/wNX1GVQQ8hr 1H240FUqK/VL5eaH/64msgQl9i5icrA4VjgDTIN0Lj0jwJpiqBxwnRh/gLH7rHA1TVvP l6tI73/D8bY4WylnLGBsFGrh41pfeY8/HvxgqP7QpTouMy1W29HQswIP3hwP08zqEPCL GL++RNur72S6vZlqBh5PrDiDhgEm0xn1clXZjcU4FDn9v5XovJZMcxnzMwMv2xOc5n1k Fcektt19pU+TshG8nDV/FcwBonu0TvGrzw9yniw7vCWEqzRI5PODtajcm6p3m3STYIg7 hYOg== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=mc07cRNcqw9LebsF0WpTi/UJXFjHq3UpvHxoaSGKq84=; b=tGXok/Vv1+QGHFEIjZOLEaAB88dy/qM/8Xh/JEmy3VX31ZRT5nGV4VOatER7IH0/aQ CdpIhw174wk+SFPUk+AUziaEfd9Gogx3ZxyTiezWaFkWC/1LB0BGBhCvC5f9HubI+FN5 cIY6WBiTnW1NVYExVgj9NoApTIYjwGvk3P/69TraMXhWHYqA+ggdMXgjZO+B22lOsjEg PD9N9PfpJSqxgGe7xJw0MUgkGlXmq+USQw4vHo0lwAN2OA8VlZiJA7ikkMZjF4dVapfd vgaeJd350bjhDMCvvV5Uy7yAZjoxOwPvv3Ur7fHM8LMhDcNCTcuUrBdW6jsfAm75y4eo SYug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.com header.s=20150623 header.b=hwDvM/4D; 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 r82si11337904wme.227.2018.01.31.07.15.30; Wed, 31 Jan 2018 07:15:31 -0800 (PST) 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=@ob-encoder-com.20150623.gappssmtp.com header.s=20150623 header.b=hwDvM/4D; 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 734E0689815; Wed, 31 Jan 2018 17:15:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1AFCD68043D for ; Wed, 31 Jan 2018 17:15:17 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id i186so8839074wmi.4 for ; Wed, 31 Jan 2018 07:15:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ob-encoder-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id; bh=NKl8iKG9vRIkKK6m3b9WUAwYLyCcM7uezC+OfIQOYuE=; b=hwDvM/4DWbP77gSFQ5jsaL0FRjxGyfgvy8xldQ2N5WWbhfOMLJ3FK5A3Z7osk0Lf3e 11kh2dG2hkrkVCouiJMIoi21lkAE+2Ug43dbjjIdvInFKQ/Xk5cALi1DT1unAQbBI0NP qJk6YmLSGLZmzBjcVpvmA75jokjmq8o2CAxBCCeFUh7BxwnDgxw7m5Mm/b9SFVv82h9M Ph0CZNAFD/8kmfqGnRlvU8Fb4Ds1+bFD6iFcup4Kp/LCAm50z34fjdLN5xHzPX+Ma/Bh nePt0HHU6lC0Jkt58f+L9OyjTwh1460MXTWkw/JPA4rrkwnJURuQd4eJLz262WjrI6wt fZIg== 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; bh=NKl8iKG9vRIkKK6m3b9WUAwYLyCcM7uezC+OfIQOYuE=; b=K6Yyee5udw0IE+a7GmqYqn1G62fo3jnMkllmR3Hgrc5sOSlzVFqQz5Aa4g1iUGmlCS sbiR6phL2BNoJkA7cc9w5kcZUAkSuW38yNZNk1Su4RkGW69wpaMoVo+X3glbjuSx+iBT ZSBLrn4s6zjFjeuGpWXegUv4DohOLAdQkO0CZjkRRWLu/4ltD3l63w4wpwZodsnDmIVl 30gGuJKTVsk+RJ9m5RPvw0gO7JB3eBcBULVRAkOUzLIioNyMtZalAXlW+x6uqRxHcdtd 0ePpQLSaEAJjSPJknyuyqk6Z2UGd4FRyrC/qaJXfZZXRxoQF0EpqF9qGPMEOAXxwMqNu 7H+Q== X-Gm-Message-State: AKwxytf3Izv4lDp41hkkaHQnTtarQT7Q+jJxowq9bLXmUykIsVqDHNDG PpEBlUlrCG+dYHAo64F2A0OoCTrm X-Received: by 10.80.181.197 with SMTP id a63mr47521185ede.138.1517411332248; Wed, 31 Jan 2018 07:08:52 -0800 (PST) Received: from Ifrit.systemlords.lan (d51a44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id 15sm9927677eds.54.2018.01.31.07.08.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Jan 2018 07:08:51 -0800 (PST) From: James Darnley To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Jan 2018 15:56:50 +0100 Message-Id: <20180131145650.29533-1-jdarnley@obe.tv> X-Mailer: git-send-email 2.16.1 Subject: [FFmpeg-devel] [PATCH] vc2enc: prevent bitrate overshoots 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: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Rostislav Pehlivanov The rounding caused by the size scaler wasn't compensated for and the slice sizes grew beyond what is allowed per frame. Signed-off-by: Rostislav Pehlivanov --- libavcodec/vc2enc.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index 2f08441d55..b7adcd3d36 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -164,6 +164,7 @@ typedef struct VC2EncContext { int chroma_y_shift; /* Rate control stuff */ + int frame_max_bytes; int slice_max_bytes; int slice_min_bytes; int q_ceil; @@ -715,7 +716,7 @@ static int calc_slice_sizes(VC2EncContext *s) for (i = 0; i < s->num_x*s->num_y; i++) { SliceArgs *args = &enc_args[i]; - bytes_left += s->slice_max_bytes - args->bytes; + bytes_left += args->bytes; for (j = 0; j < slice_redist_range; j++) { if (args->bytes > bytes_top[j]) { bytes_top[j] = args->bytes; @@ -725,8 +726,10 @@ static int calc_slice_sizes(VC2EncContext *s) } } + bytes_left = s->frame_max_bytes - bytes_left; + /* Second pass - distribute leftover bytes */ - while (1) { + while (bytes_left > 0) { int distributed = 0; for (i = 0; i < slice_redist_range; i++) { SliceArgs *args; @@ -994,13 +997,13 @@ static av_cold int vc2_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, int *got_packet) { int ret = 0; - int sig_size = 256; + int slice_ceil, sig_size = 256; VC2EncContext *s = avctx->priv_data; const int bitexact = avctx->flags & AV_CODEC_FLAG_BITEXACT; const char *aux_data = bitexact ? "Lavc" : LIBAVCODEC_IDENT; const int aux_data_size = bitexact ? sizeof("Lavc") : sizeof(LIBAVCODEC_IDENT); const int header_size = 100 + aux_data_size; - int64_t max_frame_bytes, r_bitrate = avctx->bit_rate >> (s->interlaced); + int64_t r_bitrate = avctx->bit_rate >> (s->interlaced); s->avctx = avctx; s->size_scaler = 2; @@ -1009,18 +1012,21 @@ static av_cold int vc2_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, s->next_parse_offset = 0; /* Rate control */ - max_frame_bytes = (av_rescale(r_bitrate, s->avctx->time_base.num, - s->avctx->time_base.den) >> 3) - header_size; - s->slice_max_bytes = av_rescale(max_frame_bytes, 1, s->num_x*s->num_y); + s->frame_max_bytes = (av_rescale(r_bitrate, s->avctx->time_base.num, + s->avctx->time_base.den) >> 3) - header_size; + s->slice_max_bytes = slice_ceil = av_rescale(s->frame_max_bytes, 1, s->num_x*s->num_y); /* Find an appropriate size scaler */ while (sig_size > 255) { int r_size = SSIZE_ROUND(s->slice_max_bytes); + if (r_size > slice_ceil) { + s->slice_max_bytes -= r_size - slice_ceil; + r_size = SSIZE_ROUND(s->slice_max_bytes); + } sig_size = r_size/s->size_scaler; /* Signalled slize size */ s->size_scaler <<= 1; } - s->slice_max_bytes = SSIZE_ROUND(s->slice_max_bytes); s->slice_min_bytes = s->slice_max_bytes - s->slice_max_bytes*(s->tolerance/100.0f); ret = encode_frame(s, avpkt, frame, aux_data, header_size, s->interlaced);