Merge branch 'master' into speed-up

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

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 4a6e236c3747c2326171bb68a60a4e05ba6a2ca9..acaf149f43ade599dff78d95c109d36c86133097 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -120,11 +120,21 @@ FFmpegDecoder::setup_general ()
                if (s->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
                        _video_stream = i;
                } else if (s->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
+
+                       /* This is a hack; sometimes it seems that _audio_codec_context->channel_layout isn't set up,
+                          so bodge it here.  No idea why we should have to do this.
+                       */
+                       
+                       if (s->codec->channel_layout == 0) {
+                               s->codec->channel_layout = av_get_default_channel_layout (s->codec->channels);
+                       }
+                       
                        _audio_streams.push_back (
                                shared_ptr<AudioStream> (
                                        new FFmpegAudioStream (stream_name (s), i, s->codec->sample_rate, s->codec->channel_layout)
                                        )
                                );
+                       
                } else if (s->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
                        _subtitle_streams.push_back (
                                shared_ptr<SubtitleStream> (
@@ -154,14 +164,7 @@ FFmpegDecoder::setup_video ()
                throw DecodeError ("could not find video decoder");
        }
 
-       /* I think this prevents problems with green hash on decodes and
-          "changing frame properties on the fly is not supported by all filters"
-          messages with some content.  Although I'm not sure; needs checking.
-       */
-       AVDictionary* opts = 0;
-       av_dict_set (&opts, "threads", "1", 0);
-       
-       if (avcodec_open2 (_video_codec_context, _video_codec, &opts) < 0) {
+       if (avcodec_open2 (_video_codec_context, _video_codec, 0) < 0) {
                throw DecodeError ("could not open video decoder");
        }
 }
@@ -186,14 +189,6 @@ FFmpegDecoder::setup_audio ()
        if (avcodec_open2 (_audio_codec_context, _audio_codec, 0) < 0) {
                throw DecodeError ("could not open audio decoder");
        }
-
-       /* This is a hack; sometimes it seems that _audio_codec_context->channel_layout isn't set up,
-          so bodge it here.  No idea why we should have to do this.
-       */
-
-       if (_audio_codec_context->channel_layout == 0) {
-               _audio_codec_context->channel_layout = av_get_default_channel_layout (ffa->channels());
-       }
 }
 
 void
@@ -277,6 +272,11 @@ FFmpegDecoder::pass ()
                        double const source_pts_seconds = av_q2d (_format_context->streams[_packet.stream_index]->time_base)
                                * av_frame_get_best_effort_timestamp(_frame);
 
+                       _film->log()->log (
+                               String::compose ("Source video frame ready; source at %1, output at %2", source_pts_seconds, out_pts_seconds),
+                               Log::VERBOSE
+                               );
+
                        if (!_first_video) {
                                _first_video = source_pts_seconds;
                        }
@@ -292,8 +292,8 @@ FFmpegDecoder::pass ()
                                        repeat_last_video ();
                                        _film->log()->log (
                                                String::compose (
-                                                       "Extra frame inserted at %1s; source frame %2, source PTS %3",
-                                                       out_pts_seconds, video_frame(), source_pts_seconds
+                                                       "Extra video frame inserted at %1s; source frame %2, source PTS %3 (at %4 fps)",
+                                                       out_pts_seconds, video_frame(), source_pts_seconds, frames_per_second()
                                                        )
                                                );
                                }
@@ -336,7 +336,7 @@ FFmpegDecoder::pass ()
                                        
                                        _film->log()->log (
                                                String::compose (
-                                                       "First video at %1, first audio at %2, pushing %3 frames of silence for %4 channels (%5 bytes per sample)",
+                                                       "First video at %1, first audio at %2, pushing %3 audio frames of silence for %4 channels (%5 bytes per sample)",
                                                        _first_video.get(), _first_audio.get(), s, ffa->channels(), bytes_per_audio_sample()
                                                        )
                                                );
@@ -366,7 +366,12 @@ FFmpegDecoder::pass ()
                           indicate that the previous subtitle should stop.
                        */
                        if (sub.num_rects > 0) {
-                               emit_subtitle (shared_ptr<TimedSubtitle> (new TimedSubtitle (sub, _first_video.get())));
+                               shared_ptr<TimedSubtitle> ts;
+                               try {
+                                       emit_subtitle (shared_ptr<TimedSubtitle> (new TimedSubtitle (sub, _first_video.get())));
+                               } catch (...) {
+                                       /* some problem with the subtitle; we probably didn't understand it */
+                               }
                        } else {
                                emit_subtitle (shared_ptr<TimedSubtitle> ());
                        }
@@ -626,3 +631,9 @@ FFmpegAudioStream::to_string () const
        return String::compose ("ffmpeg %1 %2 %3 %4", _id, _sample_rate, _channel_layout, _name);
 }
 
+/** @return Length (in video frames) according to our content's header */
+SourceFrame
+FFmpegDecoder::length () const
+{
+       return (double(_format_context->duration) / AV_TIME_BASE) * frames_per_second();
+}