History

avformat/mxfdec: narrow variable scopes

Marvin Scholz committed 2 years ago

Commit 6229e4a1 parent f5107e71 file · +16 −19Browse files

Unified · Split

libavformat/mxfdec.c+16−19
@@ -482,9 +482,7 @@ static int klv_read_packet(MXFContext *mxf, KLVPacket *klv, AVIOContext *pb) · 481 unmodified lines
482482
483483 static int mxf_get_stream_index(AVFormatContext *s, KLVPacket *klv, int body_sid)
484484 {
485− int i;
486−
487− for (i = 0; i < s->nb_streams; i++) {
485+ for (int i = 0; i < s->nb_streams; i++) {
488486 MXFTrack *track = s->streams[i]->priv_data;
489487 /* SMPTE 379M 7.3 */
490488 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 · 32 unmodified lines
523521 int cdp_identifier, cdp_length, cdp_footer_id, ccdata_id, cc_count;
524522 int line_num, sample_coding, sample_count;
525523 int did, sdid, data_length;
526− int i, ret;
524+ int ret;
527525
528526 if (count > 1)
529527 av_log(s, AV_LOG_WARNING, "unsupported multiple ANC packets (%d) per KLV packet\n", count);
530528
531− for (i = 0; i < count; i++) {
529+ for (int i = 0; i < count; i++) {
532530 if (length < 6) {
533531 av_log(s, AV_LOG_ERROR, "error reading s436m packet %"PRId64"\n", length);
534532 return AVERROR_INVALIDDATA;
@@ -597,7 +595,6 @@ static int mxf_get_d10_aes3_packet(AVIOContext *pb, AVStream *st, AVPacket *pkt, · 62 unmodified lines
597595 {
598596 const uint8_t *buf_ptr, *end_ptr;
599597 uint8_t *data_ptr;
600− int i;
601598
602599 if (length > 61444) /* worst case PAL 1920 samples 8 channels */
603600 return AVERROR_INVALIDDATA;
@@ -612,7 +609,7 @@ static int mxf_get_d10_aes3_packet(AVIOContext *pb, AVStream *st, AVPacket *pkt, · 8 unmodified lines
612609 return AVERROR_INVALIDDATA;
613610
614611 for (; end_ptr - buf_ptr >= st->codecpar->ch_layout.nb_channels * 4; ) {
615− for (i = 0; i < st->codecpar->ch_layout.nb_channels; i++) {
612+ for (int i = 0; i < st->codecpar->ch_layout.nb_channels; i++) {
616613 uint32_t sample = bytestream_get_le32(&buf_ptr);
617614 if (st->codecpar->bits_per_coded_sample == 24)
618615 bytestream_put_le24(&data_ptr, (sample >> 4) & 0xffffff);
@@ -2068,7 +2065,7 @@ static int mxf_compute_ptses_fake_index(MXFContext *mxf, MXFIndexTable *index_ta · 1449 unmodified lines
20682065 */
20692066 static int mxf_compute_index_tables(MXFContext *mxf)
20702067 {
2071− int i, j, k, ret, nb_sorted_segments;
2068+ int ret, nb_sorted_segments;
20722069 MXFIndexTableSegment **sorted_segments = NULL;
20732070
20742071 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) · 3 unmodified lines
20782075 }
20792076
20802077 /* sanity check and count unique BodySIDs/IndexSIDs */
2081− for (i = 0; i < nb_sorted_segments; i++) {
2078+ for (int i = 0; i < nb_sorted_segments; i++) {
20822079 if (i == 0 || sorted_segments[i-1]->index_sid != sorted_segments[i]->index_sid)
20832080 mxf->nb_index_tables++;
20842081 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) · 12 unmodified lines
20972094 }
20982095
20992096 /* distribute sorted segments to index tables */
2100− for (i = j = 0; i < nb_sorted_segments; i++) {
2097+ for (int i = 0, j = 0; i < nb_sorted_segments; i++) {
21012098 if (i != 0 && sorted_segments[i-1]->index_sid != sorted_segments[i]->index_sid) {
21022099 /* next IndexSID */
21032100 j++;
@@ -2106,7 +2103,7 @@ static int mxf_compute_index_tables(MXFContext *mxf) · 2 unmodified lines
21062103 mxf->index_tables[j].nb_segments++;
21072104 }
21082105
2109− for (i = j = 0; j < mxf->nb_index_tables; i += mxf->index_tables[j++].nb_segments) {
2106+ for (int i = 0, j = 0; j < mxf->nb_index_tables; i += mxf->index_tables[j++].nb_segments) {
21102107 MXFIndexTable *t = &mxf->index_tables[j];
21112108 MXFTrack *mxf_track = NULL;
21122109
@@ -2129,7 +2126,7 @@ static int mxf_compute_index_tables(MXFContext *mxf) · 16 unmodified lines
21292126 if ((ret = mxf_compute_ptses_fake_index(mxf, t)) < 0)
21302127 goto finish_decoding_index;
21312128
2132− for (k = 0; k < mxf->fc->nb_streams; k++) {
2129+ for (int k = 0; k < mxf->fc->nb_streams; k++) {
21332130 MXFTrack *track = mxf->fc->streams[k]->priv_data;
21342131 if (track && track->index_sid == t->index_sid) {
21352132 mxf_track = track;
@@ -2138,7 +2135,7 @@ static int mxf_compute_index_tables(MXFContext *mxf) · 2 unmodified lines
21382135 }
21392136
21402137 /* fix zero IndexDurations */
2141− for (k = 0; k < t->nb_segments; k++) {
2138+ for (int k = 0; k < t->nb_segments; k++) {
21422139 if (!t->segments[k]->index_edit_rate.num || !t->segments[k]->index_edit_rate.den) {
21432140 av_log(mxf->fc, AV_LOG_WARNING, "IndexSID %i segment %i has invalid IndexEditRate\n",
21442141 t->index_sid, k);
@@ -4087,17 +4084,16 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt) · 1942 unmodified lines
40874084 static int mxf_read_close(AVFormatContext *s)
40884085 {
40894086 MXFContext *mxf = s->priv_data;
4090− int i;
40914087
40924088 av_freep(&mxf->packages_refs);
40934089 av_freep(&mxf->essence_container_data_refs);
40944090
4095− for (i = 0; i < s->nb_streams; i++)
4091+ for (int i = 0; i < s->nb_streams; i++)
40964092 s->streams[i]->priv_data = NULL;
40974093
40984094 for (int type = 0; type < FF_ARRAY_ELEMS(mxf->metadata_set_groups); type++) {
40994095 MXFMetadataSetGroup *mg = &mxf->metadata_set_groups[type];
4100− for (i = 0; i < mg->metadata_sets_count; i++)
4096+ for (int i = 0; i < mg->metadata_sets_count; i++)
41014097 mxf_free_metadataset(mg->metadata_sets + i, type);
41024098 mg->metadata_sets_count = 0;
41034099 av_freep(&mg->metadata_sets);
@@ -4107,7 +4103,7 @@ static int mxf_read_close(AVFormatContext *s) · 3 unmodified lines
41074103 av_freep(&mxf->local_tags);
41084104
41094105 if (mxf->index_tables) {
4110− for (i = 0; i < mxf->nb_index_tables; i++) {
4106+ for (int i = 0; i < mxf->nb_index_tables; i++) {
41114107 av_freep(&mxf->index_tables[i].segments);
41124108 av_freep(&mxf->index_tables[i].ptses);
41134109 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 · 38 unmodified lines
41524148 int64_t seconds;
41534149 MXFContext* mxf = s->priv_data;
41544150 int64_t seekpos;
4155− int i, ret;
4151+ int ret;
41564152 MXFIndexTable *t;
41574153 MXFTrack *source_track = st->priv_data;
41584154
@@ -4182,6 +4178,7 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti · 23 unmodified lines
41824178
41834179 t = &mxf->index_tables[0];
41844180 if (t->index_sid != source_track->index_sid) {
4181+ int i;
41854182 /* If the first index table does not belong to the stream, then find a stream which does belong to the index table */
41864183 for (i = 0; i < s->nb_streams; i++) {
41874184 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 · 55 unmodified lines
42434240 }
42444241
42454242 // Update all tracks sample count
4246− for (i = 0; i < s->nb_streams; i++) {
4243+ for (int i = 0; i < s->nb_streams; i++) {
42474244 AVStream *cur_st = s->streams[i];
42484245 MXFTrack *cur_track = cur_st->priv_data;
42494246 if (cur_track) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t