History

avformat/movenc: rename MOVMuxContext.nb_streams to nb_tracks

It's more appropiate given what it keeps a count of.

James Almer committed 2 years ago

Commit 96f646c1 parent d119ae22 files · +42 −42Browse files

Showing the changes to libavformat (2 of 2 files). Show all

Unified · Split

2 files
  1. libavformat/movenc.c +41 −41
  2. libavformat/movenc.h +1 −1
libavformat/movenc.c+41−41
@@ -3836,7 +3836,7 @@ static int mov_write_iods_tag(AVIOContext *pb, MOVMuxContext *mov) · 3835 unmodified lines
38363836 int64_t pos = avio_tell(pb);
38373837 int audio_profile = mov->iods_audio_profile;
38383838 int video_profile = mov->iods_video_profile;
3839− for (i = 0; i < mov->nb_streams; i++) {
3839+ for (i = 0; i < mov->nb_tracks; i++) {
38403840 if (mov->tracks[i].entry > 0 || mov->flags & FF_MOV_FLAG_EMPTY_MOOV) {
38413841 has_audio |= mov->tracks[i].par->codec_type == AVMEDIA_TYPE_AUDIO;
38423842 has_video |= mov->tracks[i].par->codec_type == AVMEDIA_TYPE_VIDEO;
@@ -3878,7 +3878,7 @@ static int mov_write_mvex_tag(AVIOContext *pb, MOVMuxContext *mov) · 35 unmodified lines
38783878 int i;
38793879 avio_wb32(pb, 0x0); /* size */
38803880 ffio_wfourcc(pb, "mvex");
3881− for (i = 0; i < mov->nb_streams; i++)
3881+ for (i = 0; i < mov->nb_tracks; i++)
38823882 mov_write_trex_tag(pb, &mov->tracks[i]);
38833883 return update_size(pb, pos);
38843884 }
@@ -3890,7 +3890,7 @@ static int mov_write_mvhd_tag(AVIOContext *pb, MOVMuxContext *mov) · 5 unmodified lines
38903890 int version;
38913891 int timescale;
38923892
3893− for (i = 0; i < mov->nb_streams; i++) {
3893+ for (i = 0; i < mov->nb_tracks; i++) {
38943894 if (mov->tracks[i].entry > 0 && mov->tracks[i].timescale) {
38953895 int64_t max_track_len_temp = av_rescale_rnd(
38963896 calc_pts_duration(mov, &mov->tracks[i]),
@@ -4568,14 +4568,14 @@ static int mov_setup_track_ids(MOVMuxContext *mov, AVFormatContext *s) · 671 unmodified lines
45684568 next_generated_track_id = s->streams[i]->id;
45694569 }
45704570
4571− for (i = 0; i < mov->nb_streams; i++) {
4571+ for (i = 0; i < mov->nb_tracks; i++) {
45724572 if (mov->tracks[i].entry <= 0 && !(mov->flags & FF_MOV_FLAG_FRAGMENT))
45734573 continue;
45744574
45754575 mov->tracks[i].track_id = i >= s->nb_streams ? ++next_generated_track_id : s->streams[i]->id;
45764576 }
45774577 } else {
4578− for (i = 0; i < mov->nb_streams; i++) {
4578+ for (i = 0; i < mov->nb_tracks; i++) {
45794579 if (mov->tracks[i].entry <= 0 && !(mov->flags & FF_MOV_FLAG_FRAGMENT))
45804580 continue;
45814581
@@ -4598,7 +4598,7 @@ static int mov_write_moov_tag(AVIOContext *pb, MOVMuxContext *mov, · 16 unmodified lines
45984598
45994599 mov_setup_track_ids(mov, s);
46004600
4601− for (i = 0; i < mov->nb_streams; i++) {
4601+ for (i = 0; i < mov->nb_tracks; i++) {
46024602 if (mov->tracks[i].entry <= 0 && !(mov->flags & FF_MOV_FLAG_FRAGMENT))
46034603 continue;
46044604
@@ -4613,7 +4613,7 @@ static int mov_write_moov_tag(AVIOContext *pb, MOVMuxContext *mov, · 8 unmodified lines
46134613 mov->tracks[i].tref_tag = MKTAG('c','h','a','p');
46144614 mov->tracks[i].tref_id = mov->tracks[mov->chapter_track].track_id;
46154615 }
4616− for (i = 0; i < mov->nb_streams; i++) {
4616+ for (i = 0; i < mov->nb_tracks; i++) {
46174617 MOVTrack *track = &mov->tracks[i];
46184618 if (track->tag == MKTAG('r','t','p',' ')) {
46194619 track->tref_tag = MKTAG('h','i','n','t');
@@ -4624,14 +4624,14 @@ static int mov_write_moov_tag(AVIOContext *pb, MOVMuxContext *mov, · 4 unmodified lines
46244624 AV_PKT_DATA_FALLBACK_TRACK );
46254625 if (sd && sd->size == sizeof(int)) {
46264626 int *fallback = (int *)sd->data;
4627− if (*fallback >= 0 && *fallback < mov->nb_streams) {
4627+ if (*fallback >= 0 && *fallback < mov->nb_tracks) {
46284628 track->tref_tag = MKTAG('f','a','l','l');
46294629 track->tref_id = mov->tracks[*fallback].track_id;
46304630 }
46314631 }
46324632 }
46334633 }
4634− for (i = 0; i < mov->nb_streams; i++) {
4634+ for (i = 0; i < mov->nb_tracks; i++) {
46354635 if (mov->tracks[i].tag == MKTAG('t','m','c','d')) {
46364636 int src_trk = mov->tracks[i].src_track;
46374637 mov->tracks[src_trk].tref_tag = mov->tracks[i].tag;
@@ -4646,7 +4646,7 @@ static int mov_write_moov_tag(AVIOContext *pb, MOVMuxContext *mov, · 8 unmodified lines
46464646 mov_write_mvhd_tag(pb, mov);
46474647 if (mov->mode != MODE_MOV && mov->mode != MODE_AVIF && !mov->iods_skip)
46484648 mov_write_iods_tag(pb, mov);
4649− for (i = 0; i < mov->nb_streams; i++) {
4649+ for (i = 0; i < mov->nb_tracks; i++) {
46504650 if (mov->tracks[i].entry > 0 || mov->flags & FF_MOV_FLAG_FRAGMENT ||
46514651 mov->mode == MODE_AVIF) {
46524652 int ret = mov_write_trak_tag(s, pb, mov, &(mov->tracks[i]), i < s->nb_streams ? s->streams[i] : NULL);
@@ -4710,7 +4710,7 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov, AVFormat · 57 unmodified lines
47104710
47114711 mov_setup_track_ids(mov, s);
47124712
4713− for (i = 0; i < mov->nb_streams; i++) {
4713+ for (i = 0; i < mov->nb_tracks; i++) {
47144714 MOVTrack *track = &mov->tracks[i];
47154715 struct mpeg4_bit_rate_values bit_rates =
47164716 calculate_mpeg4_bit_rates(track);
@@ -5017,7 +5017,7 @@ static int mov_add_tfra_entries(AVIOContext *pb, MOVMuxContext *mov, int tracks, · 300 unmodified lines
50175017 int size)
50185018 {
50195019 int i;
5020− for (i = 0; i < mov->nb_streams; i++) {
5020+ for (i = 0; i < mov->nb_tracks; i++) {
50215021 MOVTrack *track = &mov->tracks[i];
50225022 MOVFragmentInfo *info;
50235023 if ((tracks >= 0 && i != tracks) || !track->entry)
@@ -5055,7 +5055,7 @@ static int mov_add_tfra_entries(AVIOContext *pb, MOVMuxContext *mov, int tracks, · 31 unmodified lines
50555055 static void mov_prune_frag_info(MOVMuxContext *mov, int tracks, int max)
50565056 {
50575057 int i;
5058− for (i = 0; i < mov->nb_streams; i++) {
5058+ for (i = 0; i < mov->nb_tracks; i++) {
50595059 MOVTrack *track = &mov->tracks[i];
50605060 if ((tracks >= 0 && i != tracks) || !track->entry)
50615061 continue;
@@ -5128,7 +5128,7 @@ static int mov_write_moof_tag_internal(AVIOContext *pb, MOVMuxContext *mov, · 66 unmodified lines
51285128 mov->first_trun = 1;
51295129
51305130 mov_write_mfhd_tag(pb, mov);
5131− for (i = 0; i < mov->nb_streams; i++) {
5131+ for (i = 0; i < mov->nb_tracks; i++) {
51325132 MOVTrack *track = &mov->tracks[i];
51335133 if (tracks >= 0 && i != tracks)
51345134 continue;
@@ -5222,7 +5222,7 @@ static int mov_write_sidx_tags(AVIOContext *pb, MOVMuxContext *mov, · 87 unmodified lines
52225222 } else {
52235223 avio_buf = pb;
52245224 }
5225− for (i = 0; i < mov->nb_streams; i++) {
5225+ for (i = 0; i < mov->nb_tracks; i++) {
52265226 MOVTrack *track = &mov->tracks[i];
52275227 if (tracks >= 0 && i != tracks)
52285228 continue;
@@ -5363,7 +5363,7 @@ static int mov_write_mfra_tag(AVIOContext *pb, MOVMuxContext *mov) · 134 unmodified lines
53635363 if (mov->flags & FF_MOV_FLAG_ISML)
53645364 goto done_mfra;
53655365
5366− for (i = 0; i < mov->nb_streams; i++) {
5366+ for (i = 0; i < mov->nb_tracks; i++) {
53675367 MOVTrack *track = &mov->tracks[i];
53685368 if (track->nb_frag_info)
53695369 mov_write_tfra_tag(mfra_pb, track);
@@ -5868,7 +5868,7 @@ static int mov_flush_fragment(AVFormatContext *s, int force) · 498 unmodified lines
58685868 }
58695869 }
58705870
5871− for (i = 0; i < mov->nb_streams; i++) {
5871+ for (i = 0; i < mov->nb_tracks; i++) {
58725872 MOVTrack *track = &mov->tracks[i];
58735873 if (track->entry <= 1)
58745874 continue;
@@ -5900,15 +5900,15 @@ static int mov_flush_fragment(AVFormatContext *s, int force) · 25 unmodified lines
59005900 uint8_t *buf;
59015901 int buf_size, moov_size;
59025902
5903− for (i = 0; i < mov->nb_streams; i++)
5903+ for (i = 0; i < mov->nb_tracks; i++)
59045904 if (!mov->tracks[i].entry && !is_cover_image(mov->tracks[i].st))
59055905 break;
59065906 /* Don't write the initial moov unless all tracks have data */
5907− if (i < mov->nb_streams && !force)
5907+ if (i < mov->nb_tracks && !force)
59085908 return 0;
59095909
59105910 moov_size = get_moov_size(s);
5911− for (i = 0; i < mov->nb_streams; i++)
5911+ for (i = 0; i < mov->nb_tracks; i++)
59125912 mov->tracks[i].data_offset = pos + moov_size + 8;
59135913
59145914 avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_HEADER);
@@ -5936,7 +5936,7 @@ static int mov_flush_fragment(AVFormatContext *s, int force) · 21 unmodified lines
59365936
59375937 mov->moov_written = 1;
59385938 mov->mdat_size = 0;
5939− for (i = 0; i < mov->nb_streams; i++) {
5939+ for (i = 0; i < mov->nb_tracks; i++) {
59405940 mov->tracks[i].entry = 0;
59415941 mov->tracks[i].end_reliable = 0;
59425942 }
@@ -5945,7 +5945,7 @@ static int mov_flush_fragment(AVFormatContext *s, int force) · 2 unmodified lines
59455945 }
59465946
59475947 if (mov->frag_interleave) {
5948− for (i = 0; i < mov->nb_streams; i++) {
5948+ for (i = 0; i < mov->nb_tracks; i++) {
59495949 MOVTrack *track = &mov->tracks[i];
59505950 int ret;
59515951 if ((ret = mov_flush_fragment_interleaving(s, track)) < 0)
@@ -5957,7 +5957,7 @@ static int mov_flush_fragment(AVFormatContext *s, int force) · 5 unmodified lines
59575957 mdat_size = avio_tell(mov->mdat_buf);
59585958 }
59595959
5960− for (i = 0; i < mov->nb_streams; i++) {
5960+ for (i = 0; i < mov->nb_tracks; i++) {
59615961 MOVTrack *track = &mov->tracks[i];
59625962 if (mov->flags & FF_MOV_FLAG_SEPARATE_MOOF || mov->frag_interleave)
59635963 track->data_offset = 0;
@@ -5986,7 +5986,7 @@ static int mov_flush_fragment(AVFormatContext *s, int force) · 22 unmodified lines
59865986 av_rescale(mov->tracks[first_track].cluster[0].dts, AV_TIME_BASE, mov->tracks[first_track].timescale),
59875987 (has_video ? starts_with_key : mov->tracks[first_track].cluster[0].flags & MOV_SYNC_SAMPLE) ? AVIO_DATA_MARKER_SYNC_POINT : AVIO_DATA_MARKER_BOUNDARY_POINT);
59885988
5989− for (i = 0; i < mov->nb_streams; i++) {
5989+ for (i = 0; i < mov->nb_tracks; i++) {
59905990 MOVTrack *track = &mov->tracks[i];
59915991 int buf_size, write_moof = 1, moof_tracks = -1;
59925992 uint8_t *buf;
@@ -6198,7 +6198,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) · 205 unmodified lines
61986198 if (par->codec_id == AV_CODEC_ID_H264 && trk->vos_len > 0 && *(uint8_t *)trk->vos_data != 1 && !TAG_IS_AVCI(trk->tag)) {
61996199 /* from x264 or from bytestream H.264 */
62006200 /* NAL reformatting needed */
6201− if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams) {
6201+ if (trk->hint_track >= 0 && trk->hint_track < mov->nb_tracks) {
62026202 ret = ff_avc_parse_nal_units_buf(pkt->data, &reformatted_data,
62036203 &size);
62046204 if (ret < 0)
@@ -6218,7 +6218,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) · 13 unmodified lines
62186218 } else if (par->codec_id == AV_CODEC_ID_HEVC && trk->vos_len > 6 &&
62196219 (AV_RB24(trk->vos_data) == 1 || AV_RB32(trk->vos_data) == 1)) {
62206220 /* extradata is Annex B, assume the bitstream is too and convert it */
6221− if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams) {
6221+ if (trk->hint_track >= 0 && trk->hint_track < mov->nb_tracks) {
62226222 ret = ff_hevc_annexb2mp4_buf(pkt->data, &reformatted_data,
62236223 &size, 0, NULL);
62246224 if (ret < 0)
@@ -6236,7 +6236,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) · 11 unmodified lines
62366236 }
62376237 }
62386238 } else if (par->codec_id == AV_CODEC_ID_AV1) {
6239− if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams) {
6239+ if (trk->hint_track >= 0 && trk->hint_track < mov->nb_tracks) {
62406240 ret = ff_av1_filter_obus_buf(pkt->data, &reformatted_data,
62416241 &size, &offset);
62426242 if (ret < 0)
@@ -6419,7 +6419,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) · 176 unmodified lines
64196419 trk->sample_count += samples_in_chunk;
64206420 mov->mdat_size += size;
64216421
6422− if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams)
6422+ if (trk->hint_track >= 0 && trk->hint_track < mov->nb_tracks)
64236423 ff_mov_add_hinted_packet(s, pkt, trk->hint_track, trk->entry,
64246424 reformatted_data ? reformatted_data + offset
64256425 : NULL, size);
@@ -6594,7 +6594,7 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt) · 168 unmodified lines
65946594 * 3) See mov_write_trailer for how the final end sample is
65956595 * handled.
65966596 */
6597− for (i = 0; i < mov->nb_streams; i++) {
6597+ for (i = 0; i < mov->nb_tracks; i++) {
65986598 MOVTrack *trk = &mov->tracks[i];
65996599 int ret;
66006600
@@ -6869,7 +6869,7 @@ static void mov_free(AVFormatContext *s) · 268 unmodified lines
68696869 avcodec_parameters_free(&mov->tracks[mov->chapter_track].par);
68706870 }
68716871
6872− for (i = 0; i < mov->nb_streams; i++) {
6872+ for (i = 0; i < mov->nb_tracks; i++) {
68736873 MOVTrack *const track = &mov->tracks[i];
68746874
68756875 if (track->tag == MKTAG('r','t','p',' '))
@@ -7101,14 +7101,14 @@ static int mov_init(AVFormatContext *s) · 225 unmodified lines
71017101 s->streams[0]->disposition |= AV_DISPOSITION_DEFAULT;
71027102 }
71037103
7104− mov->nb_streams = s->nb_streams;
7104+ mov->nb_tracks = s->nb_streams;
71057105 if (mov->mode & (MODE_MP4|MODE_MOV|MODE_IPOD) && s->nb_chapters)
7106− mov->chapter_track = mov->nb_streams++;
7106+ mov->chapter_track = mov->nb_tracks++;
71077107
71087108 if (mov->flags & FF_MOV_FLAG_RTP_HINT) {
71097109 for (i = 0; i < s->nb_streams; i++)
71107110 if (rtp_hinting_needed(s->streams[i]))
7111− mov->nb_streams++;
7111+ mov->nb_tracks++;
71127112 }
71137113
71147114 if (mov->write_btrt < 0) {
@@ -7145,12 +7145,12 @@ static int mov_init(AVFormatContext *s) · 30 unmodified lines
71457145 }
71467146 }
71477147
7148− mov->nb_streams += mov->nb_meta_tmcd;
7148+ mov->nb_tracks += mov->nb_meta_tmcd;
71497149 }
71507150
71517151 // Reserve an extra stream for chapters for the case where chapters
71527152 // are written in the trailer
7153− mov->tracks = av_calloc(mov->nb_streams + 1, sizeof(*mov->tracks));
7153+ mov->tracks = av_calloc(mov->nb_tracks + 1, sizeof(*mov->tracks));
71547154 if (!mov->tracks)
71557155 return AVERROR(ENOMEM);
71567156
@@ -7571,7 +7571,7 @@ static int compute_moov_size(AVFormatContext *s) · 414 unmodified lines
75717571 if (moov_size < 0)
75727572 return moov_size;
75737573
7574− for (i = 0; i < mov->nb_streams; i++)
7574+ for (i = 0; i < mov->nb_tracks; i++)
75757575 mov->tracks[i].data_offset += moov_size;
75767576
75777577 moov_size2 = get_moov_size(s);
@@ -7581,7 +7581,7 @@ static int compute_moov_size(AVFormatContext *s) · 3 unmodified lines
75817581 /* if the size changed, we just switched from stco to co64 and need to
75827582 * update the offsets */
75837583 if (moov_size2 != moov_size)
7584− for (i = 0; i < mov->nb_streams; i++)
7584+ for (i = 0; i < mov->nb_tracks; i++)
75857585 mov->tracks[i].data_offset += moov_size2 - moov_size;
75867586
75877587 return moov_size2;
@@ -7596,7 +7596,7 @@ static int compute_sidx_size(AVFormatContext *s) · 8 unmodified lines
75967596 if (sidx_size < 0)
75977597 return sidx_size;
75987598
7599− for (i = 0; i < mov->nb_streams; i++)
7599+ for (i = 0; i < mov->nb_tracks; i++)
76007600 mov->tracks[i].data_offset += sidx_size;
76017601
76027602 return sidx_size;
@@ -7645,7 +7645,7 @@ static int mov_write_trailer(AVFormatContext *s) · 42 unmodified lines
76457645 * Before actually writing the trailer, make sure that there are no
76467646 * dangling subtitles, that need a terminating sample.
76477647 */
7648− for (i = 0; i < mov->nb_streams; i++) {
7648+ for (i = 0; i < mov->nb_tracks; i++) {
76497649 MOVTrack *trk = &mov->tracks[i];
76507650 if (trk->par->codec_id == AV_CODEC_ID_MOV_TEXT &&
76517651 !trk->last_sample_is_subtitle_end) {
@@ -7664,7 +7664,7 @@ static int mov_write_trailer(AVFormatContext *s) · 12 unmodified lines
76647664 // when we are not doing fragments.
76657665 if (!mov->chapter_track && !(mov->flags & FF_MOV_FLAG_FRAGMENT)) {
76667666 if (mov->mode & (MODE_MP4|MODE_MOV|MODE_IPOD) && s->nb_chapters) {
7667− mov->chapter_track = mov->nb_streams++;
7667+ mov->chapter_track = mov->nb_tracks++;
76687668 if ((res = mov_create_chapter_track(s, mov->chapter_track)) < 0)
76697669 return res;
76707670 }
@@ -7716,7 +7716,7 @@ static int mov_write_trailer(AVFormatContext *s) · 45 unmodified lines
77167716 res = 0;
77177717 } else {
77187718 mov_auto_flush_fragment(s, 1);
7719− for (i = 0; i < mov->nb_streams; i++)
7719+ for (i = 0; i < mov->nb_tracks; i++)
77207720 mov->tracks[i].data_offset = 0;
77217721 if (mov->flags & FF_MOV_FLAG_GLOBAL_SIDX) {
77227722 int64_t end;
libavformat/movenc.h+1−1
@@ -188,7 +188,7 @@ typedef struct MOVMuxContext { · 187 unmodified lines
188188 const AVClass *av_class;
189189 int mode;
190190 int64_t time;
191− int nb_streams;
191+ int nb_tracks;
192192 int nb_meta_tmcd; ///< number of new created tmcd track based on metadata (aka not data copy)
193193 int chapter_track; ///< qt chapter track number
194194 int64_t mdat_pos;

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