highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rmdec: parse FPS in RealMedia properly

Browse Source 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Kostya Shishkov
2011-08-16 09:10:57 +02:00
committed by Anton Khirnov
parent 48ce8b8da7
commit a43b1e74e2
3 changed files with 352 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/rmdec.c
View File

@@ -293,21 +293,21 @@ ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVIOContext *pb,
// av_log(s, AV_LOG_DEBUG, "%X %X\n", st->codec->codec_tag, MKTAG('R', 'V', '2', '0'));
if (st->codec->codec_id == CODEC_ID_NONE)
goto fail1;
st->codec->width = avio_rb16(pb);
st->codec->width = avio_rb16(pb);
st->codec->height = avio_rb16(pb);
st->codec->time_base.num= 1;
fps= avio_rb16(pb);
avio_skip(pb, 2); // looks like bits per sample
avio_skip(pb, 4); // always zero?
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->need_parsing = AVSTREAM_PARSE_TIMESTAMPS;
avio_rb32(pb);
avio_skip(pb, 2);
avio_rb16(pb);
fps = avio_rb32(pb);
if ((ret = rm_read_extradata(pb, st->codec, codec_data_size - (avio_tell(pb) - codec_pos))) < 0)
return ret;
// av_log(s, AV_LOG_DEBUG, "fps= %d fps2= %d\n", fps, fps2);
st->codec->time_base.den = fps * st->codec->time_base.num;
av_reduce(&st->codec->time_base.num, &st->codec->time_base.den,
0x10000, fps, (1 << 30) - 1);
st->avg_frame_rate.num = st->codec->time_base.den;
st->avg_frame_rate.den = st->codec->time_base.num;
}
skip: