ChangeLog.

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

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index e2e5b9d643cc5d565e00a98307aa6f507ee6906a..5a1b78762d92e6e30d55108dfae637f8b348e676 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -42,6 +42,7 @@ extern "C" {
 #include "ffmpeg_decoder.h"
 #include "filter_graph.h"
 #include "audio_buffers.h"
+#include "ffmpeg_content.h"
 
 #include "i18n.h"
 
@@ -96,6 +97,8 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegC
                _video_pts_offset = _audio_pts_offset = - min (c->first_video().get(), c->audio_stream()->first_audio.get());
        } else if (have_video) {
                _video_pts_offset = - c->first_video().get();
+       } else if (have_audio) {
+               _audio_pts_offset = - c->audio_stream()->first_audio.get();
        }
 
        /* Now adjust both so that the video pts starts on a frame */
@@ -140,8 +143,6 @@ FFmpegDecoder::flush ()
                decode_audio_packet ();
        }
 
-       AudioDecoder::flush ();
-       
        /* Stop us being asked for any more data */
        _video_position = _ffmpeg_content->video_length ();
        _audio_position = _ffmpeg_content->audio_length ();
@@ -168,11 +169,16 @@ FFmpegDecoder::pass ()
 
        avcodec_get_frame_defaults (_frame);
 
-       if (_packet.stream_index == _video_stream && _decode_video) {
+       shared_ptr<const Film> film = _film.lock ();
+       assert (film);
+
+       int const si = _packet.stream_index;
+       
+       if (si == _video_stream && _decode_video) {
                decode_video_packet ();
-       } else if (_ffmpeg_content->audio_stream() && _packet.stream_index == _ffmpeg_content->audio_stream()->id && _decode_audio) {
+       } else if (_ffmpeg_content->audio_stream() && si == _ffmpeg_content->audio_stream()->index (_format_context) && _decode_audio) {
                decode_audio_packet ();
-       } else if (_ffmpeg_content->subtitle_stream() && _packet.stream_index == _ffmpeg_content->subtitle_stream()->id) {
+       } else if (_ffmpeg_content->subtitle_stream() && si == _ffmpeg_content->subtitle_stream()->index (_format_context) && film->with_subtitles ()) {
                decode_subtitle_packet ();
        }
 
@@ -335,6 +341,7 @@ FFmpegDecoder::seek (VideoContent::Frame frame, bool accurate)
                }
 
                if (_packet.stream_index != _video_stream) {
+                       av_free_packet (&_packet);
                        continue;
                }
                
@@ -365,43 +372,48 @@ FFmpegDecoder::decode_audio_packet ()
        */
        
        AVPacket copy_packet = _packet;
-
+       
        while (copy_packet.size > 0) {
 
                int frame_finished;
                int const decode_result = avcodec_decode_audio4 (audio_codec_context(), _frame, &frame_finished, &copy_packet);
-               if (decode_result >= 0) {
-                       if (frame_finished) {
-
-                               if (_audio_position == 0) {
-                                       /* Where we are in the source, in seconds */
-                                       double const pts = av_q2d (_format_context->streams[copy_packet.stream_index]->time_base)
-                                               * av_frame_get_best_effort_timestamp(_frame) + _audio_pts_offset;
-
-                                       if (pts > 0) {
-                                               /* Emit some silence */
-                                               shared_ptr<AudioBuffers> silence (
-                                                       new AudioBuffers (
-                                                               _ffmpeg_content->audio_channels(),
-                                                               pts * _ffmpeg_content->content_audio_frame_rate()
-                                                               )
-                                                       );
-                                               
-                                               silence->make_silent ();
-                                               audio (silence, _audio_position);
-                                       }
-                               }
-
-                               int const data_size = av_samples_get_buffer_size (
-                                       0, audio_codec_context()->channels, _frame->nb_samples, audio_sample_format (), 1
-                                       );
+               if (decode_result < 0) {
+                       shared_ptr<const Film> film = _film.lock ();
+                       assert (film);
+                       film->log()->log (String::compose ("avcodec_decode_audio4 failed (%1)", decode_result));
+                       return;
+               }
 
-                               audio (deinterleave_audio (_frame->data, data_size), _audio_position);
-                               
-                               copy_packet.data += decode_result;
-                               copy_packet.size -= decode_result;
+               if (frame_finished) {
+                       
+                       if (_audio_position == 0) {
+                               /* Where we are in the source, in seconds */
+                               double const pts = av_q2d (_format_context->streams[copy_packet.stream_index]->time_base)
+                                       * av_frame_get_best_effort_timestamp(_frame) + _audio_pts_offset;
+
+                               if (pts > 0) {
+                                       /* Emit some silence */
+                                       shared_ptr<AudioBuffers> silence (
+                                               new AudioBuffers (
+                                                       _ffmpeg_content->audio_channels(),
+                                                       pts * _ffmpeg_content->content_audio_frame_rate()
+                                                       )
+                                               );
+                                       
+                                       silence->make_silent ();
+                                       audio (silence, _audio_position);
+                               }
                        }
+                       
+                       int const data_size = av_samples_get_buffer_size (
+                               0, audio_codec_context()->channels, _frame->nb_samples, audio_sample_format (), 1
+                               );
+                       
+                       audio (deinterleave_audio (_frame->data, data_size), _audio_position);
                }
+                       
+               copy_packet.data += decode_result;
+               copy_packet.size -= decode_result;
        }
 }
 
@@ -501,11 +513,11 @@ FFmpegDecoder::setup_subtitle ()
 {
        boost::mutex::scoped_lock lm (_mutex);
        
-       if (!_ffmpeg_content->subtitle_stream() || _ffmpeg_content->subtitle_stream()->id >= int (_format_context->nb_streams)) {
+       if (!_ffmpeg_content->subtitle_stream() || _ffmpeg_content->subtitle_stream()->index (_format_context) >= int (_format_context->nb_streams)) {
                return;
        }
 
-       _subtitle_codec_context = _format_context->streams[_ffmpeg_content->subtitle_stream()->id]->codec;
+       _subtitle_codec_context = _ffmpeg_content->subtitle_stream()->stream(_format_context)->codec;
        _subtitle_codec = avcodec_find_decoder (_subtitle_codec_context->codec_id);
 
        if (_subtitle_codec == 0) {