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

ogg: rewrite first timestamp reading code.

Browse Source 
this is simpler and closer to how timestamps are found for seeking.

Fixes Ticket1186

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-05-14 14:07:09 +02:00
parent 5931c754b8
commit 8443082db6
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavformat/oggdec.c
View File

@ -55,6 +55,8 @@ static const struct ogg_codec * const ogg_codecs[] = {
NULL
};
static int64_t ogg_calc_pts(AVFormatContext *s, int idx, int64_t *dts);
//FIXME We could avoid some structure duplication
static int ogg_save(AVFormatContext *s)
{
@ -521,19 +523,16 @@ static int ogg_get_length(AVFormatContext *s)
ogg_save (s);
avio_seek (s->pb, s->data_offset, SEEK_SET);
while (!ogg_read_page (s, &i)){
if (ogg->streams[i].granule != -1 && ogg->streams[i].granule != 0 &&
ogg->streams[i].codec) {
if(s->streams[i]->duration && s->streams[i]->start_time == AV_NOPTS_VALUE && !ogg->streams[i].got_start){
int64_t start= ogg_gptopts (s, i, ogg->streams[i].granule, NULL);
if(av_rescale_q(start, s->streams[i]->time_base, AV_TIME_BASE_Q) > AV_TIME_BASE)
s->streams[i]->duration -= start;
ogg->streams[i].got_start= 1;
streams_left--;
}
ogg_reset(s);
while (!ogg_packet(s, &i, NULL, NULL, NULL)) {
int64_t pts = ogg_calc_pts(s, i, NULL);
if (pts != AV_NOPTS_VALUE && s->streams[i]->start_time == AV_NOPTS_VALUE && !ogg->streams[i].got_start){
s->streams[i]->duration -= pts;
ogg->streams[i].got_start= 1;
streams_left--;
}
if(streams_left<=0)
break;
}
}
ogg_restore (s, 0);