Some missing copy constructors / operator= / noncopyable.

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

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 61764a39dcf1c9b05f6903665070a8f2e2b139fa..50f401fb75fac7d3164ef3c80b10a654554575ea 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -45,7 +45,7 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
-//#define DEBUG_PLAYER 1
+#define DEBUG_PLAYER 1
 
 class Piece
 {
@@ -97,7 +97,7 @@ Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
        , _audio_buffers (f->dcp_audio_channels(), 0)
 {
        _playlist->Changed.connect (bind (&Player::playlist_changed, this));
-       _playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2));
+       _playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3));
        _film->Changed.connect (bind (&Player::film_changed, this, _1));
        set_video_container_size (_film->container()->size (_film->full_frame ()));
 }
@@ -138,7 +138,7 @@ Player::pass ()
                        continue;
                }
 
-               if (dynamic_pointer_cast<VideoDecoder> ((*i)->decoder)) {
+               if (_video && dynamic_pointer_cast<VideoDecoder> ((*i)->decoder)) {
                        if ((*i)->video_position < earliest_t) {
                                earliest_t = (*i)->video_position;
                                earliest = *i;
@@ -146,7 +146,7 @@ Player::pass ()
                        }
                }
 
-               if (dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
+               if (_audio && dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
                        if ((*i)->audio_position < earliest_t) {
                                earliest_t = (*i)->audio_position;
                                earliest = *i;
@@ -168,7 +168,7 @@ Player::pass ()
        case VIDEO:
                if (earliest_t > _video_position) {
 #ifdef DEBUG_PLAYER
-                       cout << "no video here; emitting black frame.\n";
+                       cout << "no video here; emitting black frame (earliest=" << earliest_t << ", video_position=" << _video_position << ").\n";
 #endif
                        emit_black ();
                } else {
@@ -232,12 +232,16 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
        if (image_size != _video_container_size) {
                assert (image_size.width <= _video_container_size.width);
                assert (image_size.height <= _video_container_size.height);
-               shared_ptr<Image> im (new SimpleImage (PIX_FMT_RGB24, _video_container_size, true));
+               shared_ptr<Image> im (new Image (PIX_FMT_RGB24, _video_container_size, true));
                im->make_black ();
                im->copy (work_image, Position<int> ((_video_container_size.width - image_size.width) / 2, (_video_container_size.height - image_size.height) / 2));
                work_image = im;
        }
 
+#ifdef DCPOMATIC_DEBUG
+       _last_video = piece->content;
+#endif 
+
         Video (work_image, same, time);
        time += TIME_HZ / _film->dcp_video_frame_rate();
 
@@ -308,10 +312,6 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers
                        _audio_buffers.make_silent (0, _audio_buffers.frames());
                        _audio_buffers.set_frames (N);
                }
-                       
-               if (N > _audio_buffers.frames()) {
-                       cout << "N=" << N << ", ab=" << _audio_buffers.frames() << "\n";
-               }
                assert (N <= _audio_buffers.frames());
                 shared_ptr<AudioBuffers> emit (new AudioBuffers (_audio_buffers.channels(), N));
                 emit->copy_from (&_audio_buffers, N, 0, 0);
@@ -352,7 +352,10 @@ Player::flush ()
        
 }
 
-/** @return true on error */
+/** Seek so that the next pass() will yield (approximately) the requested frame.
+ *  Pass accurate = true to try harder to get close to the request.
+ *  @return true on error
+ */
 void
 Player::seek (Time t, bool accurate)
 {
@@ -375,11 +378,19 @@ Player::seek (Time t, bool accurate)
                s = max (static_cast<Time> (0), s);
                s = min (vc->length(), s);
 
+               (*i)->video_position = (*i)->audio_position = vc->start() + s;
+
                FrameRateConversion frc (vc->video_frame_rate(), _film->dcp_video_frame_rate());
-               VideoContent::Frame f = s * vc->video_frame_rate() / (frc.factor() * TIME_HZ);
+               /* Here we are converting from time (in the DCP) to a frame number in the content.
+                  Hence we need to use the DCP's frame rate and the double/skip correction, not
+                  the source's rate.
+               */
+               VideoContent::Frame f = s * _film->dcp_video_frame_rate() / (frc.factor() * TIME_HZ);
                dynamic_pointer_cast<VideoDecoder>((*i)->decoder)->seek (f, accurate);
        }
 
+       _video_position = _audio_position = t;
+       
        /* XXX: don't seek audio because we don't need to... */
 }
 
@@ -450,7 +461,7 @@ Player::setup_pieces ()
 }
 
 void
-Player::content_changed (weak_ptr<Content> w, int p)
+Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
 {
        shared_ptr<Content> c = w.lock ();
        if (!c) {
@@ -458,16 +469,16 @@ Player::content_changed (weak_ptr<Content> w, int p)
        }
 
        if (
-               p == ContentProperty::START || p == ContentProperty::LENGTH ||
-               p == VideoContentProperty::VIDEO_CROP || p == VideoContentProperty::VIDEO_RATIO
+               property == ContentProperty::START || property == ContentProperty::LENGTH ||
+               property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_RATIO
                ) {
                
                _have_valid_pieces = false;
-               Changed ();
+               Changed (frequent);
 
-       } else if (p == SubtitleContentProperty::SUBTITLE_OFFSET || p == SubtitleContentProperty::SUBTITLE_SCALE) {
+       } else if (property == SubtitleContentProperty::SUBTITLE_OFFSET || property == SubtitleContentProperty::SUBTITLE_SCALE) {
                update_subtitle ();
-               Changed ();
+               Changed (frequent);
        }
 }
 
@@ -475,14 +486,14 @@ void
 Player::playlist_changed ()
 {
        _have_valid_pieces = false;
-       Changed ();
+       Changed (false);
 }
 
 void
 Player::set_video_container_size (libdcp::Size s)
 {
        _video_container_size = s;
-       _black_frame.reset (new SimpleImage (PIX_FMT_RGB24, _video_container_size, true));
+       _black_frame.reset (new Image (PIX_FMT_RGB24, _video_container_size, true));
        _black_frame->make_black ();
 }
 
@@ -502,6 +513,10 @@ Player::resampler (shared_ptr<AudioContent> c)
 void
 Player::emit_black ()
 {
+#ifdef DCPOMATIC_DEBUG
+       _last_video.reset ();
+#endif
+       
        /* XXX: use same here */
        Video (_black_frame, false, _video_position);
        _video_position += _film->video_frames_to_time (1);
@@ -526,7 +541,7 @@ Player::film_changed (Film::Property p)
        */
 
        if (p == Film::SCALER || p == Film::WITH_SUBTITLES || p == Film::CONTAINER) {
-               Changed ();
+               Changed (false);
        }
 }