Hand-apply 111f02f4fc8ace359a16aea1c88c2821bf3dde31 from master; improve progress...

[dcpomatic.git] / src / lib / ffmpeg_examiner.cc

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 48d85da6f11113cb6cabc83215505c8df766110a..4409526dc4872015897357ffa385a28259a6acf2 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
@@ -23,6 +23,7 @@ extern "C" {
 }
 #include "ffmpeg_examiner.h"
 #include "ffmpeg_content.h"
+#include "job.h"
 #include "ffmpeg_audio_stream.h"
 #include "ffmpeg_subtitle_stream.h"
 #include "util.h"
@@ -36,8 +37,10 @@ using std::max;
 using boost::shared_ptr;
 using boost::optional;
 
-FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c)
+/** @param job job that the examiner is operating in, or 0 */
+FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Job> job)
        : FFmpeg (c)
+       , _need_video_length (false)
 {
        /* Find audio and subtitle streams */
 
@@ -64,6 +67,15 @@ 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);
+       } else if (job) {
+               job->sub (_("Finding length"));
+               job->set_progress_unknown ();
+       }
+
        /* Run through until we find:
         *   - the first video.
         *   - the first audio for each stream.
@@ -104,13 +116,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 ());
+               }
        }
 }
 
@@ -156,7 +173,7 @@ FFmpegExaminer::frame_time (AVStream* s) const
        return t;
 }
 
-float
+optional<float>
 FFmpegExaminer::video_frame_rate () const
 {
        /* This use of r_frame_rate is debateable; there's a few different
@@ -177,7 +194,18 @@ 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>
+FFmpegExaminer::sample_aspect_ratio () const
+{
+       AVRational sar = av_guess_sample_aspect_ratio (_format_context, _format_context->streams[_video_stream], 0);
+       if (sar.num == 0) {
+               /* I assume this means that we don't know */
+               return optional<float> ();
+       }
+       return float (sar.num) / sar.den;
 }
 
 string