RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-24 16:22:37 +00:00
Code Issues Projects Releases Wiki Activity

do not modify sample_count, check against index entries

Browse Source 
Originally committed as revision 17972 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-03-15 07:21:22 +00:00
parent ed6ae6a58b
commit f0f2218dce
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mov.c
View File

@ -1170,7 +1170,7 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
for (j = 0; j < sc->stsc_data[stsc_index].count; j++) { for (j = 0; j < sc->stsc_data[stsc_index].count; j++) {
if (current_sample >= sc->sample_count) { if (current_sample >= sc->sample_count) {
av_log(mov->fc, AV_LOG_ERROR, "wrong sample count\n"); av_log(mov->fc, AV_LOG_ERROR, "wrong sample count\n");
goto out; return;
} }
keyframe = !sc->keyframe_count || current_sample+key_off == sc->keyframes[stss_index]; keyframe = !sc->keyframe_count || current_sample+key_off == sc->keyframes[stss_index];
if (keyframe) { if (keyframe) {
@ -1245,9 +1245,6 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
} }
} }
} }
out:
/* adjust sample count to avindex entries */
sc->sample_count = st->nb_index_entries;
} }
static int mov_read_trak(MOVContext *c, ByteIOContext *pb, MOVAtom atom) static int mov_read_trak(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
@ -1273,7 +1270,6 @@ static int mov_read_trak(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
(!sc->sample_size && !sc->sample_count))){ (!sc->sample_size && !sc->sample_count))){
av_log(c->fc, AV_LOG_ERROR, "stream %d, missing mandatory atoms, broken header\n", av_log(c->fc, AV_LOG_ERROR, "stream %d, missing mandatory atoms, broken header\n",
st->index); st->index);
sc->sample_count = 0; //ignore track
return 0; return 0;
} }
if(!sc->time_rate) if(!sc->time_rate)
@ -1608,7 +1604,6 @@ static int mov_read_trun(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
offset += sample_size; offset += sample_size;
} }
frag->moof_offset = offset; frag->moof_offset = offset;
sc->sample_count = st->nb_index_entries;
st->duration = dts; st->duration = dts;
return 0; return 0;
} }
@ -1865,7 +1860,7 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i]; AVStream *st = s->streams[i];
MOVStreamContext *msc = st->priv_data; MOVStreamContext *msc = st->priv_data;
if (st->discard != AVDISCARD_ALL && msc->pb && msc->current_sample < msc->sample_count) { if (st->discard != AVDISCARD_ALL && msc->pb && msc->current_sample < st->nb_index_entries) {
AVIndexEntry *current_sample = &st->index_entries[msc->current_sample]; AVIndexEntry *current_sample = &st->index_entries[msc->current_sample];
int64_t dts = av_rescale(current_sample->timestamp * (int64_t)msc->time_rate, int64_t dts = av_rescale(current_sample->timestamp * (int64_t)msc->time_rate,
AV_TIME_BASE, msc->time_scale); AV_TIME_BASE, msc->time_scale);
@ -1925,7 +1920,7 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->dts = AV_NOPTS_VALUE; pkt->dts = AV_NOPTS_VALUE;
} else { } else {
AVStream *st = s->streams[sc->ffindex]; AVStream *st = s->streams[sc->ffindex];
int64_t next_dts = (sc->current_sample < sc->sample_count) ? int64_t next_dts = (sc->current_sample < st->nb_index_entries) ?
st->index_entries[sc->current_sample].timestamp : st->duration; st->index_entries[sc->current_sample].timestamp : st->duration;
pkt->duration = next_dts - pkt->dts; pkt->duration = next_dts - pkt->dts;
pkt->pts = pkt->dts; pkt->pts = pkt->dts;