libavformat.hg: mov.c comparison

comparison mov.c @ 2824:ecbfaa8712a1 libavformat

do not retain useless pointers to avstream priv_data, use it directly

author	bcoudurier
date	Sun, 16 Dec 2007 18:45:48 +0000
parents	3f15b52fe817
children	5862d8be4c6e

comparison

equal deleted inserted replaced

-:3f15b52fe817
+:ecbfaa8712a1
 int time_scale;
 int64_t duration; /* duration of the longest track */
 int found_moov; /* when both 'moov' and 'mdat' sections has been found */
 int found_mdat; /* we suppose we have enough data to read the file */
 int64_t mdat_offset;
-MOVStreamContext *streams[MAX_STREAMS];
 AVPaletteControl palette_control;
 MOV_mdat_t *mdat_list;
 int mdat_count;
 DVDemuxContext *dv_demux;
 AVFormatContext *dv_fctx;
 }
 st->priv_data = sc;
 st->codec->codec_type = CODEC_TYPE_DATA;
 st->start_time = 0; /* XXX: check */
-c->streams[c->fc->nb_streams-1] = sc;
 return mov_read_default(c, pb, atom);
 }
 static void mov_parse_udta_string(ByteIOContext *pb, char *str, int size)
 }
 /* edit list atom */
 static int mov_read_elst(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 {
+MOVStreamContext *sc = c->fc->streams[c->fc->nb_streams-1]->priv_data;
 int i, edit_count;
 get_byte(pb); /* version */
 get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
-edit_count= c->streams[c->fc->nb_streams-1]->edit_count = get_be32(pb);     /* entries */
+edit_count= sc->edit_count = get_be32(pb);     /* entries */
 for(i=0; i<edit_count; i++){
 get_be32(pb); /* Track duration */
 get_be32(pb); /* Media time */
 get_be32(pb); /* Media rate */
 }
-dprintf(c->fc, "track[%i].edit_count = %i\n", c->fc->nb_streams-1, c->streams[c->fc->nb_streams-1]->edit_count);
+dprintf(c->fc, "track[%i].edit_count = %i\n", c->fc->nb_streams-1, sc->edit_count);
 return 0;
 }
 static const MOVParseTableEntry mov_default_parse_table[] = {
 /* mp4 atoms */
 else if (sc->samples_per_frame > 0 && (chunk_samples * sc->bytes_per_frame % sc->samples_per_frame == 0))
 chunk_size = chunk_samples * sc->bytes_per_frame / sc->samples_per_frame;
 else { /* workaround to find nearest next chunk offset */
 chunk_size = INT_MAX;
 for (j = 0; j < mov->fc->nb_streams; j++) {
-MOVStreamContext *msc = mov->streams[j];
+MOVStreamContext *msc = mov->fc->streams[j]->priv_data;
 for (k = msc->next_chunk; k < msc->chunk_count; k++) {
 if (msc->chunk_offsets[k] > current_offset && msc->chunk_offsets[k] - current_offset < chunk_size) {
 chunk_size = msc->chunk_offsets[k] - current_offset;
 msc->next_chunk = k;
 break;
 if (mov->mdat_list[j].offset <= current_offset && mov->mdat_list[j].offset + mov->mdat_list[j].size > current_offset)
 chunk_size = mov->mdat_list[j].offset + mov->mdat_list[j].size - current_offset;
 }
 assert(chunk_size != INT_MAX);
 for (j = 0; j < mov->fc->nb_streams; j++) {
-mov->streams[j]->next_chunk = 0;
+MOVStreamContext *msc = mov->fc->streams[j]->priv_data;
+msc->next_chunk = 0;
 }
 }
 av_add_index_entry(st, current_offset, current_dts, chunk_size, 0, AVINDEX_KEYFRAME);
 /* get chunk duration */
 chunk_duration = 0;
 return -1;
 }
 dprintf(mov->fc, "on_parse_exit_offset=%d\n", (int) url_ftell(pb));
 for(i=0; i<s->nb_streams; i++) {
-MOVStreamContext *sc = mov->streams[i];
 AVStream *st = s->streams[i];
+MOVStreamContext *sc = st->priv_data;
 /* sanity checks */
 if(!sc->stts_count || !sc->chunk_count || !sc->sample_to_chunk_sz ||
 (!sc->sample_size && !sc->sample_count)){
 av_log(s, AV_LOG_ERROR, "missing mandatory atoms, broken header\n");
 sc->sample_count = 0; //ignore track
 sc->ffindex = i;
 mov_build_index(mov, st);
 }
 for(i=0; i<s->nb_streams; i++) {
+MOVStreamContext *sc = s->streams[i]->priv_data;
 /* Do not need those anymore. */
-av_freep(&mov->streams[i]->chunk_offsets);
+av_freep(&sc->chunk_offsets);
-av_freep(&mov->streams[i]->sample_to_chunk);
+av_freep(&sc->sample_to_chunk);
-av_freep(&mov->streams[i]->sample_sizes);
+av_freep(&sc->sample_sizes);
-av_freep(&mov->streams[i]->keyframes);
+av_freep(&sc->keyframes);
-av_freep(&mov->streams[i]->stts_data);
+av_freep(&sc->stts_data);
 }
 av_freep(&mov->mdat_list);
 return 0;
 }
 AVIndexEntry *sample = 0;
 int64_t best_dts = INT64_MAX;
 int i;
 for (i = 0; i < s->nb_streams; i++) {
-MOVStreamContext *msc = mov->streams[i];
+AVStream *st = s->streams[i];
-if (s->streams[i]->discard != AVDISCARD_ALL && msc->current_sample < msc->sample_count) {
+MOVStreamContext *msc = st->priv_data;
-AVIndexEntry *current_sample = &s->streams[i]->index_entries[msc->current_sample];
+if (st->discard != AVDISCARD_ALL && msc->current_sample < msc->sample_count) {
+AVIndexEntry *current_sample = &st->index_entries[msc->current_sample];
 int64_t dts = av_rescale(current_sample->timestamp * (int64_t)msc->time_rate, AV_TIME_BASE, msc->time_scale);
 dprintf(s, "stream %d, sample %d, dts %"PRId64"\n", i, msc->current_sample, dts);
 if (!sample || (url_is_streamed(s->pb) && current_sample->pos < sample->pos) ||
 (!url_is_streamed(s->pb) &&
 ((FFABS(best_dts - dts) <= AV_TIME_BASE && current_sample->pos < sample->pos) ||
 static int mov_read_close(AVFormatContext *s)
 {
 int i;
 MOVContext *mov = s->priv_data;
 for(i=0; i<s->nb_streams; i++) {
-av_freep(&mov->streams[i]->ctts_data);
+MOVStreamContext *sc = s->streams[i]->priv_data;
-av_freep(&mov->streams[i]);
+av_freep(&sc->ctts_data);
 }
 if(mov->dv_demux){
 for(i=0; i<mov->dv_fctx->nb_streams; i++){
 av_freep(&mov->dv_fctx->streams[i]->codec);
 av_freep(&mov->dv_fctx->streams[i]);

Mercurial > libavformat.hg

comparison mov.c @ 2824:ecbfaa8712a1 libavformat