X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=3ecc3a064bb2b476ab41016e6c4d7083e1cfd72d;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=ba4d3b040baa432812cfe85e972ea9f6c9d052c1;hpb=1f8b45c7fd49714628009f5ed2161fbaa2b4d729;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index ba4d3b040..3ecc3a064 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -33,52 +33,55 @@
 #include "audio_decoder.h"
 #include "player.h"
 #include "job.h"
+#include "writer.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<PlayerImage> image, Eyes eyes, ColourConversion conversion, bool same)
-{
-	shared_ptr<Encoder> e = encoder.lock ();
-	if (e) {
-		e->process_video (image, eyes, conversion, 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.
+/** Construct a transcoder.
  *  @param f Film that we are transcoding.
- *  @param e Encoder to use.
+ *  @param j Job that this transcoder is being used in.
  */
-Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
-	: _film (f)
-	, _player (f->make_player ())
-	, _encoder (new Encoder (f, j))
+Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> j)
+	: _film (film)
+	, _player (new Player (film))
+	, _writer (new Writer (film, j))
+	, _encoder (new Encoder (film, j, _writer))
 	, _finishing (false)
 {
-	_player->Video.connect (bind (video_proxy, _encoder, _1, _2, _3, _4));
-	_player->Audio.connect (bind (audio_proxy, _encoder, _1));
+
 }
 
 void
 Transcoder::go ()
 {
-	_encoder->process_begin ();
-	while (!_player->pass ()) {}
+	_encoder->begin ();
+
+	DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
+	DCPTime const length = _film->length ();
+
+	if (!_film->burn_subtitles ()) {
+		_writer->write (_player->get_subtitle_fonts ());
+	}
+
+	for (DCPTime t; t < length; t += frame) {
+		list<shared_ptr<PlayerVideo> > v = _player->get_video (t, true);
+		for (list<shared_ptr<PlayerVideo> >::const_iterator i = v.begin(); i != v.end(); ++i) {
+			_encoder->enqueue (*i);
+		}
+		_writer->write (_player->get_audio (t, frame, true));
+		if (!_film->burn_subtitles ()) {
+			_writer->write (_player->get_subtitles (t, frame, true));
+		}
+	}
 
 	_finishing = true;
-	_encoder->process_end ();
+	_encoder->end ();
+	_writer->finish ();
 
 	_player->statistics().dump (_film->log ());
 }