Move resampling back into AudioDecoder and fix various screw-ups with audio in the...
[dcpomatic.git] / src / lib / ffmpeg_decoder.cc
index f1d984ee15967aa1576426127769fc0bddb23da3..d8319723a3538f03cdb6bb94fe3ec41cb1082287 100644 (file)
@@ -41,7 +41,6 @@ extern "C" {
 #include "log.h"
 #include "ffmpeg_decoder.h"
 #include "filter_graph.h"
-#include "subtitle.h"
 #include "audio_buffers.h"
 
 #include "i18n.h"
@@ -52,6 +51,7 @@ using std::vector;
 using std::stringstream;
 using std::list;
 using std::min;
+using std::pair;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
@@ -61,17 +61,62 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegC
        : Decoder (f)
        , VideoDecoder (f, c)
        , AudioDecoder (f, c)
+       , SubtitleDecoder (f)
        , FFmpeg (c)
        , _subtitle_codec_context (0)
        , _subtitle_codec (0)
        , _decode_video (video)
        , _decode_audio (audio)
+       , _video_pts_offset (0)
+       , _audio_pts_offset (0)
+       , _just_sought (false)
 {
        setup_subtitle ();
+
+       /* Audio and video frame PTS values may not start with 0.  We want
+          to fiddle them so that:
+
+          1.  One of them starts at time 0.
+          2.  The first video PTS value ends up on a frame boundary.
+
+          Then we remove big initial gaps in PTS and we allow our
+          insertion of black frames to work.
+
+          We will do:
+            audio_pts_to_use = audio_pts_from_ffmpeg + audio_pts_offset;
+            video_pts_to_use = video_pts_from_ffmpeg + video_pts_offset;
+       */
+
+       bool const have_video = video && c->first_video();
+       bool const have_audio = audio && c->audio_stream() && c->audio_stream()->first_audio;
+
+       /* First, make one of them start at 0 */
+
+       if (have_audio && have_video) {
+               _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();
+       }
+
+       /* Now adjust both so that the video pts starts on a frame */
+       if (have_video && have_audio) {
+               double first_video = c->first_video().get() + _video_pts_offset;
+               double const old_first_video = first_video;
+               
+               /* Round the first video up to a frame boundary */
+               if (fabs (rint (first_video * c->video_frame_rate()) - first_video * c->video_frame_rate()) > 1e-6) {
+                       first_video = ceil (first_video * c->video_frame_rate()) / c->video_frame_rate ();
+               }
+
+               _video_pts_offset += first_video - old_first_video;
+               _audio_pts_offset += first_video - old_first_video;
+       }
 }
 
 FFmpegDecoder::~FFmpegDecoder ()
 {
+       boost::mutex::scoped_lock lm (_mutex);
+
        if (_subtitle_codec_context) {
                avcodec_close (_subtitle_codec_context);
        }
@@ -100,7 +145,7 @@ FFmpegDecoder::pass ()
                /* XXX: should we reset _packet.data and size after each *_decode_* call? */
                
                if (_decode_video) {
-                       while (decode_video_packet ());
+                       while (decode_video_packet ()) {}
                }
 
                if (_ffmpeg_content->audio_stream() && _decode_audio) {
@@ -108,7 +153,8 @@ FFmpegDecoder::pass ()
                }
 
                /* Stop us being asked for any more data */
-               _next_video = _next_audio = _ffmpeg_content->length ();
+               _video_position = _ffmpeg_content->video_length ();
+               _audio_position = _ffmpeg_content->audio_length ();
                return;
        }
 
@@ -119,25 +165,7 @@ FFmpegDecoder::pass ()
        } else if (_ffmpeg_content->audio_stream() && _packet.stream_index == _ffmpeg_content->audio_stream()->id && _decode_audio) {
                decode_audio_packet ();
        } else if (_ffmpeg_content->subtitle_stream() && _packet.stream_index == _ffmpeg_content->subtitle_stream()->id) {
-
-               int got_subtitle;
-               AVSubtitle sub;
-               if (avcodec_decode_subtitle2 (_subtitle_codec_context, &sub, &got_subtitle, &_packet) && got_subtitle) {
-                       /* Sometimes we get an empty AVSubtitle, which is used by some codecs to
-                          indicate that the previous subtitle should stop.
-                       */
-                       if (sub.num_rects > 0) {
-                               shared_ptr<TimedSubtitle> ts;
-                               try {
-                                       subtitle (shared_ptr<TimedSubtitle> (new TimedSubtitle (sub)));
-                               } catch (...) {
-                                       /* some problem with the subtitle; we probably didn't understand it */
-                               }
-                       } else {
-                               subtitle (shared_ptr<TimedSubtitle> ());
-                       }
-                       avsubtitle_free (&sub);
-               }
+               decode_subtitle_packet ();
        }
 
        av_free_packet (&_packet);
@@ -256,70 +284,69 @@ FFmpegDecoder::bytes_per_audio_sample () const
 }
 
 void
-FFmpegDecoder::seek (Time t)
+FFmpegDecoder::seek (VideoContent::Frame frame, bool accurate)
 {
-       do_seek (t, false, false);
-       VideoDecoder::seek (t);
-}
+       double const time_base = av_q2d (_format_context->streams[_video_stream]->time_base);
 
-void
-FFmpegDecoder::seek_back ()
-{
-       if (position() < (2.5 * TIME_HZ / _ffmpeg_content->video_frame_rate())) {
-               return;
+       /* If we are doing an accurate seek, our initial shot will be 5 frames (5 being
+          a number plucked from the air) earlier than we want to end up.  The loop below
+          will hopefully then step through to where we want to be.
+       */
+       int initial = frame;
+
+       if (accurate) {
+               initial -= 5;
        }
-       
-       do_seek (position() - 2.5 * TIME_HZ / _ffmpeg_content->video_frame_rate(), true, true);
-       VideoDecoder::seek_back ();
-}
 
-void
-FFmpegDecoder::seek_forward ()
-{
-       if (position() >= (_ffmpeg_content->length() - 0.5 * TIME_HZ / _ffmpeg_content->video_frame_rate())) {
-               return;
+       if (initial < 0) {
+               initial = 0;
        }
-       
-       do_seek (position() - 0.5 * TIME_HZ / _ffmpeg_content->video_frame_rate(), true, true);
-       VideoDecoder::seek_forward ();
-}
 
-void
-FFmpegDecoder::do_seek (Time t, bool backwards, bool accurate)
-{
-       int64_t const vt = t / (av_q2d (_format_context->streams[_video_stream]->time_base) * TIME_HZ);
-       av_seek_frame (_format_context, _video_stream, vt, backwards ? AVSEEK_FLAG_BACKWARD : 0);
+       /* Initial seek time in the stream's timebase */
+       int64_t const initial_vt = ((initial / _ffmpeg_content->video_frame_rate()) - _video_pts_offset) / time_base;
+
+       av_seek_frame (_format_context, _video_stream, initial_vt, AVSEEK_FLAG_BACKWARD);
 
        avcodec_flush_buffers (video_codec_context());
        if (_subtitle_codec_context) {
                avcodec_flush_buffers (_subtitle_codec_context);
        }
 
-       if (accurate) {
-               while (1) {
-                       int r = av_read_frame (_format_context, &_packet);
-                       if (r < 0) {
-                               return;
-                       }
-                       
-                       avcodec_get_frame_defaults (_frame);
-                       
-                       if (_packet.stream_index == _video_stream) {
-                               int finished = 0;
-                               int const r = avcodec_decode_video2 (video_codec_context(), _frame, &finished, &_packet);
-                               if (r >= 0 && finished) {
-                                       int64_t const bet = av_frame_get_best_effort_timestamp (_frame);
-                                       if (bet > vt) {
-                                               break;
-                                       }
-                               }
+       _just_sought = true;
+       _video_position = frame;
+       
+       if (frame == 0 || !accurate) {
+               /* We're already there, or we're as close as we need to be */
+               return;
+       }
+
+       while (1) {
+               int r = av_read_frame (_format_context, &_packet);
+               if (r < 0) {
+                       return;
+               }
+
+               if (_packet.stream_index != _video_stream) {
+                       continue;
+               }
+               
+               avcodec_get_frame_defaults (_frame);
+               
+               int finished = 0;
+               r = avcodec_decode_video2 (video_codec_context(), _frame, &finished, &_packet);
+               if (r >= 0 && finished) {
+                       _video_position = rint (
+                               (av_frame_get_best_effort_timestamp (_frame) * time_base + _video_pts_offset) * _ffmpeg_content->video_frame_rate()
+                               );
+
+                       if (_video_position >= (frame - 1)) {
+                               av_free_packet (&_packet);
+                               break;
                        }
-                       
-                       av_free_packet (&_packet);
                }
+               
+               av_free_packet (&_packet);
        }
-
-       return;
 }
 
 void
@@ -337,21 +364,35 @@ FFmpegDecoder::decode_audio_packet ()
                int const decode_result = avcodec_decode_audio4 (audio_codec_context(), _frame, &frame_finished, &copy_packet);
                if (decode_result >= 0) {
                        if (frame_finished) {
-                       
-                               /* Where we are in the source, in seconds */
-                               double const source_pts_seconds = av_q2d (_format_context->streams[copy_packet.stream_index]->time_base)
-                                       * av_frame_get_best_effort_timestamp(_frame);
-                               
+
+                               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);
                                
-                               assert (audio_codec_context()->channels == _ffmpeg_content->audio_channels());
-                               audio (deinterleave_audio (_frame->data, data_size), source_pts_seconds * TIME_HZ);
+                               copy_packet.data += decode_result;
+                               copy_packet.size -= decode_result;
                        }
-                       
-                       copy_packet.data += decode_result;
-                       copy_packet.size -= decode_result;
                }
        }
 }
@@ -363,7 +404,7 @@ FFmpegDecoder::decode_video_packet ()
        if (avcodec_decode_video2 (video_codec_context(), _frame, &frame_finished, &_packet) < 0 || !frame_finished) {
                return false;
        }
-               
+
        boost::mutex::scoped_lock lm (_filter_graphs_mutex);
 
        shared_ptr<FilterGraph> graph;
@@ -385,24 +426,57 @@ FFmpegDecoder::decode_video_packet ()
                graph = *i;
        }
 
-       list<shared_ptr<Image> > images = graph->process (_frame);
+       list<pair<shared_ptr<Image>, int64_t> > images = graph->process (_frame);
 
        string post_process = Filter::ffmpeg_strings (_ffmpeg_content->filters()).second;
        
-       for (list<shared_ptr<Image> >::iterator i = images.begin(); i != images.end(); ++i) {
+       for (list<pair<shared_ptr<Image>, int64_t> >::iterator i = images.begin(); i != images.end(); ++i) {
 
-               shared_ptr<Image> image = *i;
+               shared_ptr<Image> image = i->first;
                if (!post_process.empty ()) {
                        image = image->post_process (post_process, true);
                }
                
-               int64_t const bet = av_frame_get_best_effort_timestamp (_frame);
-               if (bet != AV_NOPTS_VALUE) {
-                       /* XXX: may need to insert extra frames / remove frames here ...
-                          (as per old Matcher)
-                       */
-                       Time const t = bet * av_q2d (_format_context->streams[_video_stream]->time_base) * TIME_HZ;
-                       video (image, false, t);
+               if (i->second != AV_NOPTS_VALUE) {
+
+                       double const pts = i->second * av_q2d (_format_context->streams[_video_stream]->time_base) + _video_pts_offset;
+
+                       if (_just_sought) {
+                               /* We just did a seek, so disable any attempts to correct for where we
+                                  are / should be.
+                               */
+                               _video_position = rint (pts * _ffmpeg_content->video_frame_rate ());
+                               _just_sought = false;
+                       }
+
+                       double const next = _video_position / _ffmpeg_content->video_frame_rate();
+                       double const one_frame = 1 / _ffmpeg_content->video_frame_rate ();
+                       double delta = pts - next;
+
+                       while (delta > one_frame) {
+                               /* This PTS is more than one frame forward in time of where we think we should be; emit
+                                  a black frame.
+                               */
+
+                               /* XXX: I think this should be a copy of the last frame... */
+                               boost::shared_ptr<Image> black (
+                                       new Image (
+                                               static_cast<AVPixelFormat> (_frame->format),
+                                               libdcp::Size (video_codec_context()->width, video_codec_context()->height),
+                                               true
+                                               )
+                                       );
+                               
+                               black->make_black ();
+                               video (image, false, _video_position);
+                               delta -= one_frame;
+                       }
+
+                       if (delta > -one_frame) {
+                               /* This PTS is within a frame of being right; emit this (otherwise it will be dropped) */
+                               video (image, false, _video_position);
+                       }
+                               
                } else {
                        shared_ptr<const Film> film = _film.lock ();
                        assert (film);
@@ -413,27 +487,6 @@ FFmpegDecoder::decode_video_packet ()
        return true;
 }
 
-Time
-FFmpegDecoder::position () const
-{
-       if (_decode_video && _decode_audio && _ffmpeg_content->audio_stream()) {
-               return min (_next_video, _next_audio);
-       }
-
-       if (_decode_audio && _ffmpeg_content->audio_stream()) {
-               return _next_audio;
-       }
-
-       return _next_video;
-}
-
-bool
-FFmpegDecoder::done () const
-{
-       bool const ad = !_decode_audio || !_ffmpeg_content->audio_stream() || audio_done();
-       bool const vd = !_decode_video || video_done();
-       return ad && vd;
-}
        
 void
 FFmpegDecoder::setup_subtitle ()
@@ -455,3 +508,82 @@ FFmpegDecoder::setup_subtitle ()
                throw DecodeError (N_("could not open subtitle decoder"));
        }
 }
+
+bool
+FFmpegDecoder::done () const
+{
+       bool const vd = !_decode_video || (_video_position >= _ffmpeg_content->video_length());
+       bool const ad = !_decode_audio || !_ffmpeg_content->audio_stream() || (_audio_position >= _ffmpeg_content->audio_length());
+       return vd && ad;
+}
+       
+void
+FFmpegDecoder::decode_subtitle_packet ()
+{
+       int got_subtitle;
+       AVSubtitle sub;
+       if (avcodec_decode_subtitle2 (_subtitle_codec_context, &sub, &got_subtitle, &_packet) < 0 || !got_subtitle) {
+               return;
+       }
+
+       /* Sometimes we get an empty AVSubtitle, which is used by some codecs to
+          indicate that the previous subtitle should stop.
+       */
+       if (sub.num_rects <= 0) {
+               subtitle (shared_ptr<Image> (), dcpomatic::Rect<double> (), 0, 0);
+               return;
+       } else if (sub.num_rects > 1) {
+               throw DecodeError (_("multi-part subtitles not yet supported"));
+       }
+               
+       /* Subtitle PTS in seconds (within the source, not taking into account any of the
+          source that we may have chopped off for the DCP)
+       */
+       double const packet_time = static_cast<double> (sub.pts) / AV_TIME_BASE;
+       
+       /* hence start time for this sub */
+       Time const from = (packet_time + (double (sub.start_display_time) / 1e3)) * TIME_HZ;
+       Time const to = (packet_time + (double (sub.end_display_time) / 1e3)) * TIME_HZ;
+
+       AVSubtitleRect const * rect = sub.rects[0];
+
+       if (rect->type != SUBTITLE_BITMAP) {
+               throw DecodeError (_("non-bitmap subtitles not yet supported"));
+       }
+       
+       shared_ptr<Image> image (new Image (PIX_FMT_RGBA, libdcp::Size (rect->w, rect->h), true));
+
+       /* Start of the first line in the subtitle */
+       uint8_t* sub_p = rect->pict.data[0];
+       /* sub_p looks up into a RGB palette which is here */
+       uint32_t const * palette = (uint32_t *) rect->pict.data[1];
+       /* Start of the output data */
+       uint32_t* out_p = (uint32_t *) image->data()[0];
+       
+       for (int y = 0; y < rect->h; ++y) {
+               uint8_t* sub_line_p = sub_p;
+               uint32_t* out_line_p = out_p;
+               for (int x = 0; x < rect->w; ++x) {
+                       *out_line_p++ = palette[*sub_line_p++];
+               }
+               sub_p += rect->pict.linesize[0];
+               out_p += image->stride()[0] / sizeof (uint32_t);
+       }
+
+       libdcp::Size const vs = _ffmpeg_content->video_size ();
+
+       subtitle (
+               image,
+               dcpomatic::Rect<double> (
+                       static_cast<double> (rect->x) / vs.width,
+                       static_cast<double> (rect->y) / vs.height,
+                       static_cast<double> (rect->w) / vs.width,
+                       static_cast<double> (rect->h) / vs.height
+                       ),
+               from,
+               to
+               );
+                         
+       
+       avsubtitle_free (&sub);
+}