Fix tests.
[dcpomatic.git] / src / lib / player.cc
index 757f9bbcecfe8f6df35fdc421783f2af0bdabacd..cd1c54d5bd466e78834d36d87c10476e180e6410 100644 (file)
@@ -17,6 +17,7 @@
 
 */
 
+#include <stdint.h>
 #include "player.h"
 #include "film.h"
 #include "ffmpeg_decoder.h"
@@ -41,6 +42,8 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
+#define DEBUG_PLAYER 1
+
 struct Piece
 {
        Piece (shared_ptr<Content> c, shared_ptr<Decoder> d)
@@ -51,13 +54,36 @@ struct Piece
        shared_ptr<Content> content;
        shared_ptr<Decoder> decoder;
 };
+       
+
+#ifdef DEBUG_PLAYER
+std::ostream& operator<<(std::ostream& s, Piece const & p)
+{
+       if (dynamic_pointer_cast<NullContent> (p.content)) {
+               if (dynamic_pointer_cast<SilenceDecoder> (p.decoder)) {
+                       s << "\tsilence    ";
+               } else {
+                       s << "\tblack      ";
+               }
+       } else if (dynamic_pointer_cast<FFmpegContent> (p.content)) {
+               s << "\tffmpeg     ";
+       } else if (dynamic_pointer_cast<ImageMagickContent> (p.content)) {
+               s << "\timagemagick";
+       } else if (dynamic_pointer_cast<SndfileContent> (p.content)) {
+               s << "\tsndfile    ";
+       }
+       
+       s << " at " << p.content->start() << " until " << p.content->end();
+       
+       return s;
+}
+#endif 
 
 Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
        : _film (f)
        , _playlist (p)
        , _video (true)
        , _audio (true)
-       , _subtitles (true)
        , _have_valid_pieces (false)
        , _position (0)
        , _audio_buffers (f->dcp_audio_channels(), 0)
@@ -79,12 +105,6 @@ Player::disable_audio ()
        _audio = false;
 }
 
-void
-Player::disable_subtitles ()
-{
-       _subtitles = false;
-}
-
 bool
 Player::pass ()
 {
@@ -101,11 +121,6 @@ Player::pass ()
         shared_ptr<Piece> earliest;
 
        for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
-               cout << "check " << (*i)->content->file()
-                    << " start=" << (*i)->content->start()
-                    << ", next=" << (*i)->decoder->next()
-                    << ", end=" << (*i)->content->end() << "\n";
-               
                if ((*i)->decoder->done ()) {
                        continue;
                }
@@ -114,9 +129,8 @@ Player::pass ()
                        continue;
                }
                
-               Time const t = (*i)->content->start() + (*i)->decoder->next();
+               Time const t = (*i)->content->start() + (*i)->decoder->position();
                if (t < earliest_t) {
-                       cout << "\t candidate; " << t << " " << (t / TIME_HZ) << ".\n";
                        earliest_t = t;
                        earliest = *i;
                }
@@ -127,23 +141,8 @@ Player::pass ()
                return true;
        }
 
-       cout << "PASS:\n";
-       cout << "\tpass " << earliest->content->file() << " ";
-       if (dynamic_pointer_cast<FFmpegContent> (earliest->content)) {
-               cout << " FFmpeg.\n";
-       } else if (dynamic_pointer_cast<ImageMagickContent> (earliest->content)) {
-               cout << " ImageMagickContent.\n";
-       } else if (dynamic_pointer_cast<SndfileContent> (earliest->content)) {
-               cout << " SndfileContent.\n";
-       } else if (dynamic_pointer_cast<BlackDecoder> (earliest->decoder)) {
-               cout << " Black.\n";
-       } else if (dynamic_pointer_cast<SilenceDecoder> (earliest->decoder)) {
-               cout << " Silence.\n";
-       }
-       
        earliest->decoder->pass ();
-       _position = earliest->content->start() + earliest->decoder->next ();
-       cout << "\tpassed to " << _position << " " << (_position / TIME_HZ) << "\n";
+       _position = earliest->content->start() + earliest->decoder->position ();
 
         return false;
 }
@@ -175,6 +174,8 @@ Player::process_audio (weak_ptr<Content> weak_content, shared_ptr<const AudioBuf
 
        time += content->start ();
 
+       cout << "Player gets " << audio->frames() << " @ " << time << " cf " << _next_audio << "\n";
+
         if (time > _next_audio) {
                 /* We can emit some audio from our buffers */
                 OutputAudioFrame const N = _film->time_to_audio_frames (time - _next_audio);
@@ -222,13 +223,10 @@ Player::seek (Time t)
                return;
        }
 
-//     cout << "seek to " << t << " " << (t / TIME_HZ) << "\n";
-
        for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
                Time s = t - (*i)->content->start ();
                s = max (static_cast<Time> (0), s);
                s = min ((*i)->content->length(), s);
-//             cout << "seek [" << (*i)->content->file() << "," << (*i)->content->start() << "," << (*i)->content->end() << "] to " << s << "\n";
                (*i)->decoder->seek (s);
        }
 
@@ -256,7 +254,6 @@ Player::add_black_piece (Time s, Time len)
        shared_ptr<BlackDecoder> bd (new BlackDecoder (_film, nc));
        bd->Video.connect (bind (&Player::process_video, this, nc, _1, _2, _3));
        _pieces.push_back (shared_ptr<Piece> (new Piece (nc, bd)));
-       cout << "\tblack @ " << s << " -- " << (s + len) << "\n";
 }
 
 void
@@ -266,15 +263,12 @@ Player::add_silent_piece (Time s, Time len)
        shared_ptr<SilenceDecoder> sd (new SilenceDecoder (_film, nc));
        sd->Audio.connect (bind (&Player::process_audio, this, nc, _1, _2));
        _pieces.push_back (shared_ptr<Piece> (new Piece (nc, sd)));
-       cout << "\tsilence @ " << s << " -- " << (s + len) << "\n";
 }
 
 
 void
 Player::setup_pieces ()
 {
-       cout << "----- Player SETUP PIECES.\n";
-
        list<shared_ptr<Piece> > old_pieces = _pieces;
 
        _pieces.clear ();
@@ -290,13 +284,15 @@ Player::setup_pieces ()
 
                shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
                if (fc) {
-                       shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (_film, fc, _video, _audio, _subtitles));
+                       shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (_film, fc, _video, _audio));
                        
                        fd->Video.connect (bind (&Player::process_video, this, *i, _1, _2, _3));
                        fd->Audio.connect (bind (&Player::process_audio, this, *i, _1, _2));
+                       if (_video_container_size) {
+                               fd->set_video_container_size (_video_container_size.get ());
+                       }
 
                        decoder = fd;
-                       cout << "\tFFmpeg @ " << fc->start() << " -- " << fc->end() << "\n";
                }
                
                shared_ptr<const ImageMagickContent> ic = dynamic_pointer_cast<const ImageMagickContent> (*i);
@@ -314,10 +310,12 @@ Player::setup_pieces ()
                        if (!id) {
                                id.reset (new ImageMagickDecoder (_film, ic));
                                id->Video.connect (bind (&Player::process_video, this, *i, _1, _2, _3));
+                               if (_video_container_size) {
+                                       id->set_video_container_size (_video_container_size.get ());
+                               }
                        }
 
                        decoder = id;
-                       cout << "\tImageMagick @ " << ic->start() << " -- " << ic->end() << "\n";
                }
 
                shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (*i);
@@ -326,7 +324,6 @@ Player::setup_pieces ()
                        sd->Audio.connect (bind (&Player::process_audio, this, *i, _1, _2));
 
                        decoder = sd;
-                       cout << "\tSndfile @ " << sc->start() << " -- " << sc->end() << "\n";
                }
 
                _pieces.push_back (shared_ptr<Piece> (new Piece (*i, decoder)));
@@ -361,6 +358,13 @@ Player::setup_pieces ()
        } else if (audio_pos < video_pos) {
                add_silent_piece (audio_pos, video_pos - audio_pos);
        }
+
+#ifdef DEBUG_PLAYER
+       cout << "=== Player setup:\n";
+       for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
+               cout << *(i->get()) << "\n";
+       }
+#endif 
 }
 
 void
@@ -381,3 +385,15 @@ Player::playlist_changed ()
 {
        _have_valid_pieces = false;
 }
+
+void
+Player::set_video_container_size (libdcp::Size s)
+{
+       _video_container_size = s;
+       for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
+               shared_ptr<VideoDecoder> vd = dynamic_pointer_cast<VideoDecoder> ((*i)->decoder);
+               if (vd) {
+                       vd->set_video_container_size (s);
+               }
+       }
+}