[FFmpeg-cvslog] flvdec: perform duration search just once

Michael Niedermayer git at videolan.org
Wed Jan 27 19:29:40 CET 2016


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  3 14:39:46 2012 +0200| [09f4822e4eaf61513b9092414450f3ae920ccd9d] | committer: Martin Storsjö

flvdec: perform duration search just once

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ö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09f4822e4eaf61513b9092414450f3ae920ccd9d
---

 libavformat/flvdec.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 96504e7..cf9769a 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) {



More information about the ffmpeg-cvslog mailing list