From patchwork Sun Sep 8 23:35:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51435 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1396483vqu; Sun, 8 Sep 2024 20:24:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXHmuIVNo54a5t1+svQLlA2jM4M7pcf2wlC/9IHFBDae7NqxTeiCExnfSxcSJGZ9TGJNGkdaGYXCqv3PWC4G0DW@gmail.com X-Google-Smtp-Source: AGHT+IHP5gZA6NpB7APpa0JRJWqOS5MwAP21dBXBsaZjz4rQ7OVdVS/LwqH9DfnkOTH3i7EVkeZR X-Received: by 2002:a2e:a9a8:0:b0:2f0:23f7:8e6d with SMTP id 38308e7fff4ca-2f751fbab7emr26972081fa.8.1725852260232; Sun, 08 Sep 2024 20:24:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725852260; cv=none; d=google.com; s=arc-20240605; b=NnhqV0++gM0arxRqhhgJvi9OORxbf7oivuVWQKSTJJ820fd7icBmLb6epui5GF5XL6 ruoWVzTTxsoI1AKuU18cc29+y77uwelT5l47bMCk93Qns5yRZYkGgPkrOGc46Wfi7crs n2aEdmswrhGxJC07NvxyQeZkD4RQjH18pgn+BTmTPcigWJ7kZHGeutCxHM5FKkjM6hWM ffarSt/ARi0gFwVyWrp9Gln6wyNDff9A9OE4mh+wuo0EG8LGKKI/HeFmX3F8vCZRziyz N9aKzBsfBZ6lPt1xdHjteef52peLmO9sJnarZwzkaRZdt04bJwpUTLtFWaz07fsryHd2 4SIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:date:from:to:message-id:in-reply-to :dkim-signature:delivered-to; bh=qg2oEH9Kf4jQ74H3Q/osE5z3WIz7qq04d9PcQEXqG2w=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=Y9ut233QeRn8fvxkyEv3Sr1Y6eqwS2lWawca6nAkVEt6k1XUWOF/twXaw5t64jsSb/ bqy/lGKgaQcDZnS13HKB6kBbbEEPRMDOw6Q9wDDbCX/O5TrrPbWpCZcJLqfg8316kFcu FDLiBGKiAslQIB/vdzPks9AvJoMthjcULnAjFQaal8uhJunomD9UBcpE8PFnxdlu3PyG ZW12EneYJhQ8kvbsJ0o58cvlsTioJZQMFgQW7Ea4I10QB9T8pP2Qs2iNXRo9Q5LSCE8y qDmbTRD/LKBnY7mmuDzKDQNkgedZo6dN9Wp3hlw2euY7jbXI6MHLtDu+D82JRtOXYTXW xGGQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=ju63uQ0r; 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; dara=fail header.i=@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 38308e7fff4ca-2f75c0b857esi12777201fa.633.2024.09.08.20.24.19; Sun, 08 Sep 2024 20:24:20 -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=20230601 header.b=ju63uQ0r; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 35E2C68DE1F; Mon, 9 Sep 2024 03:56:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A54268DD39 for ; Mon, 9 Sep 2024 03:55:44 +0300 (EEST) Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-374c1120a32so2167802f8f.1 for ; Sun, 08 Sep 2024 17:55:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843343; x=1726448143; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=BrJvW0ZCcXDx9lZwE1GE5DZKOev6ump3IZ/awozbnZk=; b=ju63uQ0rzs+PAeOMzqw5Iu2fMMIlekCo6vMGjLvCBkOXsMakg+s/TpzYC1QjCwBPSD A76tYLs1viDSQyTRoKH73B1GWWc5f6Babat/0ao3v7KWwcr/0dgZVPrBG4Yb8SocfUOa Fwsl4FllS+TL0g/1ew8yVlKOeARqGi/y0oOuN7EJt201ek2TR8LrZKI56srKvfZtMFJ7 nmHJGJu2SvxEz/S5pHdxQQdQUjEphGvVfrkj4NCt4JNIhfKUaD76LpPymEXcrWgC7weo SdWyTRipMhu79RreIuYhZ/xWuqkRynL7BaR2KYqNIDjUrJffbSBwxV5iM4qnVVJ0IPVJ WyNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843343; x=1726448143; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=BrJvW0ZCcXDx9lZwE1GE5DZKOev6ump3IZ/awozbnZk=; b=Qs4j4ISqA3+cO5T5GtDWBTJSKxOBfSxHuMye9+D7x9RoCOuFbGX0DefDUT3Nqah5z1 zy+jnywKZvx1XJzN2aqjKFoGQAPrvSoxz9iL+GT3GcDkxdl16OgLHNXcmS7+DFb+ZOK7 XfaX2lNrvrBJMjCmhmHWe8XMDD5WY0L7eExVujuoQFzdTyeNTOa6WJg406aw2dCnSirH xt/d87kjPJHrrZQ4hI9k0A5DowVrKOuUXwM2f/dfSwu3g/EyMQQTpKc8kyD3/Mfzekwt Cx9kGkMb3Pzmk2ojnj3SLzVv9/t2rtL7X6lnqItndIHidRq4f2suhVIOC028bKF3UqBk X+fw== X-Gm-Message-State: AOJu0YwNdkz8qKsgpX0XKq4ZRBspxNlVx3rFnsFzMCxIzNEErtrHRjFv 5OrqRSk4m5cWIlM6j09RUugtK4iF6Koa7Jys3QKVyiJK4YbAcxjurd/XOw== X-Received: by 2002:a05:6000:e91:b0:371:844f:e0c with SMTP id ffacd0b85a97d-378895c5c43mr5337473f8f.10.1725843343603; Sun, 08 Sep 2024 17:55:43 -0700 (PDT) Received: from localhost (p200300cccf1178009d94fda8472792f7.dip0.t-ipconnect.de. [2003:cc:cf11:7800:9d94:fda8:4727:92f7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649728sm4583399f8f.16.2024.09.08.17.55.42 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:43 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Mon, 9 Sep 2024 01:35:36 +0200 Subject: [FFmpeg-devel] [PATCH 46/60] avformat/vividas: narrow variable scopes 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: fEfziImRMxeN --- libavformat/vividas.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/libavformat/vividas.c b/libavformat/vividas.c index 4cad6c6456..e984dd0b21 100644 --- a/libavformat/vividas.c +++ b/libavformat/vividas.c @@ -282,7 +282,7 @@ static uint8_t *read_sb_block(AVIOContext *src, unsigned *size, static int track_header(VividasDemuxContext *viv, AVFormatContext *s, const uint8_t *buf, int size) { - int i, j, ret; + int ret; int64_t off; int val_1; int num_video; @@ -296,11 +296,11 @@ static int track_header(VividasDemuxContext *viv, AVFormatContext *s, val_1 = ffio_read_varlen(pb); - for (i=0;inum_audio != 1) av_log(s, AV_LOG_WARNING, "number of audio tracks %d is not 1\n", viv->num_audio); - for(i=0;inum_audio;i++) { + for (int i = 0; i < viv->num_audio; i++) { int q; AVStream *st = avformat_new_stream(s, NULL); if (!st) @@ -394,7 +394,7 @@ static int track_header(VividasDemuxContext *viv, AVFormatContext *s, avio_r8(pb); // '19' ffio_read_varlen(pb); // len_3 num_data = avio_r8(pb); - for (j = 0; j < num_data; j++) { + for (int j = 0; j < num_data; j++) { int64_t len = ffio_read_varlen(pb); if (len < 0 || len > INT_MAX/2 - xd_size) { return AVERROR_INVALIDDATA; @@ -410,13 +410,13 @@ static int track_header(VividasDemuxContext *viv, AVFormatContext *s, p = st->codecpar->extradata; p[0] = 2; - for (j = 0; j < num_data - 1; j++) { + for (int j = 0; j < num_data - 1; j++) { unsigned delta = av_xiphlacing(&p[offset], data_len[j]); av_assert0(delta <= xd_size - offset); offset += delta; } - for (j = 0; j < num_data; j++) { + for (int j = 0; j < num_data; j++) { ret = avio_read(pb, &p[offset], data_len[j]); if (ret < data_len[j]) { st->codecpar->extradata_size = 0; @@ -443,7 +443,6 @@ static int track_index(VividasDemuxContext *viv, AVFormatContext *s, int maxnp=0; FFIOContext pb0; AVIOContext *const pb = &pb0.pub; - int i; int64_t filesize = avio_size(s->pb); uint64_t n_sb_blocks_tmp; @@ -463,7 +462,7 @@ static int track_index(VividasDemuxContext *viv, AVFormatContext *s, off = 0; poff = 0; - for (i = 0; i < viv->n_sb_blocks; i++) { + for (int i = 0; i < viv->n_sb_blocks; i++) { uint64_t size_tmp = ffio_read_varlen(pb); uint64_t n_packets_tmp = ffio_read_varlen(pb); @@ -496,7 +495,6 @@ static int track_index(VividasDemuxContext *viv, AVFormatContext *s, static void load_sb_block(AVFormatContext *s, VividasDemuxContext *viv, unsigned expected_size) { uint32_t size = 0; - int i; AVIOContext *pb = 0; if (viv->sb_pb) { @@ -526,7 +524,7 @@ static void load_sb_block(AVFormatContext *s, VividasDemuxContext *viv, unsigned viv->n_sb_entries = viv->sb_blocks[viv->current_sb].n_packets; - for (i = 0; i < viv->n_sb_entries; i++) { + for (int i = 0; i < viv->n_sb_entries; i++) { viv->sb_entries[i].size = ffio_read_varlen(pb); viv->sb_entries[i].flag = avio_r8(pb); }