X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=ff13f95dbd2197be7be681ff520b29ab1ef4422b;hb=996b0c06e23bcb6b300d7b8799df94993692e07d;hp=b0a408c1016a1cfd9bf5307a44975f2fa65e3b72;hpb=8c6fe8e1e8c8f6d5932606f2a5b6e1b87681ae38;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index b0a408c10..ff13f95db 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -37,6 +37,7 @@
 using std::list;
 using std::cout;
 using std::min;
+using std::max;
 using std::vector;
 using boost::shared_ptr;
 using boost::weak_ptr;
@@ -61,9 +62,7 @@ Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
 	, _subtitles (true)
 	, _have_valid_pieces (false)
 	, _position (0)
-	, _audio_buffers (MAX_AUDIO_CHANNELS, 0)
-	, _last_video (0)
-	, _last_was_black (false)
+	, _audio_buffers (f->dcp_audio_channels(), 0)
 	, _next_audio (0)
 {
 	_playlist->Changed.connect (bind (&Player::playlist_changed, this));
@@ -104,12 +103,18 @@ Player::pass ()
         shared_ptr<Piece> earliest;
 
 	for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
-		if ((*i)->content->end(_film) < _position) {
+		cout << "check " << (*i)->content->file() << " start=" << (*i)->content->start() << ", next=" << (*i)->decoder->next() << ", end=" << (*i)->content->end() << "\n";
+		if (((*i)->decoder->next() + (*i)->content->start()) >= (*i)->content->end()) {
+			continue;
+		}
+
+		if (!_audio && dynamic_pointer_cast<SndfileContent> ((*i)->content)) {
 			continue;
 		}
 		
 		Time const t = (*i)->content->start() + (*i)->decoder->next();
 		if (t < earliest_t) {
+			cout << "\t candidate; " << t << " " << (t / TIME_HZ) << ".\n";
 			earliest_t = t;
 			earliest = *i;
 		}
@@ -118,22 +123,24 @@ Player::pass ()
 	if (!earliest) {
 		return true;
 	}
-	
-	earliest->decoder->pass ();
-
-	/* Move position to earliest active next emission */
 
-	for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
-		if ((*i)->content->end(_film) < _position) {
-			continue;
-		}
-
-		Time const t = (*i)->content->start() + (*i)->decoder->next();
-
-		if (t < _position) {
-			_position = t;
-		}
+	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";
 
         return false;
 }
@@ -141,6 +148,8 @@ Player::pass ()
 void
 Player::process_video (weak_ptr<Content> weak_content, shared_ptr<const Image> image, bool same, shared_ptr<Subtitle> sub, Time time)
 {
+	cout << "[V]\n";
+	
 	shared_ptr<Content> content = weak_content.lock ();
 	if (!content) {
 		return;
@@ -159,8 +168,6 @@ Player::process_audio (weak_ptr<Content> weak_content, shared_ptr<const AudioBuf
 		return;
 	}
 	
-        /* XXX: mapping */
-
         /* The time of this audio may indicate that some of our buffered audio is not going to
            be added to any more, so it can be emitted.
         */
@@ -169,7 +176,8 @@ Player::process_audio (weak_ptr<Content> weak_content, shared_ptr<const AudioBuf
 
         if (time > _next_audio) {
                 /* We can emit some audio from our buffers */
-                OutputAudioFrame const N = min (_film->time_to_audio_frames (time - _next_audio), static_cast<OutputAudioFrame> (_audio_buffers.frames()));
+		assert (_film->time_to_audio_frames (time - _next_audio) <= _audio_buffers.frames());
+                OutputAudioFrame const N = _film->time_to_audio_frames (time - _next_audio);
                 shared_ptr<AudioBuffers> emit (new AudioBuffers (_audio_buffers.channels(), N));
                 emit->copy_from (&_audio_buffers, N, 0, 0);
                 Audio (emit, _next_audio);
@@ -183,8 +191,8 @@ Player::process_audio (weak_ptr<Content> weak_content, shared_ptr<const AudioBuf
         }
 
         /* Now accumulate the new audio into our buffers */
-        _audio_buffers.ensure_size (time - _next_audio + audio->frames());
-        _audio_buffers.accumulate (audio.get(), 0, _film->time_to_audio_frames (time - _next_audio));
+        _audio_buffers.ensure_size (_audio_buffers.frames() + audio->frames());
+        _audio_buffers.accumulate_frames (audio.get(), 0, 0, audio->frames ());
 }
 
 /** @return true on error */
@@ -200,6 +208,16 @@ 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);
+	}
+
 	/* XXX: don't seek audio because we don't need to... */
 }
 
@@ -207,13 +225,13 @@ Player::seek (Time t)
 void
 Player::seek_back ()
 {
-	/* XXX */
+
 }
 
 void
 Player::seek_forward ()
 {
-	/* XXX */
+
 }
 
 struct ContentSorter
@@ -227,6 +245,8 @@ struct ContentSorter
 void
 Player::setup_pieces ()
 {
+//	cout << "----- Player SETUP PIECES.\n";
+
 	list<shared_ptr<Piece> > old_pieces = _pieces;
 
 	_pieces.clear ();
@@ -248,6 +268,7 @@ Player::setup_pieces ()
 			fd->Audio.connect (bind (&Player::process_audio, this, *i, _1, _2));
 
 			decoder = fd;
+//			cout << "\tFFmpeg @ " << fc->start() << " -- " << fc->end() << "\n";
 		}
 		
 		shared_ptr<const ImageMagickContent> ic = dynamic_pointer_cast<const ImageMagickContent> (*i);
@@ -268,6 +289,7 @@ Player::setup_pieces ()
 			}
 
 			decoder = id;
+//			cout << "\tImageMagick @ " << ic->start() << " -- " << ic->end() << "\n";
 		}
 
 		shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (*i);
@@ -276,6 +298,7 @@ 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)));
@@ -288,24 +311,28 @@ Player::setup_pieces ()
 	list<shared_ptr<Piece> > pieces_copy = _pieces;
 	for (list<shared_ptr<Piece> >::iterator i = pieces_copy.begin(); i != pieces_copy.end(); ++i) {
 		if (dynamic_pointer_cast<VideoContent> ((*i)->content)) {
-			Time const diff = video_pos - (*i)->content->start();
+			Time const diff = (*i)->content->start() - video_pos;
 			if (diff > 0) {
-				shared_ptr<NullContent> nc (new NullContent (video_pos, diff));
-				_pieces.push_back (shared_ptr<Piece> (new Piece (nc, shared_ptr<Decoder> (new BlackDecoder (_film, nc)))));
+				shared_ptr<NullContent> nc (new NullContent (_film, video_pos, diff));
+				shared_ptr<BlackDecoder> bd (new BlackDecoder (_film, nc));
+				bd->Video.connect (bind (&Player::process_video, this, nc, _1, _2, _3, _4));
+				_pieces.push_back (shared_ptr<Piece> (new Piece (nc, bd)));
+//				cout << "\tblack @ " << video_pos << " -- " << (video_pos + diff) << "\n";
 			}
 						
-			video_pos = (*i)->content->start() + (*i)->content->length(_film);
+			video_pos = (*i)->content->end();
 		} else {
-			Time const diff = audio_pos - (*i)->content->start();
+			Time const diff = (*i)->content->start() - audio_pos;
 			if (diff > 0) {
-				shared_ptr<NullContent> nc (new NullContent (audio_pos, diff));
-				_pieces.push_back (shared_ptr<Piece> (new Piece (nc, shared_ptr<Decoder> (new SilenceDecoder (_film, nc)))));
+				shared_ptr<NullContent> nc (new NullContent (_film, audio_pos, diff));
+				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 @ " << audio_pos << " -- " << (audio_pos + diff) << "\n";
 			}
-			audio_pos = (*i)->content->start() + (*i)->content->length(_film);
+			audio_pos = (*i)->content->end();
 		}
 	}
-
-	_position = 0;
 }
 
 void
@@ -316,7 +343,7 @@ Player::content_changed (weak_ptr<Content> w, int p)
 		return;
 	}
 
-	if (p == VideoContentProperty::VIDEO_LENGTH) {
+	if (p == ContentProperty::START || p == VideoContentProperty::VIDEO_LENGTH) {
 		_have_valid_pieces = false;
 	}
 }