X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=8aed205741ec9aaf454ec70026a4b70d68bdaaba;hb=3f3727634b98ce2761a193b9d1e3fc14f51dcbd2;hp=810606391b18381883f0117829d802dbbc2590f1;hpb=7f2e74604a51b984e4c8cbb5d5f4bb642677ec00;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 810606391..8aed20574 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -33,21 +33,24 @@
 #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;
 
-/** 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))
+	, _writer (new Writer (f, j))
+	, _encoder (new Encoder (f, j, _writer))
 	, _finishing (false)
 {
 
@@ -56,16 +59,29 @@ 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) {
-		_encoder->process_video (_player->get_video (t, true));
-		_encoder->process_audio (_player->get_audio (t, frame, true));
+	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 ());
 }