X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;fp=src%2Flib%2Ftranscoder.cc;h=a4cd36a4fb509f17ba6f58eae2729e0bb2901060;hp=b11ce8be599aaab0d8c3aa63f210199066fdd279;hb=39bc73fe192f932ed6695eb87b19de446e8b4f55;hpb=884093edac5f63d26c02d411c73dfb52376ccf8f

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index b11ce8be5..a4cd36a4f 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -35,49 +35,43 @@
 #include "job.h"
 
 using std::string;
+using std::cout;
+using std::list;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
-static void
-video_proxy (weak_ptr<Encoder> encoder, shared_ptr<PlayerVideoFrame> pvf, bool same)
-{
-	shared_ptr<Encoder> e = encoder.lock ();
-	if (e) {
-		e->process_video (pvf, same);
-	}
-}
-
-static void
-audio_proxy (weak_ptr<Encoder> encoder, shared_ptr<const AudioBuffers> audio)
-{
-	shared_ptr<Encoder> e = encoder.lock ();
-	if (e) {
-		e->process_audio (audio);
-	}
-}
-
 /** Construct a transcoder using a Decoder that we create and a supplied Encoder.
  *  @param f Film that we are transcoding.
  *  @param e Encoder to use.
  */
 Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
-	: _player (f->make_player ())
+	: _film (f)
+	, _player (f->make_player ())
 	, _encoder (new Encoder (f, j))
 	, _finishing (false)
 {
-	_player->Video.connect (bind (video_proxy, _encoder, _1, _2));
-	_player->Audio.connect (bind (audio_proxy, _encoder, _1));
+
 }
 
 void
 Transcoder::go ()
 {
 	_encoder->process_begin ();
-	while (!_player->pass ()) {}
+
+	DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
+	for (DCPTime t; t < _film->length(); t += frame) {
+		list<shared_ptr<PlayerVideoFrame> > v = _player->get_video (t, true);
+		for (list<shared_ptr<PlayerVideoFrame> >::const_iterator i = v.begin(); i != v.end(); ++i) {
+			_encoder->process_video (*i);
+		}
+		_encoder->process_audio (_player->get_audio (t, frame, true));
+	}
 
 	_finishing = true;
 	_encoder->process_end ();
+
+	_player->statistics().dump (_film->log ());
 }
 
 float