# HG changeset patch # User aurel # Date 1176138200 0 # Node ID de75a5a81f28530c884c5abd5aa155acc636068f # Parent fc0b19650faab4f43062fc647dfeb8516efd9478 add support for seeking to a keyframe instead of a random frame diff -r fc0b19650faa -r de75a5a81f28 matroska.c --- a/matroska.c Mon Apr 09 17:00:09 2007 +0000 +++ b/matroska.c Mon Apr 09 17:03:20 2007 +0000 @@ -343,6 +343,10 @@ /* The index for seeking. */ int num_indexes; MatroskaDemuxIndex *index; + + /* What to skip before effectively reading a packet. */ + int skip_to_keyframe; + AVStream *skip_to_stream; } MatroskaDemuxContext; /* @@ -2436,6 +2440,13 @@ size -= 1; if (is_keyframe == -1) is_keyframe = flags & 1 ? PKT_FLAG_KEY : 0; + + if (matroska->skip_to_keyframe) { + if (!is_keyframe || st != matroska->skip_to_stream) + return res; + matroska->skip_to_keyframe = 0; + } + switch ((flags & 0x06) >> 1) { case 0x0: /* no lacing */ laces = 1; @@ -2782,6 +2793,8 @@ /* do the seek */ url_fseek(&s->pb, st->index_entries[index].pos, SEEK_SET); + matroska->skip_to_keyframe = !(flags & AVSEEK_FLAG_ANY); + matroska->skip_to_stream = st; matroska->num_packets = 0; matroska->peek_id = 0; return 0;