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

OGG: correct PTS with old theora streams

Browse Source 
Originally committed as revision 15785 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2008-11-06 01:57:17 +00:00
parent 77be08eeb1
commit e3b07e1a74
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/oggparsetheora.c
View File

@ -31,6 +31,7 @@
struct theora_params { struct theora_params {
int gpshift; int gpshift;
int gpmask; int gpmask;
unsigned version;
}; };
static int static int
@ -54,17 +55,16 @@ theora_header (AVFormatContext * s, int idx)
if (os->buf[os->pstart] == 0x80) { if (os->buf[os->pstart] == 0x80) {
GetBitContext gb; GetBitContext gb;
int width, height; int width, height;
int version;
init_get_bits(&gb, os->buf + os->pstart, os->psize*8); init_get_bits(&gb, os->buf + os->pstart, os->psize*8);
skip_bits(&gb, 7*8); /* 0x80"theora" */ skip_bits(&gb, 7*8); /* 0x80"theora" */
version = get_bits_long(&gb, 24); thp->version = get_bits_long(&gb, 24);
if (version < 0x030100) if (thp->version < 0x030100)
{ {
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"Too old or unsupported Theora (%x)\n", version); "Too old or unsupported Theora (%x)\n", thp->version);
return -1; return -1;
} }
@ -72,10 +72,10 @@ theora_header (AVFormatContext * s, int idx)
height = get_bits(&gb, 16) << 4; height = get_bits(&gb, 16) << 4;
avcodec_set_dimensions(st->codec, width, height); avcodec_set_dimensions(st->codec, width, height);
if (version >= 0x030400) if (thp->version >= 0x030400)
skip_bits(&gb, 100); skip_bits(&gb, 100);
if (version >= 0x030200) { if (thp->version >= 0x030200) {
width = get_bits_long(&gb, 24); width = get_bits_long(&gb, 24);
height = get_bits_long(&gb, 24); height = get_bits_long(&gb, 24);
if ( width <= st->codec->width && width > st->codec->width-16 if ( width <= st->codec->width && width > st->codec->width-16
@ -91,9 +91,9 @@ theora_header (AVFormatContext * s, int idx)
st->sample_aspect_ratio.num = get_bits_long(&gb, 24); st->sample_aspect_ratio.num = get_bits_long(&gb, 24);
st->sample_aspect_ratio.den = get_bits_long(&gb, 24); st->sample_aspect_ratio.den = get_bits_long(&gb, 24);
if (version >= 0x030200) if (thp->version >= 0x030200)
skip_bits(&gb, 38); skip_bits(&gb, 38);
if (version >= 0x304000) if (thp->version >= 0x304000)
skip_bits(&gb, 2); skip_bits(&gb, 2);
thp->gpshift = get_bits(&gb, 5); thp->gpshift = get_bits(&gb, 5);
@ -125,6 +125,9 @@ theora_gptopts(AVFormatContext *ctx, int idx, uint64_t gp)
uint64_t iframe = gp >> thp->gpshift; uint64_t iframe = gp >> thp->gpshift;
uint64_t pframe = gp & thp->gpmask; uint64_t pframe = gp & thp->gpmask;
if (thp->version < 0x030201)
iframe++;
if(!pframe) if(!pframe)
os->pflags |= PKT_FLAG_KEY; os->pflags |= PKT_FLAG_KEY;