float -> double in a few places.

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

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 8afd4c164a85a54c1fc8dd11e147bc49cd407334..bcc5a86a68dbe2b093b95f76702de22df1b64e2e 100644 (file)
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -20,6 +20,8 @@
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
+#include <libavutil/pixfmt.h>
+#include <libavutil/pixdesc.h>
 }
 #include "ffmpeg_examiner.h"
 #include "ffmpeg_content.h"
@@ -40,6 +42,7 @@ using boost::optional;
 /** @param job job that the examiner is operating in, or 0 */
 FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Job> job)
        : FFmpeg (c)
+       , _video_length (0)
        , _need_video_length (false)
 {
        /* Find audio and subtitle streams */
@@ -55,7 +58,7 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
                        if (s->codec->channel_layout == 0) {
                                s->codec->channel_layout = av_get_default_channel_layout (s->codec->channels);
                        }
-                       
+
                        _audio_streams.push_back (
                                shared_ptr<FFmpegAudioStream> (
                                        new FFmpegAudioStream (audio_stream_name (s), s->id, s->codec->sample_rate, s->codec->channels)
@@ -70,12 +73,16 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
        /* 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);
+               _video_length = (double (_format_context->duration) / AV_TIME_BASE) * video_frame_rate().get ();
        } else if (job) {
                job->sub (_("Finding length"));
                job->set_progress_unknown ();
        }
 
+       if (job) {
+               job->sub (_("Finding subtitles"));
+       }
+
        /* Run through until we find:
         *   - the first video.
         *   - the first audio for each stream.
@@ -91,12 +98,16 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
                        break;
                }
 
+               if (job) {
+                       job->set_progress_unknown ();
+               }
+
                AVCodecContext* context = _format_context->streams[_packet.stream_index]->codec;
 
                if (_packet.stream_index == _video_stream) {
                        video_packet (context);
                }
-               
+
                for (size_t i = 0; i < _audio_streams.size(); ++i) {
                        if (_audio_streams[i]->uses_index (_format_context, _packet.stream_index)) {
                                audio_packet (context, _audio_streams[i]);
@@ -126,7 +137,9 @@ FFmpegExaminer::video_packet (AVCodecContext* context)
                        _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 ());
+                       _video_length = frame_time (
+                               _format_context->streams[_video_stream]
+                               ).get_value_or (ContentTime ()).frames (video_frame_rate().get ());
                }
        }
 }
@@ -169,7 +182,7 @@ optional<ContentTime>
 FFmpegExaminer::frame_time (AVStream* s) const
 {
        optional<ContentTime> t;
-       
+
        int64_t const bet = av_frame_get_best_effort_timestamp (_frame);
        if (bet != AV_NOPTS_VALUE) {
                t = ContentTime::from_seconds (bet * av_q2d (s->time_base));
@@ -178,7 +191,7 @@ FFmpegExaminer::frame_time (AVStream* s) const
        return t;
 }
 
-optional<float>
+optional<double>
 FFmpegExaminer::video_frame_rate () const
 {
        /* This use of r_frame_rate is debateable; there's a few different
@@ -195,22 +208,21 @@ FFmpegExaminer::video_size () const
 }
 
 /** @return Length according to our content's header */
-ContentTime
+Frame
 FFmpegExaminer::video_length () const
 {
-       ContentTime const length = ContentTime::from_seconds (double (_format_context->duration) / AV_TIME_BASE);
-       return ContentTime (max (ContentTime (1), _video_length));
+       return max (Frame (1), _video_length);
 }
 
-optional<float>
+optional<double>
 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 optional<double> ();
        }
-       return float (sar.num) / sar.den;
+       return double (sar.num) / sar.den;
 }
 
 string
@@ -253,7 +265,7 @@ FFmpegExaminer::stream_name (AVStream* s) const
                if (lang) {
                        n << lang->value;
                }
-               
+
                AVDictionaryEntry const * title = av_dict_get (s->metadata, "title", 0, 0);
                if (title) {
                        if (!n.str().empty()) {
@@ -265,3 +277,9 @@ FFmpegExaminer::stream_name (AVStream* s) const
 
        return n.str ();
 }
+
+int
+FFmpegExaminer::bits_per_pixel () const
+{
+       return av_get_bits_per_pixel (av_pix_fmt_desc_get (video_codec_context()->pix_fmt));
+}