virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

oggvorbisdec: Apply timestamp calculation always when timestamps arent known.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-05-04 22:45:57 +02:00
parent 1f95ad48ff
commit fe5c5bccce
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/oggparsevorbis.c
View File

@ -296,7 +296,7 @@ static int vorbis_packet(AVFormatContext *s, int idx)
here we parse the duration of each packet in the first page and compare here we parse the duration of each packet in the first page and compare
the total duration to the page granule to find the encoder delay and the total duration to the page granule to find the encoder delay and
set the first timestamp */ set the first timestamp */
if (!os->lastpts) { if ((!os->lastpts || os->lastpts == AV_NOPTS_VALUE) && !(os->flags & OGG_FLAG_EOS)) {
int seg, d; int seg, d;
uint8_t *last_pkt = os->buf + os->pstart; uint8_t *last_pkt = os->buf + os->pstart;
uint8_t *next_pkt = last_pkt; uint8_t *next_pkt = last_pkt;
@ -324,9 +324,11 @@ static int vorbis_packet(AVFormatContext *s, int idx)
next_pkt += os->segments[seg]; next_pkt += os->segments[seg];
} }
os->lastpts = os->lastdts = os->granule - duration; os->lastpts = os->lastdts = os->granule - duration;
s->streams[idx]->start_time = os->lastpts; if(s->streams[idx]->start_time == AV_NOPTS_VALUE) {
if (s->streams[idx]->duration) s->streams[idx]->start_time = os->lastpts;
s->streams[idx]->duration -= s->streams[idx]->start_time; if (s->streams[idx]->duration)
s->streams[idx]->duration -= s->streams[idx]->start_time;
}
priv->final_pts = AV_NOPTS_VALUE; priv->final_pts = AV_NOPTS_VALUE;
avpriv_vorbis_parse_reset(&priv->vp); avpriv_vorbis_parse_reset(&priv->vp);
} }