X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=9d8eebe255d63d16dac547ab5851e8388c601c0c;hb=8c7a308c03e4b4196b4e2379a26d432b100ae2b1;hp=d4c5210dc5dfab2b48af067ebabbb8a959eeabbe;hpb=883d885dc8690519d205c8baa275385af8a39f4b;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index d4c5210dc..9d8eebe25 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,35 +33,52 @@
 #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.
  *  @param f Film that we are transcoding.
- *  @param j Job that we are running under, or 0.
  *  @param e Encoder to use.
  */
-Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<Job> j)
-	: _job (j)
-	, _player (f->player ())
-	, _encoder (new Encoder (f, j))
+Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
+	: _film (f)
+	, _player (f->make_player ())
+	, _writer (new Writer (f, j))
+	, _encoder (new Encoder (f, j, _writer))
+	, _finishing (false)
 {
-	if (!f->with_subtitles ()) {
-		_player->disable_subtitles ();
-	}
 
-	_player->connect_video (_encoder);
-	_player->connect_audio (_encoder);
 }
 
 void
 Transcoder::go ()
 {
-	_encoder->process_begin ();
-	while (!_player->pass ()) {}
-	_encoder->process_end ();
+	_encoder->begin ();
+
+	DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
+	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));
+		}
+	}
+
+	_finishing = true;
+	_encoder->end ();
+	_writer->finish ();
+
+	_player->statistics().dump (_film->log ());
 }
 
 float
@@ -75,3 +92,4 @@ Transcoder::video_frames_out () const
 {
 	return _encoder->video_frames_out ();
 }
+