RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add support for seeking to a keyframe instead of a random frame 

Originally committed as revision 8698 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2007-04-09 17:03:20 +00:00
parent 79f2634686
commit 6207bb209e
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/matroska.c
View File

@ -343,6 +343,10 @@ typedef struct MatroskaDemuxContext {
/* The index for seeking. */ /* The index for seeking. */
int num_indexes; int num_indexes;
MatroskaDemuxIndex *index; MatroskaDemuxIndex *index;
/* What to skip before effectively reading a packet. */
int skip_to_keyframe;
AVStream *skip_to_stream;
} MatroskaDemuxContext; } MatroskaDemuxContext;
/* /*
@ -2436,6 +2440,13 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size,
size -= 1; size -= 1;
if (is_keyframe == -1) if (is_keyframe == -1)
is_keyframe = flags & 1 ? PKT_FLAG_KEY : 0; 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) { switch ((flags & 0x06) >> 1) {
case 0x0: /* no lacing */ case 0x0: /* no lacing */
laces = 1; laces = 1;
@ -2782,6 +2793,8 @@ matroska_read_seek (AVFormatContext *s, int stream_index, int64_t timestamp,
/* do the seek */ /* do the seek */
url_fseek(&s->pb, st->index_entries[index].pos, SEEK_SET); 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->num_packets = 0;
matroska->peek_id = 0; matroska->peek_id = 0;
return 0; return 0;