X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=85b4cbd4f77a1c016605bee7274545c7a9d520af;hb=a183c1776cfd020a37d028ebb0f641352f49697b;hp=5d4635e5a865b0a7334e5381f50f59f5aa873ddd;hpb=237a0052c60af768f4d62b00321932918b7ba4d9;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 5d4635e5a..85b4cbd4f 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
@@ -19,6 +17,7 @@
 
 */
 
+#include <stdint.h>
 #include "player.h"
 #include "film.h"
 #include "ffmpeg_decoder.h"
@@ -30,27 +29,40 @@
 #include "playlist.h"
 #include "job.h"
 #include "image.h"
+#include "null_content.h"
+#include "black_decoder.h"
+#include "silence_decoder.h"
 
 using std::list;
 using std::cout;
 using std::min;
+using std::max;
 using std::vector;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
+struct Piece
+{
+	Piece (shared_ptr<Content> c, shared_ptr<Decoder> d)
+		: content (c)
+		, decoder (d)
+	{}
+	
+	shared_ptr<Content> content;
+	shared_ptr<Decoder> decoder;
+};
+
 Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
 	: _film (f)
 	, _playlist (p)
 	, _video (true)
 	, _audio (true)
 	, _subtitles (true)
-	, _have_valid_decoders (false)
+	, _have_valid_pieces (false)
 	, _position (0)
-	, _audio_buffers (MAX_AUDIO_CHANNELS, 0)
-	, _last_video (0)
-	, _last_was_black (false)
-	, _last_audio (0)
+	, _audio_buffers (f->dcp_audio_channels(), 0)
+	, _next_audio (0)
 {
 	_playlist->Changed.connect (bind (&Player::playlist_changed, this));
 	_playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2));
@@ -77,82 +89,101 @@ Player::disable_subtitles ()
 bool
 Player::pass ()
 {
-	if (!_have_valid_decoders) {
-		setup_decoders ();
-		_have_valid_decoders = true;
+	if (!_have_valid_pieces) {
+		setup_pieces ();
+		_have_valid_pieces = true;
 	}
 
         /* Here we are just finding the active decoder with the earliest last emission time, then
-           calling pass on it.  If there is no decoder, we skip our position on until there is.
-           Hence this method will cause video and audio to be emitted, and it is up to the
-           process_{video,audio} methods to tidy it up.
+           calling pass on it.
         */
 
-        Time earliest_pos = TIME_MAX;
-        shared_ptr<DecoderRecord> earliest;
-        Time next_wait = TIME_MAX;
-
-        for (list<shared_ptr<DecoderRecord> >::iterator i = _decoders.begin(); i != _decoders.end(); ++i) {
-                Time const ts = (*i)->content->time();
-                Time const te = (*i)->content->time() + (*i)->content->length (_film);
-                if (ts <= _position && te > _position) {
-                        Time const pos = ts + (*i)->last;
-                        if (pos < earliest_pos) {
-                                earliest_pos = pos;
-                                earliest = *i;
-                        }
-                }
+        Time earliest_t = TIME_MAX;
+        shared_ptr<Piece> earliest;
 
-                if (ts > _position) {
-                        next_wait = min (next_wait, ts - _position);
-                }
-        }
+	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;
+		}
 
-        if (earliest) {
-                earliest->decoder->pass ();
-                _position = earliest->last;
-        } else if (next_wait < TIME_MAX) {
-                _position += next_wait;
-        } else {
-                return true;
-        }
+		if (!_audio && dynamic_pointer_cast<AudioDecoder> ((*i)->decoder) && !dynamic_pointer_cast<VideoDecoder> ((*i)->decoder)) {
+			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;
+		}
+	}
+
+	if (!earliest) {
+		flush ();
+		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";
 
         return false;
 }
 
 void
-Player::process_video (shared_ptr<DecoderRecord> dr, shared_ptr<const Image> image, bool same, shared_ptr<Subtitle> sub, Time time)
+Player::process_video (weak_ptr<Content> weak_content, shared_ptr<const Image> image, bool same, Time time)
 {
-        shared_ptr<VideoDecoder> vd = dynamic_pointer_cast<VideoDecoder> (dr->decoder);
-        
-        Time const global_time = dr->content->time() + time;
-        while ((global_time - _last_video) > 1) {
-                /* Fill in with black */
-                emit_black_frame ();
-        }
-
-        Video (image, same, sub, global_time);
-        dr->last = time;
-	_last_video = global_time;
-	_last_was_black = false;
+	shared_ptr<Content> content = weak_content.lock ();
+	if (!content) {
+		return;
+	}
+	
+	time += content->start ();
+	
+        Video (image, same, time);
 }
 
 void
-Player::process_audio (shared_ptr<DecoderRecord> dr, shared_ptr<const AudioBuffers> audio, Time time)
+Player::process_audio (weak_ptr<Content> weak_content, shared_ptr<const AudioBuffers> audio, Time time)
 {
-        /* XXX: mapping */
-
+	shared_ptr<Content> content = weak_content.lock ();
+	if (!content) {
+		return;
+	}
+	
         /* 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.
         */
 
-        if (time > _last_audio) {
+	time += content->start ();
+
+        if (time > _next_audio) {
                 /* We can emit some audio from our buffers */
-                OutputAudioFrame const N = min (_film->time_to_audio_frames (time - _last_audio), static_cast<OutputAudioFrame> (_audio_buffers.frames()));
+                OutputAudioFrame const N = _film->time_to_audio_frames (time - _next_audio);
+		assert (N <= _audio_buffers.frames());
                 shared_ptr<AudioBuffers> emit (new AudioBuffers (_audio_buffers.channels(), N));
                 emit->copy_from (&_audio_buffers, N, 0, 0);
-                Audio (emit, _last_audio);
-                _last_audio += _film->audio_frames_to_time (N);
+                Audio (emit, _next_audio);
+                _next_audio += _film->audio_frames_to_time (N);
 
                 /* And remove it from our buffers */
                 if (_audio_buffers.frames() > N) {
@@ -162,65 +193,99 @@ Player::process_audio (shared_ptr<DecoderRecord> dr, shared_ptr<const AudioBuffe
         }
 
         /* Now accumulate the new audio into our buffers */
+        _audio_buffers.ensure_size (_audio_buffers.frames() + audio->frames());
+        _audio_buffers.accumulate_frames (audio.get(), 0, 0, audio->frames ());
+	_audio_buffers.set_frames (_audio_buffers.frames() + audio->frames());
+}
 
-        if (_audio_buffers.frames() == 0) {
-                /* We have no remaining data.  Emit silence up to the start of this new data */
-                if ((time - _last_audio) > 0) {
-                        emit_silence (time - _last_audio);
-                }
-        }
-
-        _audio_buffers.ensure_size (time - _last_audio + audio->frames());
-        _audio_buffers.accumulate (audio.get(), 0, _film->time_to_audio_frames (time - _last_audio));
-        dr->last = time + _film->audio_frames_to_time (audio->frames ());
+void
+Player::flush ()
+{
+	if (_audio_buffers.frames() > 0) {
+		shared_ptr<AudioBuffers> emit (new AudioBuffers (_audio_buffers.channels(), _audio_buffers.frames()));
+		emit->copy_from (&_audio_buffers, _audio_buffers.frames(), 0, 0);
+		Audio (emit, _next_audio);
+		_next_audio += _film->audio_frames_to_time (_audio_buffers.frames ());
+		_audio_buffers.set_frames (0);
+	}
 }
 
 /** @return true on error */
-bool
+void
 Player::seek (Time t)
 {
-	if (!_have_valid_decoders) {
-		setup_decoders ();
-		_have_valid_decoders = true;
+	if (!_have_valid_pieces) {
+		setup_pieces ();
+		_have_valid_pieces = true;
 	}
 
-	if (_decoders.empty ()) {
-		return true;
+	if (_pieces.empty ()) {
+		return;
 	}
 
-	/* XXX */
+//	cout << "seek to " << t << " " << (t / TIME_HZ) << "\n";
 
-	/* XXX: don't seek audio because we don't need to... */
+	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);
+	}
 
-	return false;
+	/* XXX: don't seek audio because we don't need to... */
 }
 
 
 void
 Player::seek_back ()
 {
-	/* XXX */
+
 }
 
 void
 Player::seek_forward ()
 {
-	/* XXX */
+
+}
+
+void
+Player::add_black_piece (Time s, Time len)
+{
+	shared_ptr<NullContent> nc (new NullContent (_film, s, len));
+	nc->set_ratio (_film->container ());
+	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
+Player::add_silent_piece (Time s, Time len)
+{
+	shared_ptr<NullContent> nc (new NullContent (_film, s, 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_decoders ()
+Player::setup_pieces ()
 {
-	list<shared_ptr<DecoderRecord> > old_decoders = _decoders;
+	cout << "----- Player SETUP PIECES.\n";
 
-	_decoders.clear ();
+	list<shared_ptr<Piece> > old_pieces = _pieces;
+
+	_pieces.clear ();
 
 	Playlist::ContentList content = _playlist->content ();
+	sort (content.begin(), content.end(), ContentSorter ());
+	
 	for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) {
 
-		shared_ptr<DecoderRecord> dr (new DecoderRecord);
-		dr->content = *i;
+		shared_ptr<Decoder> decoder;
 		
                 /* XXX: into content? */
 
@@ -228,10 +293,11 @@ Player::setup_decoders ()
 		if (fc) {
 			shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (_film, fc, _video, _audio, _subtitles));
 			
-			fd->Video.connect (bind (&Player::process_video, this, dr, _1, _2, _3, _4));
-			fd->Audio.connect (bind (&Player::process_audio, this, dr, _1, _2));
+			fd->Video.connect (bind (&Player::process_video, this, *i, _1, _2, _3));
+			fd->Audio.connect (bind (&Player::process_audio, this, *i, _1, _2));
 
-			dr->decoder = fd;
+			decoder = fd;
+			cout << "\tFFmpeg @ " << fc->start() << " -- " << fc->end() << "\n";
 		}
 		
 		shared_ptr<const ImageMagickContent> ic = dynamic_pointer_cast<const ImageMagickContent> (*i);
@@ -239,8 +305,8 @@ Player::setup_decoders ()
 			shared_ptr<ImageMagickDecoder> id;
 			
 			/* See if we can re-use an old ImageMagickDecoder */
-			for (list<shared_ptr<DecoderRecord> >::const_iterator i = old_decoders.begin(); i != old_decoders.end(); ++i) {
-				shared_ptr<ImageMagickDecoder> imd = dynamic_pointer_cast<ImageMagickDecoder> ((*i)->decoder);
+			for (list<shared_ptr<Piece> >::const_iterator j = old_pieces.begin(); j != old_pieces.end(); ++j) {
+				shared_ptr<ImageMagickDecoder> imd = dynamic_pointer_cast<ImageMagickDecoder> ((*j)->decoder);
 				if (imd && imd->content() == ic) {
 					id = imd;
 				}
@@ -248,24 +314,54 @@ Player::setup_decoders ()
 
 			if (!id) {
 				id.reset (new ImageMagickDecoder (_film, ic));
-				id->Video.connect (bind (&Player::process_video, this, dr, _1, _2, _3, _4));
+				id->Video.connect (bind (&Player::process_video, this, *i, _1, _2, _3));
 			}
 
-			dr->decoder = id;
+			decoder = id;
+			cout << "\tImageMagick @ " << ic->start() << " -- " << ic->end() << "\n";
 		}
 
 		shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (*i);
 		if (sc) {
 			shared_ptr<AudioDecoder> sd (new SndfileDecoder (_film, sc));
-			sd->Audio.connect (bind (&Player::process_audio, this, dr, _1, _2));
+			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)));
+	}
 
-			dr->decoder = sd;
+	/* Fill in visual gaps with black and audio gaps with silence */
+
+	Time video_pos = 0;
+	Time audio_pos = 0;
+	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 = (*i)->content->start() - video_pos;
+			if (diff > 0) {
+				add_black_piece (video_pos, diff);
+			}
+			video_pos = (*i)->content->end();
 		}
 
-		_decoders.push_back (dr);
+		shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> ((*i)->content);
+		if (ac && ac->audio_channels()) {
+			Time const diff = (*i)->content->start() - audio_pos;
+			if (diff > 0) {
+				add_silent_piece (video_pos, diff);
+			}
+			audio_pos = (*i)->content->end();
+		}
 	}
 
-	_position = 0;
+	if (video_pos < audio_pos) {
+		add_black_piece (video_pos, audio_pos - video_pos);
+	} else if (audio_pos < video_pos) {
+		add_silent_piece (audio_pos, video_pos - audio_pos);
+	}
 }
 
 void
@@ -276,36 +372,13 @@ Player::content_changed (weak_ptr<Content> w, int p)
 		return;
 	}
 
-	if (p == VideoContentProperty::VIDEO_LENGTH) {
-		_have_valid_decoders = false;
+	if (p == ContentProperty::START || p == ContentProperty::LENGTH) {
+		_have_valid_pieces = false;
 	}
 }
 
 void
 Player::playlist_changed ()
 {
-	_have_valid_decoders = false;
-}
-
-void
-Player::emit_black_frame ()
-{
-	shared_ptr<SimpleImage> image (new SimpleImage (AV_PIX_FMT_RGB24, libdcp::Size (128, 128), true));
-	Video (image, _last_was_black, shared_ptr<Subtitle> (), _last_video);
-	_last_video += _film->video_frames_to_time (1);
-}
-
-void
-Player::emit_silence (Time t)
-{
-	OutputAudioFrame frames = _film->time_to_audio_frames (t);
-	while (frames) {
-		/* Do this in half-second chunks so we don't overwhelm anybody */
-		OutputAudioFrame this_time = min (_film->dcp_audio_frame_rate() / 2, frames);
-		shared_ptr<AudioBuffers> silence (new AudioBuffers (MAX_AUDIO_CHANNELS, this_time));
-		silence->make_silent ();
-		Audio (silence, _last_audio);
-		_last_audio += _film->audio_frames_to_time (this_time);
-		frames -= this_time;
-	}
+	_have_valid_pieces = false;
 }