From 09f4822e4eaf61513b9092414450f3ae920ccd9d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 3 Aug 2012 14:39:46 +0200 Subject: [PATCH] flvdec: perform duration search just once MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When loading a truncated flv file, it would previously try to do a seek to the end of every packet read. For some input protocols (such as http), such repeated seek attempts are cripple the reading performance. Signed-off-by: Martin Storsjö --- libavformat/flvdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 96504e704d..cf9769a439 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -57,6 +57,7 @@ typedef struct FLVContext { } validate_index[2]; int validate_next; int validate_count; + int searched_for_end; } FLVContext; static int flv_probe(AVProbeData *p) @@ -836,7 +837,8 @@ skip: // if not streamed and no duration from metadata then seek to end to find // the duration from the timestamps - if (s->pb->seekable && (!s->duration || s->duration == AV_NOPTS_VALUE)) { + if (s->pb->seekable && (!s->duration || s->duration == AV_NOPTS_VALUE) && + !flv->searched_for_end) { int size; const int64_t pos = avio_tell(s->pb); // Read the last 4 bytes of the file, this should be the size of the @@ -853,6 +855,7 @@ skip: s->duration = ts * (int64_t)AV_TIME_BASE / 1000; } avio_seek(s->pb, pos, SEEK_SET); + flv->searched_for_end = 1; } if (is_audio) {