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

Detect theora keyframes by content in Ogg demuxer.

Browse Source 
A lot of files do not mark keyframes correctly via
granule, so detect keyframe or not based on data
and complain if it mismatches.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2012-02-06 22:03:25 +01:00
parent 6833fe4342
commit 787528b4a6
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/oggdec.c
View File

@ -576,6 +576,18 @@ static int64_t ogg_calc_pts(AVFormatContext *s, int idx, int64_t *dts)
return pts; return pts;
} }
static void ogg_validate_keyframe(AVFormatContext *s, int idx, int pstart, int psize)
{
struct ogg *ogg = s->priv_data;
struct ogg_stream *os = ogg->streams + idx;
if (psize && s->streams[idx]->codec->codec_id == CODEC_ID_THEORA) {
if (!!(os->pflags & AV_PKT_FLAG_KEY) != !(os->buf[pstart] & 0x40)) {
av_log(s, AV_LOG_WARNING, "Broken file, keyframes not correctly marked.\n");
os->pflags ^= AV_PKT_FLAG_KEY;
}
}
}
static int ogg_read_packet(AVFormatContext *s, AVPacket *pkt) static int ogg_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
struct ogg *ogg; struct ogg *ogg;
@ -597,6 +609,7 @@ retry:
// pflags might not be set until after this // pflags might not be set until after this
pts = ogg_calc_pts(s, idx, &dts); pts = ogg_calc_pts(s, idx, &dts);
ogg_validate_keyframe(s, idx, pstart, psize);
if (os->keyframe_seek && !(os->pflags & AV_PKT_FLAG_KEY)) if (os->keyframe_seek && !(os->pflags & AV_PKT_FLAG_KEY))
goto retry; goto retry;
@ -639,13 +652,15 @@ static int64_t ogg_read_timestamp(AVFormatContext *s, int stream_index,
int64_t pts = AV_NOPTS_VALUE; int64_t pts = AV_NOPTS_VALUE;
int64_t keypos = -1; int64_t keypos = -1;
int i = -1; int i = -1;
int pstart, psize;
avio_seek(bc, *pos_arg, SEEK_SET); avio_seek(bc, *pos_arg, SEEK_SET);
ogg_reset(ogg); ogg_reset(ogg);
while (avio_tell(bc) < pos_limit && !ogg_packet(s, &i, NULL, NULL, pos_arg)) { while (avio_tell(bc) < pos_limit && !ogg_packet(s, &i, &pstart, &psize, pos_arg)) {
if (i == stream_index) { if (i == stream_index) {
struct ogg_stream *os = ogg->streams + stream_index; struct ogg_stream *os = ogg->streams + stream_index;
pts = ogg_calc_pts(s, i, NULL); pts = ogg_calc_pts(s, i, NULL);
ogg_validate_keyframe(s, i, pstart, psize);
if (os->pflags & AV_PKT_FLAG_KEY) { if (os->pflags & AV_PKT_FLAG_KEY) {
keypos = *pos_arg; keypos = *pos_arg;
} else if (os->keyframe_seek) { } else if (os->keyframe_seek) {