Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 57d300e18cf0b18e0c863df0aa26fc38ca5ea014..a0965dcfb81a917eef2e0ba46b1223d536f35cc6 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -37,10 +37,10 @@
 #include "raw_image_proxy.h"
 #include "video_decoder.h"
 #include "film.h"
-#include "md5_digester.h"
 #include "audio_decoder.h"
 #include "compose.hpp"
 #include "subtitle_content.h"
+#include "audio_content.h"
 #include <dcp/subtitle_string.h>
 #include <sub/ssa_reader.h>
 #include <sub/subtitle.h>
@@ -74,9 +74,11 @@ using std::map;
 using boost::shared_ptr;
 using boost::is_any_of;
 using boost::split;
+using boost::optional;
+using boost::dynamic_pointer_cast;
 using dcp::Size;
 
-FFmpegDecoder::FFmpegDecoder (shared_ptr<const FFmpegContent> c, shared_ptr<Log> log, bool fast)
+FFmpegDecoder::FFmpegDecoder (shared_ptr<const FFmpegContent> c, shared_ptr<Log> log)
        : FFmpeg (c)
        , _log (log)
 {
@@ -88,7 +90,7 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<const FFmpegContent> c, shared_ptr<Log>
        }
 
        if (c->audio) {
-               audio.reset (new AudioDecoder (this, c->audio, fast, log));
+               audio.reset (new AudioDecoder (this, c->audio, log));
        }
 
        if (c->subtitle) {
@@ -135,7 +137,7 @@ FFmpegDecoder::pass (PassReason reason, bool accurate)
                        /* Maybe we should fail here, but for now we'll just finish off instead */
                        char buf[256];
                        av_strerror (r, buf, sizeof(buf));
-                       LOG_ERROR (N_("error on av_read_frame (%1) (%2)"), buf, r);
+                       LOG_ERROR (N_("error on av_read_frame (%1) (%2)"), &buf[0], r);
                }
 
                flush ();
@@ -327,7 +329,18 @@ FFmpegDecoder::seek (ContentTime time, bool accurate)
           http://www.mjbshaw.com/2012/04/seeking-in-ffmpeg-know-your-timestamp.html
        */
 
-       DCPOMATIC_ASSERT (_video_stream);
+       optional<int> stream;
+
+       if (_video_stream) {
+               stream = _video_stream;
+       } else {
+               shared_ptr<FFmpegAudioStream> s = dynamic_pointer_cast<FFmpegAudioStream> (_ffmpeg_content->audio->stream ());
+               if (s) {
+                       stream = s->index (_format_context);
+               }
+       }
+
+       DCPOMATIC_ASSERT (stream);
 
        ContentTime u = time - _pts_offset;
        if (u < ContentTime ()) {
@@ -335,12 +348,14 @@ FFmpegDecoder::seek (ContentTime time, bool accurate)
        }
        av_seek_frame (
                _format_context,
-               _video_stream.get(),
-               u.seconds() / av_q2d (_format_context->streams[_video_stream.get()]->time_base),
+               stream.get(),
+               u.seconds() / av_q2d (_format_context->streams[stream.get()]->time_base),
                AVSEEK_FLAG_BACKWARD
                );
 
-       avcodec_flush_buffers (video_codec_context());
+       if (video_codec_context ()) {
+               avcodec_flush_buffers (video_codec_context());
+       }
 
        /* XXX: should be flushing audio buffers? */
 
@@ -377,7 +392,7 @@ FFmpegDecoder::decode_audio_packet ()
                if (decode_result < 0) {
                        /* avcodec_decode_audio4 can sometimes return an error even though it has decoded
                           some valid data; for example dca_subframe_footer can return AVERROR_INVALIDDATA
-                          if it overreads the auxiliary data.  ffplay carries on if frame_finished is true,
+                          if it overreads the auxiliary data.  ffplay carries on if frame_finished is true,
                           even in the face of such an error, so I think we should too.
 
                           Returning from the method here caused mantis #352.
@@ -406,7 +421,8 @@ FFmpegDecoder::decode_audio_packet ()
                                ct += ContentTime::from_frames (remove, (*stream)->frame_rate ());
                        }
 
-                       if (data->frames() > 0) {
+                       /* Give this data provided there is some, and its time is sane */
+                       if (ct >= ContentTime() && data->frames() > 0) {
                                audio->give (*stream, data, ct);
                        }
                }
@@ -614,54 +630,8 @@ FFmpegDecoder::decode_ass_subtitle (string ass, ContentTimePeriod period)
 
        sub::RawSubtitle base;
        list<sub::RawSubtitle> raw = sub::SSAReader::parse_line (base, bits[9]);
-       list<sub::Subtitle> subs = sub::collect<list<sub::Subtitle> > (raw);
 
-       /* XXX: lots of this is copied from TextSubtitle; there should probably be some sharing */
-
-       /* Highest line index in this subtitle */
-       int highest = 0;
-       BOOST_FOREACH (sub::Subtitle i, subs) {
-               BOOST_FOREACH (sub::Line j, i.lines) {
-                       DCPOMATIC_ASSERT (j.vertical_position.reference && j.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE);
-                       DCPOMATIC_ASSERT (j.vertical_position.line);
-                       highest = max (highest, j.vertical_position.line.get());
-               }
+       BOOST_FOREACH (sub::Subtitle const & i, sub::collect<list<sub::Subtitle> > (raw)) {
+               subtitle->give_text (period, i);
        }
-
-       list<dcp::SubtitleString> ss;
-
-       BOOST_FOREACH (sub::Subtitle i, sub::collect<list<sub::Subtitle> > (sub::SSAReader::parse_line (base, bits[9]))) {
-               BOOST_FOREACH (sub::Line j, i.lines) {
-                       BOOST_FOREACH (sub::Block k, j.blocks) {
-                               ss.push_back (
-                                       dcp::SubtitleString (
-                                               boost::optional<string> (),
-                                               k.italic,
-                                               k.bold,
-                                               subtitle->content()->colour(),
-                                               /* 48pt is 1/22nd of the screen height */
-                                               48,
-                                               1,
-                                               dcp::Time (i.from.seconds(), 1000),
-                                               dcp::Time (i.to.seconds(), 1000),
-                                               0,
-                                               dcp::HALIGN_CENTER,
-                                               /* This 1.015 is an arbitrary value to lift the bottom sub off the bottom
-                                                  of the screen a bit to a pleasing degree.
-                                               */
-                                               1.015 - ((1 + highest - j.vertical_position.line.get()) * 1.5 / 22),
-                                               dcp::VALIGN_TOP,
-                                               dcp::DIRECTION_LTR,
-                                               k.text,
-                                               subtitle->content()->outline() ? dcp::BORDER : dcp::NONE,
-                                               subtitle->content()->outline_colour(),
-                                               dcp::Time (),
-                                               dcp::Time ()
-                                               )
-                                       );
-                       }
-               }
-       }
-
-       subtitle->give_text (period, ss);
 }