generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/oggenc: always use the time base stored in the theora header

Browse Source 
Fixes ticket #5704

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2016-07-11 22:09:34 -03:00
parent 9157ac2f9c
commit 4acdbb1c6c
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/oggenc.c
View File

@ -533,6 +533,14 @@ static int ogg_write_header(AVFormatContext *s)
bytestream_put_buffer(&p, cstr, 6); bytestream_put_buffer(&p, cstr, 6);
if (st->codecpar->codec_id == AV_CODEC_ID_THEORA) { if (st->codecpar->codec_id == AV_CODEC_ID_THEORA) {
int den = AV_RB32(oggstream->header[0] + 22), num = AV_RB32(oggstream->header[0] + 26);
/* Make sure to use time base stored in the Theora stream header to write
correct timestamps */
if (st->time_base.num != num || st->time_base.den != den) {
av_log(s, AV_LOG_DEBUG, "Changing time base from %d/%d to %d/%d\n",
st->time_base.num, st->time_base.den, num, den);
avpriv_set_pts_info(st, 64, num, den);
}
/** KFGSHIFT is the width of the less significant section of the granule position /** KFGSHIFT is the width of the less significant section of the granule position
The less significant section is the frame count since the last keyframe */ The less significant section is the frame count since the last keyframe */
oggstream->kfgshift = ((oggstream->header[0][40]&3)<<3)|(oggstream->header[0][41]>>5); oggstream->kfgshift = ((oggstream->header[0][40]&3)<<3)|(oggstream->header[0][41]>>5);