From patchwork Tue Feb 1 21:20:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Theisen X-Patchwork-Id: 34051 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp983742iov; Tue, 1 Feb 2022 13:22:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJwZN9MFIPXPiSsuJuYToqPSPVIyf9OtPs7Y7AZn7SJwAzdrJ8uGw/OSCZye4WSXRHSQV+6Q X-Received: by 2002:a17:906:6a20:: with SMTP id qw32mr22015229ejc.40.1643750553365; Tue, 01 Feb 2022 13:22:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643750553; cv=none; d=google.com; s=arc-20160816; b=RkMiNcOtN9Q0W6qnzxzkgS3VGHCj9tkkrZoU2hFMLHNdTNhmG/u6xkUQIod10awryi 0AvIQLXd+OtrxKlW6UOQ/cSrRM2NcyAL6t3ov/8BfYLrBHY6fJQF/ZaML3vkmXlcSlKR c9TgiqPzZdu+eBINFDTlLVV8l78SUDr5HRz5ohJgNL7zkrGfOiAY6Nwsct8VRQ/B/A/v zzA/Df61mLRUVuSQEMp84B11+Q6h7527C9ck8Xbpfj1vDeIbI0neiLb7Z6mTQuBx/v1w 4mCb1oSoCvqDyEANXLZr/lrSKvEr1oBQ/19KfNJuy1el2Wj4qU/G+KheHESbzktqI8iF hdcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=m3dETzg9BGPlVD14Xx+2158n8a0W3OoZAd7XBhQgvqM=; b=BZZiZTizsTBTwRjebgxxEOHDWDAk1pjp4WXMaM0s/u2XBKcJHBNP8mlxti1lZKHwNz 080EWt2eMotW1HVuPidBXRYXTAfGAPjCeBXqxEEfLBX15f/JdgmxPAU8hkYyMq8yVAOy bWCCTcZL07aPsF+JVmBlYkcpFMCEKyftPEPnpUtNXbu/p2YdEWoiQCAQG3s3+tTDsDke RVAG2qp9u+LThs7x5IhayZ7sapnJyv+brJBz0Aoac60617428rYfk3kqAOS2Hi3AdeK7 PGInAXRZLA14N0wsdKHdTE+vScw6fC7/IZNsuIbJ7/5Tpu99yiOY0GSWQADL9qdnDc1W nEeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=EWnRErFa; 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 c15si12405264ede.581.2022.02.01.13.22.33; Tue, 01 Feb 2022 13:22:33 -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=@gmail.com header.s=20210112 header.b=EWnRErFa; 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 EC92368AFE1; Tue, 1 Feb 2022 23:21:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 999CF68AFEB for ; Tue, 1 Feb 2022 23:21:12 +0200 (EET) Received: by mail-qv1-f48.google.com with SMTP id g13so17241864qvw.4 for ; Tue, 01 Feb 2022 13:21:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NEFO7J6Y/UQrD2jkMu+IML0DYDbtmtdlPGF6se3LOwA=; b=EWnRErFaOrnBbgLN5a7d4kphhmX7WcQ+yCFjmm7M4wDUKsveJUkTAztbvo9jcHPp6o E0ctor8xOAiRAq6/05zAjaq4oeIEUTdU10PbRMvfdm/5zVqXA9OdYP0+WO8sForlIu0o DxkaquPEgYnqXjZREug5Ps1A0eV8+6Llj5ZYCHdz4FsyOGKFWVnycWDX9GH2tjGu8qZq l7ADPS247K8g112ICZtV1DBVXZjhqKVNzBjfw2WLbJOzLfrlN8Up7fxC9AvKMpilohM/ PhHNMh8PXSN3FmkuALqlZ5rTXNV//UyfLDfYCKYEN1UFqcwKpKotVTNpO0Fc3DHhtxuD UJLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NEFO7J6Y/UQrD2jkMu+IML0DYDbtmtdlPGF6se3LOwA=; b=Qa+ov8Je73Afps3T4/Z6zgyHjiuZgyWq4lCuKBZZjiiqGCrf+ETuSwu8H8blSDxV/r LEiDj9XGfUchEyqcc3bKmuBJI9h4VTT/olypof8glHXQhG0GlvAXeF+6sDhTjgO8Riul vu6spzDQ9T/y267hH93i7N1pHyzSkXb8mPkFpYEutyY1tGu6iXcGYHJ0OmuM4pO3XHIl F4YgQfsIZMQOk/CXVdWVsLAg5D7QwnuMErpt7I9BZiCOAJdfmXfoO+wSlpmNQlPs8L+G TKS7S6IpbDN8Y9Vn8/pASYmr5znMvRgkbpdsaNDoJoyoPd4Oud0Tvxpg3jWn/Tef1J6T of6A== X-Gm-Message-State: AOAM530ismGMBefEXnzY5l5eiTjwBpi9RcmCBE/mAbzOsa8qeAtTi4Od 2nLYtMjhehYZcGByDd9WDreYnLUoOKhWcA== X-Received: by 2002:a05:6214:2486:: with SMTP id gi6mr24196879qvb.126.1643750471174; Tue, 01 Feb 2022 13:21:11 -0800 (PST) Received: from localhost.localdomain ([151.200.235.219]) by smtp.gmail.com with ESMTPSA id ay18sm2928225qkb.8.2022.02.01.13.21.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 13:21:10 -0800 (PST) From: Scott Theisen To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 16:20:55 -0500 Message-Id: <20220201212056.29712-8-scott.the.elm@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220201212056.29712-1-scott.the.elm@gmail.com> References: <20220201212056.29712-1-scott.the.elm@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/8] cbs_mpeg2.c: use a while loop with a loop condition instead of an infinite loop 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 Cc: Scott Theisen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: as2wWe0FbOu3 This enhances the clarity of the code. --- libavcodec/cbs_mpeg2.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index 648b270f44..2b80266910 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -148,7 +148,7 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx, CodedBitstreamUnitType unit_type; uint32_t start_code = -1; size_t unit_size; - int err, i, final = 0; + int err, i = 0, final = 0; start = avpriv_find_start_code(frag->data, frag->data + frag->data_size, &start_code); @@ -157,7 +157,7 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx, return AVERROR_INVALIDDATA; } - for (i = 0;; i++) { + while (!final) { unit_type = start_code & 0xff; end = avpriv_find_start_code(start--, frag->data + frag->data_size, @@ -182,10 +182,8 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx, if (err < 0) return err; - if (final) - break; - start = end; + i++; } return 0;