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

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
3836 int64_t pos = avio_tell(pb);3836 int64_t pos = avio_tell(pb);
3837 int audio_profile = mov->iods_audio_profile;3837 int audio_profile = mov->iods_audio_profile;
3838 int video_profile = mov->iods_video_profile;3838 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++) {
3840 if (mov->tracks[i].entry > 0 || mov->flags & FF_MOV_FLAG_EMPTY_MOOV) {3840 if (mov->tracks[i].entry > 0 || mov->flags & FF_MOV_FLAG_EMPTY_MOOV) {
3841 has_audio |= mov->tracks[i].par->codec_type == AVMEDIA_TYPE_AUDIO;3841 has_audio |= mov->tracks[i].par->codec_type == AVMEDIA_TYPE_AUDIO;
3842 has_video |= mov->tracks[i].par->codec_type == AVMEDIA_TYPE_VIDEO;3842 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
3878 int i;3878 int i;
3879 avio_wb32(pb, 0x0); /* size */3879 avio_wb32(pb, 0x0); /* size */
3880 ffio_wfourcc(pb, "mvex");3880 ffio_wfourcc(pb, "mvex");
3881 for (i = 0; i < mov->nb_streams; i++)3881 for (i = 0; i < mov->nb_tracks; i++)
3882 mov_write_trex_tag(pb, &mov->tracks[i]);3882 mov_write_trex_tag(pb, &mov->tracks[i]);
3883 return update_size(pb, pos);3883 return update_size(pb, pos);
3884}3884}
@@ -3890,7 +3890,7 @@ static int mov_write_mvhd_tag(AVIOContext *pb, MOVMuxContext *mov) · 5 unmodified lines
3890 int version;3890 int version;
3891 int timescale;3891 int timescale;
3892 3892
3893 for (i = 0; i < mov->nb_streams; i++) {3893 for (i = 0; i < mov->nb_tracks; i++) {
3894 if (mov->tracks[i].entry > 0 && mov->tracks[i].timescale) {3894 if (mov->tracks[i].entry > 0 && mov->tracks[i].timescale) {
3895 int64_t max_track_len_temp = av_rescale_rnd(3895 int64_t max_track_len_temp = av_rescale_rnd(
3896 calc_pts_duration(mov, &mov->tracks[i]),3896 calc_pts_duration(mov, &mov->tracks[i]),
@@ -4568,14 +4568,14 @@ static int mov_setup_track_ids(MOVMuxContext *mov, AVFormatContext *s) · 671 unmodified lines
4568 next_generated_track_id = s->streams[i]->id;4568 next_generated_track_id = s->streams[i]->id;
4569 }4569 }
4570 4570
4571 for (i = 0; i < mov->nb_streams; i++) {4571 for (i = 0; i < mov->nb_tracks; i++) {
4572 if (mov->tracks[i].entry <= 0 && !(mov->flags & FF_MOV_FLAG_FRAGMENT))4572 if (mov->tracks[i].entry <= 0 && !(mov->flags & FF_MOV_FLAG_FRAGMENT))
4573 continue;4573 continue;
4574 4574
4575 mov->tracks[i].track_id = i >= s->nb_streams ? ++next_generated_track_id : s->streams[i]->id;4575 mov->tracks[i].track_id = i >= s->nb_streams ? ++next_generated_track_id : s->streams[i]->id;
4576 }4576 }
4577 } else {4577 } else {
4578 for (i = 0; i < mov->nb_streams; i++) {4578 for (i = 0; i < mov->nb_tracks; i++) {
4579 if (mov->tracks[i].entry <= 0 && !(mov->flags & FF_MOV_FLAG_FRAGMENT))4579 if (mov->tracks[i].entry <= 0 && !(mov->flags & FF_MOV_FLAG_FRAGMENT))
4580 continue;4580 continue;
4581 4581
@@ -4598,7 +4598,7 @@ static int mov_write_moov_tag(AVIOContext *pb, MOVMuxContext *mov, · 16 unmodified lines
4598 4598
4599 mov_setup_track_ids(mov, s);4599 mov_setup_track_ids(mov, s);
4600 4600
4601 for (i = 0; i < mov->nb_streams; i++) {4601 for (i = 0; i < mov->nb_tracks; i++) {
4602 if (mov->tracks[i].entry <= 0 && !(mov->flags & FF_MOV_FLAG_FRAGMENT))4602 if (mov->tracks[i].entry <= 0 && !(mov->flags & FF_MOV_FLAG_FRAGMENT))
4603 continue;4603 continue;
4604 4604
@@ -4613,7 +4613,7 @@ static int mov_write_moov_tag(AVIOContext *pb, MOVMuxContext *mov, · 8 unmodified lines
4613 mov->tracks[i].tref_tag = MKTAG('c','h','a','p');4613 mov->tracks[i].tref_tag = MKTAG('c','h','a','p');
4614 mov->tracks[i].tref_id = mov->tracks[mov->chapter_track].track_id;4614 mov->tracks[i].tref_id = mov->tracks[mov->chapter_track].track_id;
4615 }4615 }
4616 for (i = 0; i < mov->nb_streams; i++) {4616 for (i = 0; i < mov->nb_tracks; i++) {
4617 MOVTrack *track = &mov->tracks[i];4617 MOVTrack *track = &mov->tracks[i];
4618 if (track->tag == MKTAG('r','t','p',' ')) {4618 if (track->tag == MKTAG('r','t','p',' ')) {
4619 track->tref_tag = MKTAG('h','i','n','t');4619 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
4624 AV_PKT_DATA_FALLBACK_TRACK );4624 AV_PKT_DATA_FALLBACK_TRACK );
4625 if (sd && sd->size == sizeof(int)) {4625 if (sd && sd->size == sizeof(int)) {
4626 int *fallback = (int *)sd->data;4626 int *fallback = (int *)sd->data;
4627 if (*fallback >= 0 && *fallback < mov->nb_streams) {4627 if (*fallback >= 0 && *fallback < mov->nb_tracks) {
4628 track->tref_tag = MKTAG('f','a','l','l');4628 track->tref_tag = MKTAG('f','a','l','l');
4629 track->tref_id = mov->tracks[*fallback].track_id;4629 track->tref_id = mov->tracks[*fallback].track_id;
4630 }4630 }
4631 }4631 }
4632 }4632 }
4633 }4633 }
4634 for (i = 0; i < mov->nb_streams; i++) {4634 for (i = 0; i < mov->nb_tracks; i++) {
4635 if (mov->tracks[i].tag == MKTAG('t','m','c','d')) {4635 if (mov->tracks[i].tag == MKTAG('t','m','c','d')) {
4636 int src_trk = mov->tracks[i].src_track;4636 int src_trk = mov->tracks[i].src_track;
4637 mov->tracks[src_trk].tref_tag = mov->tracks[i].tag;4637 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
4646 mov_write_mvhd_tag(pb, mov);4646 mov_write_mvhd_tag(pb, mov);
4647 if (mov->mode != MODE_MOV && mov->mode != MODE_AVIF && !mov->iods_skip)4647 if (mov->mode != MODE_MOV && mov->mode != MODE_AVIF && !mov->iods_skip)
4648 mov_write_iods_tag(pb, mov);4648 mov_write_iods_tag(pb, mov);
4649 for (i = 0; i < mov->nb_streams; i++) {4649 for (i = 0; i < mov->nb_tracks; i++) {
4650 if (mov->tracks[i].entry > 0 || mov->flags & FF_MOV_FLAG_FRAGMENT ||4650 if (mov->tracks[i].entry > 0 || mov->flags & FF_MOV_FLAG_FRAGMENT ||
4651 mov->mode == MODE_AVIF) {4651 mov->mode == MODE_AVIF) {
4652 int ret = mov_write_trak_tag(s, pb, mov, &(mov->tracks[i]), i < s->nb_streams ? s->streams[i] : NULL);4652 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
4710 4710
4711 mov_setup_track_ids(mov, s);4711 mov_setup_track_ids(mov, s);
4712 4712
4713 for (i = 0; i < mov->nb_streams; i++) {4713 for (i = 0; i < mov->nb_tracks; i++) {
4714 MOVTrack *track = &mov->tracks[i];4714 MOVTrack *track = &mov->tracks[i];
4715 struct mpeg4_bit_rate_values bit_rates =4715 struct mpeg4_bit_rate_values bit_rates =
4716 calculate_mpeg4_bit_rates(track);4716 calculate_mpeg4_bit_rates(track);
@@ -5017,7 +5017,7 @@ static int mov_add_tfra_entries(AVIOContext *pb, MOVMuxContext *mov, int tracks, · 300 unmodified lines
5017 int size)5017 int size)
5018{5018{
5019 int i;5019 int i;
5020 for (i = 0; i < mov->nb_streams; i++) {5020 for (i = 0; i < mov->nb_tracks; i++) {
5021 MOVTrack *track = &mov->tracks[i];5021 MOVTrack *track = &mov->tracks[i];
5022 MOVFragmentInfo *info;5022 MOVFragmentInfo *info;
5023 if ((tracks >= 0 && i != tracks) || !track->entry)5023 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
5055static void mov_prune_frag_info(MOVMuxContext *mov, int tracks, int max)5055static void mov_prune_frag_info(MOVMuxContext *mov, int tracks, int max)
5056{5056{
5057 int i;5057 int i;
5058 for (i = 0; i < mov->nb_streams; i++) {5058 for (i = 0; i < mov->nb_tracks; i++) {
5059 MOVTrack *track = &mov->tracks[i];5059 MOVTrack *track = &mov->tracks[i];
5060 if ((tracks >= 0 && i != tracks) || !track->entry)5060 if ((tracks >= 0 && i != tracks) || !track->entry)
5061 continue;5061 continue;
@@ -5128,7 +5128,7 @@ static int mov_write_moof_tag_internal(AVIOContext *pb, MOVMuxContext *mov, · 66 unmodified lines
5128 mov->first_trun = 1;5128 mov->first_trun = 1;
5129 5129
5130 mov_write_mfhd_tag(pb, mov);5130 mov_write_mfhd_tag(pb, mov);
5131 for (i = 0; i < mov->nb_streams; i++) {5131 for (i = 0; i < mov->nb_tracks; i++) {
5132 MOVTrack *track = &mov->tracks[i];5132 MOVTrack *track = &mov->tracks[i];
5133 if (tracks >= 0 && i != tracks)5133 if (tracks >= 0 && i != tracks)
5134 continue;5134 continue;
@@ -5222,7 +5222,7 @@ static int mov_write_sidx_tags(AVIOContext *pb, MOVMuxContext *mov, · 87 unmodified lines
5222 } else {5222 } else {
5223 avio_buf = pb;5223 avio_buf = pb;
5224 }5224 }
5225 for (i = 0; i < mov->nb_streams; i++) {5225 for (i = 0; i < mov->nb_tracks; i++) {
5226 MOVTrack *track = &mov->tracks[i];5226 MOVTrack *track = &mov->tracks[i];
5227 if (tracks >= 0 && i != tracks)5227 if (tracks >= 0 && i != tracks)
5228 continue;5228 continue;
@@ -5363,7 +5363,7 @@ static int mov_write_mfra_tag(AVIOContext *pb, MOVMuxContext *mov) · 134 unmodified lines
5363 if (mov->flags & FF_MOV_FLAG_ISML)5363 if (mov->flags & FF_MOV_FLAG_ISML)
5364 goto done_mfra;5364 goto done_mfra;
5365 5365
5366 for (i = 0; i < mov->nb_streams; i++) {5366 for (i = 0; i < mov->nb_tracks; i++) {
5367 MOVTrack *track = &mov->tracks[i];5367 MOVTrack *track = &mov->tracks[i];
5368 if (track->nb_frag_info)5368 if (track->nb_frag_info)
5369 mov_write_tfra_tag(mfra_pb, track);5369 mov_write_tfra_tag(mfra_pb, track);
@@ -5868,7 +5868,7 @@ static int mov_flush_fragment(AVFormatContext *s, int force) · 498 unmodified lines
5868 }5868 }
5869 }5869 }
5870 5870
5871 for (i = 0; i < mov->nb_streams; i++) {5871 for (i = 0; i < mov->nb_tracks; i++) {
5872 MOVTrack *track = &mov->tracks[i];5872 MOVTrack *track = &mov->tracks[i];
5873 if (track->entry <= 1)5873 if (track->entry <= 1)
5874 continue;5874 continue;
@@ -5900,15 +5900,15 @@ static int mov_flush_fragment(AVFormatContext *s, int force) · 25 unmodified lines
5900 uint8_t *buf;5900 uint8_t *buf;
5901 int buf_size, moov_size;5901 int buf_size, moov_size;
5902 5902
5903 for (i = 0; i < mov->nb_streams; i++)5903 for (i = 0; i < mov->nb_tracks; i++)
5904 if (!mov->tracks[i].entry && !is_cover_image(mov->tracks[i].st))5904 if (!mov->tracks[i].entry && !is_cover_image(mov->tracks[i].st))
5905 break;5905 break;
5906 /* Don't write the initial moov unless all tracks have data */5906 /* 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)
5908 return 0;5908 return 0;
5909 5909
5910 moov_size = get_moov_size(s);5910 moov_size = get_moov_size(s);
5911 for (i = 0; i < mov->nb_streams; i++)5911 for (i = 0; i < mov->nb_tracks; i++)
5912 mov->tracks[i].data_offset = pos + moov_size + 8;5912 mov->tracks[i].data_offset = pos + moov_size + 8;
5913 5913
5914 avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_HEADER);5914 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
5936 5936
5937 mov->moov_written = 1;5937 mov->moov_written = 1;
5938 mov->mdat_size = 0;5938 mov->mdat_size = 0;
5939 for (i = 0; i < mov->nb_streams; i++) {5939 for (i = 0; i < mov->nb_tracks; i++) {
5940 mov->tracks[i].entry = 0;5940 mov->tracks[i].entry = 0;
5941 mov->tracks[i].end_reliable = 0;5941 mov->tracks[i].end_reliable = 0;
5942 }5942 }
@@ -5945,7 +5945,7 @@ static int mov_flush_fragment(AVFormatContext *s, int force) · 2 unmodified lines
5945 }5945 }
5946 5946
5947 if (mov->frag_interleave) {5947 if (mov->frag_interleave) {
5948 for (i = 0; i < mov->nb_streams; i++) {5948 for (i = 0; i < mov->nb_tracks; i++) {
5949 MOVTrack *track = &mov->tracks[i];5949 MOVTrack *track = &mov->tracks[i];
5950 int ret;5950 int ret;
5951 if ((ret = mov_flush_fragment_interleaving(s, track)) < 0)5951 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
5957 mdat_size = avio_tell(mov->mdat_buf);5957 mdat_size = avio_tell(mov->mdat_buf);
5958 }5958 }
5959 5959
5960 for (i = 0; i < mov->nb_streams; i++) {5960 for (i = 0; i < mov->nb_tracks; i++) {
5961 MOVTrack *track = &mov->tracks[i];5961 MOVTrack *track = &mov->tracks[i];
5962 if (mov->flags & FF_MOV_FLAG_SEPARATE_MOOF || mov->frag_interleave)5962 if (mov->flags & FF_MOV_FLAG_SEPARATE_MOOF || mov->frag_interleave)
5963 track->data_offset = 0;5963 track->data_offset = 0;
@@ -5986,7 +5986,7 @@ static int mov_flush_fragment(AVFormatContext *s, int force) · 22 unmodified lines
5986 av_rescale(mov->tracks[first_track].cluster[0].dts, AV_TIME_BASE, mov->tracks[first_track].timescale),5986 av_rescale(mov->tracks[first_track].cluster[0].dts, AV_TIME_BASE, mov->tracks[first_track].timescale),
5987 (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);5987 (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);
5988 5988
5989 for (i = 0; i < mov->nb_streams; i++) {5989 for (i = 0; i < mov->nb_tracks; i++) {
5990 MOVTrack *track = &mov->tracks[i];5990 MOVTrack *track = &mov->tracks[i];
5991 int buf_size, write_moof = 1, moof_tracks = -1;5991 int buf_size, write_moof = 1, moof_tracks = -1;
5992 uint8_t *buf;5992 uint8_t *buf;
@@ -6198,7 +6198,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) · 205 unmodified lines
6198 if (par->codec_id == AV_CODEC_ID_H264 && trk->vos_len > 0 && *(uint8_t *)trk->vos_data != 1 && !TAG_IS_AVCI(trk->tag)) {6198 if (par->codec_id == AV_CODEC_ID_H264 && trk->vos_len > 0 && *(uint8_t *)trk->vos_data != 1 && !TAG_IS_AVCI(trk->tag)) {
6199 /* from x264 or from bytestream H.264 */6199 /* from x264 or from bytestream H.264 */
6200 /* NAL reformatting needed */6200 /* 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) {
6202 ret = ff_avc_parse_nal_units_buf(pkt->data, &reformatted_data,6202 ret = ff_avc_parse_nal_units_buf(pkt->data, &reformatted_data,
6203 &size);6203 &size);
6204 if (ret < 0)6204 if (ret < 0)
@@ -6218,7 +6218,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) · 13 unmodified lines
6218 } else if (par->codec_id == AV_CODEC_ID_HEVC && trk->vos_len > 6 &&6218 } else if (par->codec_id == AV_CODEC_ID_HEVC && trk->vos_len > 6 &&
6219 (AV_RB24(trk->vos_data) == 1 || AV_RB32(trk->vos_data) == 1)) {6219 (AV_RB24(trk->vos_data) == 1 || AV_RB32(trk->vos_data) == 1)) {
6220 /* extradata is Annex B, assume the bitstream is too and convert it */6220 /* 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) {
6222 ret = ff_hevc_annexb2mp4_buf(pkt->data, &reformatted_data,6222 ret = ff_hevc_annexb2mp4_buf(pkt->data, &reformatted_data,
6223 &size, 0, NULL);6223 &size, 0, NULL);
6224 if (ret < 0)6224 if (ret < 0)
@@ -6236,7 +6236,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) · 11 unmodified lines
6236 }6236 }
6237 }6237 }
6238 } else if (par->codec_id == AV_CODEC_ID_AV1) {6238 } 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) {
6240 ret = ff_av1_filter_obus_buf(pkt->data, &reformatted_data,6240 ret = ff_av1_filter_obus_buf(pkt->data, &reformatted_data,
6241 &size, &offset);6241 &size, &offset);
6242 if (ret < 0)6242 if (ret < 0)
@@ -6419,7 +6419,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) · 176 unmodified lines
6419 trk->sample_count += samples_in_chunk;6419 trk->sample_count += samples_in_chunk;
6420 mov->mdat_size += size;6420 mov->mdat_size += size;
6421 6421
6422 if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams)6422 if (trk->hint_track >= 0 && trk->hint_track < mov->nb_tracks)
6423 ff_mov_add_hinted_packet(s, pkt, trk->hint_track, trk->entry,6423 ff_mov_add_hinted_packet(s, pkt, trk->hint_track, trk->entry,
6424 reformatted_data ? reformatted_data + offset6424 reformatted_data ? reformatted_data + offset
6425 : NULL, size);6425 : NULL, size);
@@ -6594,7 +6594,7 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt) · 168 unmodified lines
6594 * 3) See mov_write_trailer for how the final end sample is6594 * 3) See mov_write_trailer for how the final end sample is
6595 * handled.6595 * handled.
6596 */6596 */
6597 for (i = 0; i < mov->nb_streams; i++) {6597 for (i = 0; i < mov->nb_tracks; i++) {
6598 MOVTrack *trk = &mov->tracks[i];6598 MOVTrack *trk = &mov->tracks[i];
6599 int ret;6599 int ret;
6600 6600
@@ -6869,7 +6869,7 @@ static void mov_free(AVFormatContext *s) · 268 unmodified lines
6869 avcodec_parameters_free(&mov->tracks[mov->chapter_track].par);6869 avcodec_parameters_free(&mov->tracks[mov->chapter_track].par);
6870 }6870 }
6871 6871
6872 for (i = 0; i < mov->nb_streams; i++) {6872 for (i = 0; i < mov->nb_tracks; i++) {
6873 MOVTrack *const track = &mov->tracks[i];6873 MOVTrack *const track = &mov->tracks[i];
6874 6874
6875 if (track->tag == MKTAG('r','t','p',' '))6875 if (track->tag == MKTAG('r','t','p',' '))
@@ -7101,14 +7101,14 @@ static int mov_init(AVFormatContext *s) · 225 unmodified lines
7101 s->streams[0]->disposition |= AV_DISPOSITION_DEFAULT;7101 s->streams[0]->disposition |= AV_DISPOSITION_DEFAULT;
7102 }7102 }
7103 7103
7104 mov->nb_streams = s->nb_streams;7104 mov->nb_tracks = s->nb_streams;
7105 if (mov->mode & (MODE_MP4|MODE_MOV|MODE_IPOD) && s->nb_chapters)7105 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++;
7107 7107
7108 if (mov->flags & FF_MOV_FLAG_RTP_HINT) {7108 if (mov->flags & FF_MOV_FLAG_RTP_HINT) {
7109 for (i = 0; i < s->nb_streams; i++)7109 for (i = 0; i < s->nb_streams; i++)
7110 if (rtp_hinting_needed(s->streams[i]))7110 if (rtp_hinting_needed(s->streams[i]))
7111 mov->nb_streams++;7111 mov->nb_tracks++;
7112 }7112 }
7113 7113
7114 if (mov->write_btrt < 0) {7114 if (mov->write_btrt < 0) {
@@ -7145,12 +7145,12 @@ static int mov_init(AVFormatContext *s) · 30 unmodified lines
7145 }7145 }
7146 }7146 }
7147 7147
7148 mov->nb_streams += mov->nb_meta_tmcd;7148 mov->nb_tracks += mov->nb_meta_tmcd;
7149 }7149 }
7150 7150
7151 // Reserve an extra stream for chapters for the case where chapters7151 // Reserve an extra stream for chapters for the case where chapters
7152 // are written in the trailer7152 // 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));
7154 if (!mov->tracks)7154 if (!mov->tracks)
7155 return AVERROR(ENOMEM);7155 return AVERROR(ENOMEM);
7156 7156
@@ -7571,7 +7571,7 @@ static int compute_moov_size(AVFormatContext *s) · 414 unmodified lines
7571 if (moov_size < 0)7571 if (moov_size < 0)
7572 return moov_size;7572 return moov_size;
7573 7573
7574 for (i = 0; i < mov->nb_streams; i++)7574 for (i = 0; i < mov->nb_tracks; i++)
7575 mov->tracks[i].data_offset += moov_size;7575 mov->tracks[i].data_offset += moov_size;
7576 7576
7577 moov_size2 = get_moov_size(s);7577 moov_size2 = get_moov_size(s);
@@ -7581,7 +7581,7 @@ static int compute_moov_size(AVFormatContext *s) · 3 unmodified lines
7581 /* if the size changed, we just switched from stco to co64 and need to7581 /* if the size changed, we just switched from stco to co64 and need to
7582 * update the offsets */7582 * update the offsets */
7583 if (moov_size2 != moov_size)7583 if (moov_size2 != moov_size)
7584 for (i = 0; i < mov->nb_streams; i++)7584 for (i = 0; i < mov->nb_tracks; i++)
7585 mov->tracks[i].data_offset += moov_size2 - moov_size;7585 mov->tracks[i].data_offset += moov_size2 - moov_size;
7586 7586
7587 return moov_size2;7587 return moov_size2;
@@ -7596,7 +7596,7 @@ static int compute_sidx_size(AVFormatContext *s) · 8 unmodified lines
7596 if (sidx_size < 0)7596 if (sidx_size < 0)
7597 return sidx_size;7597 return sidx_size;
7598 7598
7599 for (i = 0; i < mov->nb_streams; i++)7599 for (i = 0; i < mov->nb_tracks; i++)
7600 mov->tracks[i].data_offset += sidx_size;7600 mov->tracks[i].data_offset += sidx_size;
7601 7601
7602 return sidx_size;7602 return sidx_size;
@@ -7645,7 +7645,7 @@ static int mov_write_trailer(AVFormatContext *s) · 42 unmodified lines
7645 * Before actually writing the trailer, make sure that there are no7645 * Before actually writing the trailer, make sure that there are no
7646 * dangling subtitles, that need a terminating sample.7646 * dangling subtitles, that need a terminating sample.
7647 */7647 */
7648 for (i = 0; i < mov->nb_streams; i++) {7648 for (i = 0; i < mov->nb_tracks; i++) {
7649 MOVTrack *trk = &mov->tracks[i];7649 MOVTrack *trk = &mov->tracks[i];
7650 if (trk->par->codec_id == AV_CODEC_ID_MOV_TEXT &&7650 if (trk->par->codec_id == AV_CODEC_ID_MOV_TEXT &&
7651 !trk->last_sample_is_subtitle_end) {7651 !trk->last_sample_is_subtitle_end) {
@@ -7664,7 +7664,7 @@ static int mov_write_trailer(AVFormatContext *s) · 12 unmodified lines
7664 // when we are not doing fragments.7664 // when we are not doing fragments.
7665 if (!mov->chapter_track && !(mov->flags & FF_MOV_FLAG_FRAGMENT)) {7665 if (!mov->chapter_track && !(mov->flags & FF_MOV_FLAG_FRAGMENT)) {
7666 if (mov->mode & (MODE_MP4|MODE_MOV|MODE_IPOD) && s->nb_chapters) {7666 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++;
7668 if ((res = mov_create_chapter_track(s, mov->chapter_track)) < 0)7668 if ((res = mov_create_chapter_track(s, mov->chapter_track)) < 0)
7669 return res;7669 return res;
7670 }7670 }
@@ -7716,7 +7716,7 @@ static int mov_write_trailer(AVFormatContext *s) · 45 unmodified lines
7716 res = 0;7716 res = 0;
7717 } else {7717 } else {
7718 mov_auto_flush_fragment(s, 1);7718 mov_auto_flush_fragment(s, 1);
7719 for (i = 0; i < mov->nb_streams; i++)7719 for (i = 0; i < mov->nb_tracks; i++)
7720 mov->tracks[i].data_offset = 0;7720 mov->tracks[i].data_offset = 0;
7721 if (mov->flags & FF_MOV_FLAG_GLOBAL_SIDX) {7721 if (mov->flags & FF_MOV_FLAG_GLOBAL_SIDX) {
7722 int64_t end;7722 int64_t end;
libavformat/movenc.h+1−1
@@ -188,7 +188,7 @@ typedef struct MOVMuxContext { · 187 unmodified lines
188 const AVClass *av_class;188 const AVClass *av_class;
189 int mode;189 int mode;
190 int64_t time;190 int64_t time;
191 int nb_streams;191 int nb_tracks;
192 int nb_meta_tmcd; ///< number of new created tmcd track based on metadata (aka not data copy)192 int nb_meta_tmcd; ///< number of new created tmcd track based on metadata (aka not data copy)
193 int chapter_track; ///< qt chapter track number193 int chapter_track; ///< qt chapter track number
194 int64_t mdat_pos;194 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