X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=9d8eebe255d63d16dac547ab5851e8388c601c0c;hb=cb1dfa9ec09af2abf6d10e4bf2764476db83841b;hp=a4cd36a4fb509f17ba6f58eae2729e0bb2901060;hpb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index a4cd36a4f..9d8eebe25 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -33,6 +33,7 @@
 #include "audio_decoder.h"
 #include "player.h"
 #include "job.h"
+#include "writer.h"
 
 using std::string;
 using std::cout;
@@ -48,7 +49,8 @@ using boost::dynamic_pointer_cast;
 Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
 	: _film (f)
 	, _player (f->make_player ())
-	, _encoder (new Encoder (f, j))
+	, _writer (new Writer (f, j))
+	, _encoder (new Encoder (f, j, _writer))
 	, _finishing (false)
 {
 
@@ -57,19 +59,24 @@ Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
 void
 Transcoder::go ()
 {
-	_encoder->process_begin ();
+	_encoder->begin ();
 
 	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);
+	DCPTime const length = _film->length ();
+	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));
 		}
-		_encoder->process_audio (_player->get_audio (t, frame, true));
 	}
 
 	_finishing = true;
-	_encoder->process_end ();
+	_encoder->end ();
+	_writer->finish ();
 
 	_player->statistics().dump (_film->log ());
 }