From ded3c7da61e64cf23d2f7bedbd9cf269743e64a6 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 5 Feb 2007 23:06:08 +0000
Subject: [PATCH] dynamic index building so forward and backward seeking in avi
without an index is possible
Originally committed as revision 7842 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/avidec.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 273c20b449a..90fc6b383f3 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -626,9 +626,9 @@ resync:
pkt->stream_index = avi->stream_index;
if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
- if(st->index_entries){
AVIndexEntry *e;
int index;
+ assert(st->index_entries);
index= av_index_search_timestamp(st, pkt->dts, 0);
e= &st->index_entries[index];
@@ -637,11 +637,6 @@ resync:
if (e->flags & AVINDEX_KEYFRAME)
pkt->flags |= PKT_FLAG_KEY;
}
- } else {
- /* if no index, better to say that all frames
- are key frames */
- pkt->flags |= PKT_FLAG_KEY;
- }
} else {
pkt->flags |= PKT_FLAG_KEY;
}
@@ -735,6 +730,13 @@ resync:
avi->stream_index= n;
ast->packet_size= size + 8;
ast->remaining= size;
+
+ {
+ uint64_t pos= url_ftell(pb) - 8;
+ if(!st->index_entries || !st->nb_index_entries || st->index_entries[st->nb_index_entries - 1].pos < pos){
+ av_add_index_entry(st, pos, ast->frame_offset / FFMAX(1, ast->sample_size), size, 0, AVINDEX_KEYFRAME);
+ }
+ }
goto resync;
}
}
--
GitLab