Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 6d5e33238913c0f1e1afb79659e005ebb42f099b..40fe0d28ec5cae2e6bc89d800dd9ef57bb195402 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"
@@ -28,6 +30,8 @@ extern "C" {
 #include "ffmpeg_subtitle_stream.h"
 #include "util.h"
 #include "safe_stringstream.h"
+#include <boost/foreach.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -56,7 +60,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)
@@ -90,6 +94,7 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
         * where we should look for subtitles (video and audio are always present,
         * so they are ok).
         */
+
        while (true) {
                int r = av_read_frame (_format_context, &_packet);
                if (r < 0) {
@@ -105,11 +110,16 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
                if (_packet.stream_index == _video_stream) {
                        video_packet (context);
                }
-               
+
+               bool got_all_audio = true;
+
                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]);
                        }
+                       if (!_audio_streams[i]->first_audio) {
+                               got_all_audio = false;
+                       }
                }
 
                for (size_t i = 0; i < _subtitle_streams.size(); ++i) {
@@ -119,6 +129,32 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
                }
 
                av_free_packet (&_packet);
+
+               if (_first_video && got_all_audio && _subtitle_streams.empty ()) {
+                       /* All done */
+                       break;
+               }
+       }
+
+       for (LastSubtitleMap::const_iterator i = _last_subtitle_start.begin(); i != _last_subtitle_start.end(); ++i) {
+               if (i->second) {
+                       i->first->add_subtitle (
+                               ContentTimePeriod (
+                                       i->second.get (),
+                                       ContentTime::from_frames (video_length(), video_frame_rate().get_value_or (24))
+                                       )
+                               );
+               }
+       }
+
+       /* We just added subtitles to our streams without taking the PTS offset into account;
+          this is because we might not know the PTS offset when the first subtitle is seen.
+          Now we know the PTS offset so we can apply it to those subtitles.
+       */
+       if (video_frame_rate()) {
+               BOOST_FOREACH (shared_ptr<FFmpegSubtitleStream> i, _subtitle_streams) {
+                       i->add_offset (pts_offset (_audio_streams, _first_video, video_frame_rate().get()));
+               }
        }
 }
 
@@ -137,7 +173,7 @@ FFmpegExaminer::video_packet (AVCodecContext* context)
                if (_need_video_length) {
                        _video_length = frame_time (
                                _format_context->streams[_video_stream]
-                               ).get_value_or (ContentTime ()).frames (video_frame_rate().get ());
+                               ).get_value_or (ContentTime ()).frames_round (video_frame_rate().get ());
                }
        }
 }
@@ -162,14 +198,23 @@ FFmpegExaminer::subtitle_packet (AVCodecContext* context, shared_ptr<FFmpegSubti
        AVSubtitle sub;
        if (avcodec_decode_subtitle2 (context, &sub, &frame_finished, &_packet) >= 0 && frame_finished) {
                FFmpegSubtitlePeriod const period = subtitle_period (sub);
-               if (sub.num_rects <= 0 && _last_subtitle_start) {
-                       stream->add_subtitle (ContentTimePeriod (_last_subtitle_start.get (), period.from));
-                       _last_subtitle_start = optional<ContentTime> ();
+               LastSubtitleMap::iterator last = _last_subtitle_start.find (stream);
+               if (last != _last_subtitle_start.end() && last->second) {
+                       /* We have seen the start of a subtitle but not yet the end.  Whatever this is
+                          finishes the previous subtitle, so add it */
+                       stream->add_subtitle (ContentTimePeriod (last->second.get (), period.from));
+                       if (sub.num_rects == 0) {
+                               /* This is a `proper' end-of-subtitle */
+                               _last_subtitle_start[stream] = optional<ContentTime> ();
+                       } else {
+                               /* This is just another subtitle, so we start again */
+                               _last_subtitle_start[stream] = period.from;
+                       }
                } else if (sub.num_rects == 1) {
                        if (period.to) {
                                stream->add_subtitle (ContentTimePeriod (period.from, period.to.get ()));
                        } else {
-                               _last_subtitle_start = period.from;
+                               _last_subtitle_start[stream] = period.from;
                        }
                }
                avsubtitle_free (&sub);
@@ -180,7 +225,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));
@@ -189,7 +234,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
@@ -212,15 +257,15 @@ FFmpegExaminer::video_length () const
        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
@@ -263,7 +308,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()) {
@@ -275,3 +320,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));
+}