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 748fb9d7e8016363e8ed03ac5ac177b539017dc3..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,7 +164,7 @@ FFmpegDecoder::setup_video ()
                throw DecodeError ("could not find video decoder");
        }
 
-       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");
        }
 }
@@ -179,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
@@ -629,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();
+}