Hand-apply cb998bee2e70f3426fd95655736deae803efa58e from master; examine a whole...

diff --git a/ChangeLog b/ChangeLog
index 1a86e5b00bb6dc258a6579b19488a442c7d37967..b321f4bf1510d84806ab5ce685770df744f03e87 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-01-23  Carl Hetherington  <cth@carlh.net>
 
+       * Scan a whole FFmpeg file if no duration is given
+       in its header.
+
        * Fix flicker of SubRip subtitles in some cases.
 
        * Version 2.0.37 released.

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 1d01981f60c80dd55dc19f185bc8fda2b3e0dfe0..f28060a56da356d30f48295db8c4e9d0444cb56a 100644 (file)
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -38,6 +38,7 @@ using boost::optional;
 
 FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c)
        : FFmpeg (c)
+       , _need_video_length (false)
 {
        /* Find audio and subtitle streams */
 
@@ -64,6 +65,12 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c)
                }
        }
 
+       /* See if the header has duration information in it */
+       _need_video_length = _format_context->duration == AV_NOPTS_VALUE;
+       if (!_need_video_length) {
+               _video_length = ContentTime::from_seconds (double (_format_context->duration) / AV_TIME_BASE);
+       }
+
        /* Run through until we find:
         *   - the first video.
         *   - the first audio for each stream.
@@ -104,13 +111,18 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c)
 void
 FFmpegExaminer::video_packet (AVCodecContext* context)
 {
-       if (_first_video) {
+       if (_first_video && !_need_video_length) {
                return;
        }
 
        int frame_finished;
        if (avcodec_decode_video2 (context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
-               _first_video = frame_time (_format_context->streams[_video_stream]);
+               if (!_first_video) {
+                       _first_video = frame_time (_format_context->streams[_video_stream]);
+               }
+               if (_need_video_length) {
+                       _video_length = frame_time (_format_context->streams[_video_stream]).get_value_or (ContentTime ());
+               }
        }
 }
 
@@ -177,7 +189,7 @@ ContentTime
 FFmpegExaminer::video_length () const
 {
        ContentTime const length = ContentTime::from_seconds (double (_format_context->duration) / AV_TIME_BASE);
-       return ContentTime (max (ContentTime::Type (1), length.get ()));
+       return ContentTime (max (ContentTime (1), _video_length));
 }
 
 optional<float>

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 1ef7e3ba90f00f6dc04dfa2c9fe029e1a108fe87..c24d2ebcfd6ca44ebbb9a10f0e7b2260cb7001dd 100644 (file)
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -59,4 +59,9 @@ private:
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
        std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
        boost::optional<ContentTime> _first_video;
+       /** Video length, either obtained from the header or derived by running
+        *  through the whole file.
+        */
+       ContentTime _video_length;
+       bool _need_video_length;
 };