Present fixed formats with video content and variable formats with stills.

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

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index c12e6728df299d310607bd46a17ecc5223e8fec6..1096bb253a98daac87110b41e68264269c648a7e 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -142,10 +142,18 @@ FFmpegDecoder::setup_audio ()
        if (_audio_codec == 0) {
                throw DecodeError ("could not find audio decoder");
        }
-       
+
        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 (audio_channels ());
+       }
 }
 
 bool
@@ -153,11 +161,39 @@ FFmpegDecoder::do_pass ()
 {
        int r = av_read_frame (_format_context, &_packet);
        if (r < 0) {
+               if (r != AVERROR_EOF) {
+                       throw DecodeError ("error on av_read_frame");
+               }
+               
+               /* Get any remaining frames */
+               
+               _packet.data = 0;
+               _packet.size = 0;
+
+               int frame_finished;
+
+               if (_opt->decode_video) {
+                       while (avcodec_decode_video2 (_video_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
+                               process_video (_frame);
+                       }
+               }
+
+               if (_audio_stream >= 0 && _opt->decode_audio) {
+                       while (avcodec_decode_audio4 (_audio_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
+                               int const data_size = av_samples_get_buffer_size (
+                                       0, _audio_codec_context->channels, _frame->nb_samples, audio_sample_format (), 1
+                                       );
+                               
+                               assert (_audio_codec_context->channels == _fs->audio_channels);
+                               process_audio (_frame->data[0], data_size);
+                       }
+               }
+
                return true;
        }
 
        if (_packet.stream_index == _video_stream && _opt->decode_video) {
-               
+
                int frame_finished;
                if (avcodec_decode_video2 (_video_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
                        process_video (_frame);
@@ -200,7 +236,7 @@ FFmpegDecoder::audio_channels () const
        if (_audio_codec_context == 0) {
                return 0;
        }
-       
+
        return _audio_codec_context->channels;
 }