From patchwork Mon Dec 9 22:26:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16684 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 0A77B44AA6E for ; Tue, 10 Dec 2019 00:34:07 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DDC9168B725; Tue, 10 Dec 2019 00:34:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3586B68B70E for ; Tue, 10 Dec 2019 00:34:00 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id g17so17955815wro.2 for ; Mon, 09 Dec 2019 14:34:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LODaw3IiCx9UFdwneYbmsm6UNMfwgWWlcWLBRXAZbgE=; b=FnH/cHDcgE/2LS8rzDpjJncc0WLBbxEUC3iHuZ17UKnO3LlbsA5EDHa/wTYDbrvtaA sC/U9RX0OjcZNYr/h9IRC++TgUlZRbMOhtOkpzUnooVymb0Pfuu6DQORN632RjTk1sYe QOGxsqgBcpB9+52uZm2pERPrvYrHOfLcYejC7+qAh9Cz8TZbz6cVI4CPyRe+M2zM6xUB OYitsG/rk50omcP7AkRJXgk9QOIRANQv+zYXSdBHFVGl+7RWIsT51sTqlfYSVaFNGW+C inrxf9CnXTOrsIuvduS434lqtx0+sJCSiQJ8bS0S2BhS/T7xVtF1K3Po1gWTJSgZjyK4 pEMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LODaw3IiCx9UFdwneYbmsm6UNMfwgWWlcWLBRXAZbgE=; b=rt+YE9deK4KQFI7pisFlYonSSGSyua4PJvHykanpfsg9G+GbQQUhWEXMeQAj/SdEeY vXLR7D+ug8+49GEAvlgjYdH+6d8okRSOei6/TCHM20dQ9xMsh6HHnS/DnXWrwPColRLV ifPvDU+TanXDD/doNHVC4+AY15zuBJEXKGsOrpIaI+DWKG5voZB75ZtvYDFADPnAg0bx PrMh+PKB3wc/XXm71YGDQW4+uW/kyUzFWkIzRHhH8GUp+xuYYwj7ObnsQpvOlmpNCL9q 9o5bOSvuRoykwiLUugzStUhCk8luBcDKwR4LrAX3YRE+QJc5ejoDiUtSYKR/pNMaxqEs 06eA== X-Gm-Message-State: APjAAAWHtZSDO1MKJNE1ba7idosZxGi9QlDlrsmjwRNxVpr3wNccvKdg 7/m16g0GT05TzBUo5PaGBC17WpcS X-Google-Smtp-Source: APXvYqzCMluw9fpfKmVP0H1TYUjiXVZQFhF11YORS+SmwI+rvxn1a2W+VXFIGuZWf4mCGVMX1xeLGQ== X-Received: by 2002:adf:e683:: with SMTP id r3mr4534665wrm.38.1575930839616; Mon, 09 Dec 2019 14:33:59 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id v22sm865893wml.11.2019.12.09.14.33.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2019 14:33:59 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 9 Dec 2019 23:26:01 +0100 Message-Id: <20191209222604.28920-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191209222604.28920-1-andreas.rheinhardt@gmail.com> References: <20191209222604.28920-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/7] avcodec/cbs_vp9: Combine two loops 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_vp9.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/cbs_vp9.c b/libavcodec/cbs_vp9.c index ea7747182e..807d066690 100644 --- a/libavcodec/cbs_vp9.c +++ b/libavcodec/cbs_vp9.c @@ -581,9 +581,11 @@ static int cbs_vp9_assemble_fragment(CodedBitstreamContext *ctx, } max = 0; - for (i = 0; i < frag->nb_units; i++) + for (i = 0; i < frag->nb_units; i++) { + sfi.frame_sizes[i] = frag->units[i].data_size; if (max < frag->units[i].data_size) max = frag->units[i].data_size; + } if (max < 2) size_len = 1; @@ -599,10 +601,6 @@ static int cbs_vp9_assemble_fragment(CodedBitstreamContext *ctx, if (size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) return AVERROR(ERANGE); - for (i = 0; i < frag->nb_units; i++) { - sfi.frame_sizes[i] = frag->units[i].data_size; - } - ref = av_buffer_alloc(size + AV_INPUT_BUFFER_PADDING_SIZE); if (!ref) return AVERROR(ENOMEM);