Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

simplify, completely ignore streams not recognized, that fixes seeking for some files

Browse source 
Originally committed as revision 5468 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2006-06-12 13:09:19 +00:00
parent c4da83fb0f
commit a2fe3b5869
1 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
libavformat/mov.c
View file

@ -287,7 +287,6 @@ struct MOVParseTableEntry;
typedef struct MOVStreamContext { typedef struct MOVStreamContext {
int ffindex; /* the ffmpeg stream id */ int ffindex; /* the ffmpeg stream id */
int is_ff_stream; /* Is this stream presented to ffmpeg ? i.e. is this an audio or video stream ? */
long next_chunk; long next_chunk;
long chunk_count; long chunk_count;
int64_t *chunk_offsets; int64_t *chunk_offsets;
@ -1664,7 +1663,7 @@ static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
{ {
MOVContext *mov = (MOVContext *) s->priv_data; MOVContext *mov = (MOVContext *) s->priv_data;
ByteIOContext *pb = &s->pb; ByteIOContext *pb = &s->pb;
int i, j, nb, err; int i, j, err;
MOV_atom_t atom = { 0, 0, 0 }; MOV_atom_t atom = { 0, 0, 0 };
mov->fc = s; mov->fc = s;
@ -1689,36 +1688,35 @@ static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
url_fseek(pb, mov->mdat_offset, SEEK_SET); url_fseek(pb, mov->mdat_offset, SEEK_SET);
mov->next_chunk_offset = mov->mdat_offset; /* initialise reading */ mov->next_chunk_offset = mov->mdat_offset; /* initialise reading */
mov->total_streams = nb = s->nb_streams;
#if 1
for(i=0; i<s->nb_streams;) { for(i=0; i<s->nb_streams;) {
if(s->streams[i]->codec->codec_type == CODEC_TYPE_MOV_OTHER) {/* not audio, not video, delete */
av_free(s->streams[i]);
for(j=i+1; j<s->nb_streams; j++)
s->streams[j-1] = s->streams[j];
s->nb_streams--;
} else
i++;
}
for(i=0; i<s->nb_streams;i++) {
MOVStreamContext *sc = (MOVStreamContext *)s->streams[i]->priv_data; MOVStreamContext *sc = (MOVStreamContext *)s->streams[i]->priv_data;
if(!sc->time_rate) if(s->streams[i]->codec->codec_type == CODEC_TYPE_MOV_OTHER) {/* not audio, not video, delete */
sc->time_rate=1; av_free(s->streams[i]);
if(!sc->time_scale) mov_free_stream_context(sc);
sc->time_scale= mov->time_scale; for(j=i+1; j<s->nb_streams; j++) {
av_set_pts_info(s->streams[i], 64, sc->time_rate, sc->time_scale); s->streams[j-1] = s->streams[j];
mov->streams[j-1] = mov->streams[j];
}
s->nb_streams--;
} else {
if(!sc->time_rate)
sc->time_rate=1;
if(!sc->time_scale)
sc->time_scale= mov->time_scale;
av_set_pts_info(s->streams[i], 64, sc->time_rate, sc->time_scale);
if(s->streams[i]->duration != AV_NOPTS_VALUE){ if(s->streams[i]->duration != AV_NOPTS_VALUE){
assert(s->streams[i]->duration % sc->time_rate == 0); assert(s->streams[i]->duration % sc->time_rate == 0);
s->streams[i]->duration /= sc->time_rate; s->streams[i]->duration /= sc->time_rate;
}
sc->ffindex = i;
i++;
} }
sc->ffindex = i;
sc->is_ff_stream = 1;
} }
#endif mov->total_streams = s->nb_streams;
return 0; return 0;
} }
@ -1807,7 +1805,7 @@ again:
mov->next_chunk_offset = offset; mov->next_chunk_offset = offset;
} }
if(!sc->is_ff_stream || (s->streams[sc->ffindex]->discard >= AVDISCARD_ALL)) { if(s->streams[sc->ffindex]->discard >= AVDISCARD_ALL) {
url_fskip(&s->pb, (offset - mov->next_chunk_offset)); url_fskip(&s->pb, (offset - mov->next_chunk_offset));
mov->next_chunk_offset = offset; mov->next_chunk_offset = offset;
offset = INT64_MAX; offset = INT64_MAX;