From patchwork Mon Sep 9 00:04:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51418 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1369576vqu; Sun, 8 Sep 2024 18:39:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWfFSVSD+JKdd43oWUda+JW3PoRf/E0x0B5DZgzshKSlzizu5UuXj1A9eHsiyZugicPSPHIz4iahgVhBMXmOuf0@gmail.com X-Google-Smtp-Source: AGHT+IGmHE+5oHO9ouQJQGiuUfhLdbqSN/spcZAFNby/yRYcDjKRmC9SCjSR2F41Cy7brznQJzdk X-Received: by 2002:a17:906:599c:b0:a7a:b895:6571 with SMTP id a640c23a62f3a-a8a8892145cmr270179666b.9.1725845954655; Sun, 08 Sep 2024 18:39:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725845954; cv=none; d=google.com; s=arc-20240605; b=lRtvi70p2RaqHLdrzUgdqdApkqwSPJ1J9AYsbJ+VjduF//+/bzh914K1jKNsYUHcJN 9F6zL1uC8CFb25UapWztoNYw4PsdqaqNaU927EJa2cLPsNIcuxZ7Fe/RV8rZxEZaDxva ahOis0RCmxMOkExnulYHBmLX4h/V7uTN9ERAgpHsnr8E5jYvBqrrjPA+cuXT054e6o+m MEiNS1ImLrxhOYRGSF1tf96MZmcHNFrj+NFuLDAYdifLa/EGTOpyPWVxrZc5RfmD0yFK umGzQI8DWfwbJuqzAeDY3L2U4vfCB0N5dnxHG5XIaQMmQtH87UbbJr5d4loMyvrEGhWm 2qfQ== 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=9mbbDvB8bLGqb6uI9cIuUkxb/FNQMoVGYwvGzmUS5Qs=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=el4S4YbkW/RWvcy/lNOvvVEnwEunrk7o5bIEnrMM4dJVQ2TW1ODeHWIzxx+lz8yIOU yim1dFJso+OVPmZ/kocOnkKCUau+jzX8CidPTWAOwiZ4UyNuUv0plD4O2cck5IovCFo1 /IGzJDi2MyAVuOeJMUyy9+IKhDHmpr1vgy29xzhyOW3HH4fmrSWIIN1XqPcN0FMptRcn kkReKkH72lcAVoRU35KD7reuZvVNd4DcX4c0Z3P6JEnT1YRj65XNFlfHlOa8RYBdxqXL fX1BOqytAjTZulQD6PddASjPG2tymlc4EVKyK9Qk0St8zvhUFiLDFdjQxuwvN4xPwYPb tJ5g==; 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=HFd36cj1; 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 a640c23a62f3a-a8d25c60c51si300003766b.446.2024.09.08.18.39.14; Sun, 08 Sep 2024 18:39:14 -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=HFd36cj1; 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 0E23568DE53; Mon, 9 Sep 2024 03:56:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E72468DD77 for ; Mon, 9 Sep 2024 03:55:48 +0300 (EEST) Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-374c962e5adso2042365f8f.1 for ; Sun, 08 Sep 2024 17:55:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843348; x=1726448148; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=suTqtxGEvsHNm8sVv5oAlkpwA0Wp/HGvRKGUs7mZbdk=; b=HFd36cj1TNDD0/a/9jh4IkrP9dan5KDiCfZY+0rmzMdUXaIwvAbxkMoDiUju/CgeUh kfdPCennMRBWmUgww9rVQE5GL/6ZaX+KYEK9lLUAzaZ98ImtfXhtiUR9M84sMTJ5Q6o/ vvCsV4NHus/aW6IuJ6WW7YmlcUzq1b/N5Rm86V0l1GtQR0ZbLjVaU1YXYW01U3oTxgwE Ejht9IHLtGkj044Kd4pI3C1dlN6pXea3TqcyejDfLLeJyWxGGRpFBT64GzImXeFenyIV zDisibM1nYKp8iYL1XMO79EqntwCICAs1Uu/U3FEmpelhMHuubl/igMZ01PZNYTUSwGq YR7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843348; x=1726448148; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=suTqtxGEvsHNm8sVv5oAlkpwA0Wp/HGvRKGUs7mZbdk=; b=QkTk20/7w1VSBBzxX6NCFrV/i+H6m/B769FRnto/gE1k6BF0UNRp3ZIlz98kStOq4x Bs/nOxXFjAE2SjgwiOA+MwkrbRBF/ei4m8rNl1eiGbx7OUcURS/OUYkW8VZLFOYS/WKu nXy2uUzFaZxGWT+D72c7dZ/NQXUuEyuGYr0Kmv1/Dv/6tV+pmjF+ITAN7fyyS/gtnwnU 7ismndlV0x5TiCRh0Jj3Ia0vUI3iWGXF48pNMXz/QDAoXFoHkPy96Q+IX6EtG4kieUhU DgeO3iCZ9XTuzqh++UKKbe/12gbDmU0/hG3PHGTMxJ6PKVq0l6OsHBYw/UkJnOgT0ZJL vKxQ== X-Gm-Message-State: AOJu0Yzk/NeBXbqtXt+fd0TX1X2oL4o6S/Uijrs1BanmbkoKtJyV3DT6 a8PHkHxnA+vd3CR6HLkb2pzYpKu2/JDyKujZrNSRyQKOl2Lc8HUZpLOjdg== X-Received: by 2002:a5d:4a90:0:b0:376:e2f4:5414 with SMTP id ffacd0b85a97d-377998aaf1bmr9018595f8f.5.1725843348370; Sun, 08 Sep 2024 17:55:48 -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.47 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:47 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Mon, 9 Sep 2024 02:04:18 +0200 Subject: [FFmpeg-devel] [PATCH 52/60] avformat/mxfdec: 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: ThihMRjkHtgl --- libavformat/mxfdec.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index eb7d301444..8a83bdfa04 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -482,9 +482,7 @@ static int klv_read_packet(MXFContext *mxf, KLVPacket *klv, AVIOContext *pb) static int mxf_get_stream_index(AVFormatContext *s, KLVPacket *klv, int body_sid) { - int i; - - for (i = 0; i < s->nb_streams; i++) { + for (int i = 0; i < s->nb_streams; i++) { MXFTrack *track = s->streams[i]->priv_data; /* SMPTE 379M 7.3 */ if (track && (!body_sid || !track->body_sid || track->body_sid == body_sid) && !memcmp(klv->key + sizeof(mxf_essence_element_key), track->track_number, sizeof(track->track_number))) @@ -523,12 +521,12 @@ static int mxf_get_eia608_packet(AVFormatContext *s, AVStream *st, AVPacket *pkt int cdp_identifier, cdp_length, cdp_footer_id, ccdata_id, cc_count; int line_num, sample_coding, sample_count; int did, sdid, data_length; - int i, ret; + int ret; if (count > 1) av_log(s, AV_LOG_WARNING, "unsupported multiple ANC packets (%d) per KLV packet\n", count); - for (i = 0; i < count; i++) { + for (int i = 0; i < count; i++) { if (length < 6) { av_log(s, AV_LOG_ERROR, "error reading s436m packet %"PRId64"\n", length); return AVERROR_INVALIDDATA; @@ -597,7 +595,6 @@ static int mxf_get_d10_aes3_packet(AVIOContext *pb, AVStream *st, AVPacket *pkt, { const uint8_t *buf_ptr, *end_ptr; uint8_t *data_ptr; - int i; if (length > 61444) /* worst case PAL 1920 samples 8 channels */ return AVERROR_INVALIDDATA; @@ -612,7 +609,7 @@ static int mxf_get_d10_aes3_packet(AVIOContext *pb, AVStream *st, AVPacket *pkt, return AVERROR_INVALIDDATA; for (; end_ptr - buf_ptr >= st->codecpar->ch_layout.nb_channels * 4; ) { - for (i = 0; i < st->codecpar->ch_layout.nb_channels; i++) { + for (int i = 0; i < st->codecpar->ch_layout.nb_channels; i++) { uint32_t sample = bytestream_get_le32(&buf_ptr); if (st->codecpar->bits_per_coded_sample == 24) bytestream_put_le24(&data_ptr, (sample >> 4) & 0xffffff); @@ -2068,7 +2065,7 @@ static int mxf_compute_ptses_fake_index(MXFContext *mxf, MXFIndexTable *index_ta */ static int mxf_compute_index_tables(MXFContext *mxf) { - int i, j, k, ret, nb_sorted_segments; + int ret, nb_sorted_segments; MXFIndexTableSegment **sorted_segments = NULL; if ((ret = mxf_get_sorted_table_segments(mxf, &nb_sorted_segments, &sorted_segments)) || @@ -2078,7 +2075,7 @@ static int mxf_compute_index_tables(MXFContext *mxf) } /* sanity check and count unique BodySIDs/IndexSIDs */ - for (i = 0; i < nb_sorted_segments; i++) { + for (int i = 0; i < nb_sorted_segments; i++) { if (i == 0 || sorted_segments[i-1]->index_sid != sorted_segments[i]->index_sid) mxf->nb_index_tables++; else if (sorted_segments[i-1]->body_sid != sorted_segments[i]->body_sid) { @@ -2097,7 +2094,7 @@ static int mxf_compute_index_tables(MXFContext *mxf) } /* distribute sorted segments to index tables */ - for (i = j = 0; i < nb_sorted_segments; i++) { + for (int i = 0, j = 0; i < nb_sorted_segments; i++) { if (i != 0 && sorted_segments[i-1]->index_sid != sorted_segments[i]->index_sid) { /* next IndexSID */ j++; @@ -2106,7 +2103,7 @@ static int mxf_compute_index_tables(MXFContext *mxf) mxf->index_tables[j].nb_segments++; } - for (i = j = 0; j < mxf->nb_index_tables; i += mxf->index_tables[j++].nb_segments) { + for (int i = 0, j = 0; j < mxf->nb_index_tables; i += mxf->index_tables[j++].nb_segments) { MXFIndexTable *t = &mxf->index_tables[j]; MXFTrack *mxf_track = NULL; @@ -2129,7 +2126,7 @@ static int mxf_compute_index_tables(MXFContext *mxf) if ((ret = mxf_compute_ptses_fake_index(mxf, t)) < 0) goto finish_decoding_index; - for (k = 0; k < mxf->fc->nb_streams; k++) { + for (int k = 0; k < mxf->fc->nb_streams; k++) { MXFTrack *track = mxf->fc->streams[k]->priv_data; if (track && track->index_sid == t->index_sid) { mxf_track = track; @@ -2138,7 +2135,7 @@ static int mxf_compute_index_tables(MXFContext *mxf) } /* fix zero IndexDurations */ - for (k = 0; k < t->nb_segments; k++) { + for (int k = 0; k < t->nb_segments; k++) { if (!t->segments[k]->index_edit_rate.num || !t->segments[k]->index_edit_rate.den) { av_log(mxf->fc, AV_LOG_WARNING, "IndexSID %i segment %i has invalid IndexEditRate\n", t->index_sid, k); @@ -4087,17 +4084,16 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt) static int mxf_read_close(AVFormatContext *s) { MXFContext *mxf = s->priv_data; - int i; av_freep(&mxf->packages_refs); av_freep(&mxf->essence_container_data_refs); - for (i = 0; i < s->nb_streams; i++) + for (int i = 0; i < s->nb_streams; i++) s->streams[i]->priv_data = NULL; for (int type = 0; type < FF_ARRAY_ELEMS(mxf->metadata_set_groups); type++) { MXFMetadataSetGroup *mg = &mxf->metadata_set_groups[type]; - for (i = 0; i < mg->metadata_sets_count; i++) + for (int i = 0; i < mg->metadata_sets_count; i++) mxf_free_metadataset(mg->metadata_sets + i, type); mg->metadata_sets_count = 0; av_freep(&mg->metadata_sets); @@ -4107,7 +4103,7 @@ static int mxf_read_close(AVFormatContext *s) av_freep(&mxf->local_tags); if (mxf->index_tables) { - for (i = 0; i < mxf->nb_index_tables; i++) { + for (int i = 0; i < mxf->nb_index_tables; i++) { av_freep(&mxf->index_tables[i].segments); av_freep(&mxf->index_tables[i].ptses); av_freep(&mxf->index_tables[i].fake_index); @@ -4152,7 +4148,7 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti int64_t seconds; MXFContext* mxf = s->priv_data; int64_t seekpos; - int i, ret; + int ret; MXFIndexTable *t; MXFTrack *source_track = st->priv_data; @@ -4182,6 +4178,7 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti t = &mxf->index_tables[0]; if (t->index_sid != source_track->index_sid) { + int i; /* If the first index table does not belong to the stream, then find a stream which does belong to the index table */ for (i = 0; i < s->nb_streams; i++) { MXFTrack *new_source_track = s->streams[i]->priv_data; @@ -4243,7 +4240,7 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti } // Update all tracks sample count - for (i = 0; i < s->nb_streams; i++) { + for (int i = 0; i < s->nb_streams; i++) { AVStream *cur_st = s->streams[i]; MXFTrack *cur_track = cur_st->priv_data; if (cur_track) {