X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=ea3f27ad8f94f10175e1b6e81237b5e1d6059c12;hb=47f25009bcbc765e397bcb471dd361a511c99daf;hp=21944c5fc6ad63aee373b451deac690f49a10bf7;hpb=b468ccabdb13fca86ae8a324239d83490ef5832e;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 21944c5fc..ea3f27ad8 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -34,7 +34,7 @@
 #include "gain.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
-#include "playlist.h"
+#include "player.h"
 
 using std::string;
 using boost::shared_ptr;
@@ -47,55 +47,52 @@ using boost::dynamic_pointer_cast;
  */
 Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<Job> j)
 	: _job (j)
-	, _playlist (f->playlist ())
-	, _encoder (new Encoder (f, _playlist))
+	, _player (f->player ())
+	, _encoder (new Encoder (f))
 {
-	if (_playlist->has_audio ()) {
-		_matcher.reset (new Matcher (f->log(), _playlist->audio_frame_rate(), _playlist->video_frame_rate()));
-		_delay_line.reset (new DelayLine (f->log(), _playlist->audio_channels(), f->audio_delay() * _playlist->audio_frame_rate() / 1000));
-		_gain.reset (new Gain (f->log(), f->audio_gain()));
-	}
+	_matcher.reset (new Matcher (f->log(), f->audio_frame_rate(), f->video_frame_rate()));
+	_delay_line.reset (new DelayLine (f->log(), f->audio_delay() * f->audio_frame_rate() / 1000));
+	_gain.reset (new Gain (f->log(), f->audio_gain()));
 
-	if (_matcher) {
-		_playlist->connect_video (_matcher);
-		_matcher->connect_video (_encoder);
-	} else {
-		_playlist->connect_video (_encoder);
+	if (!f->with_subtitles ()) {
+		_player->disable_subtitles ();
 	}
+
+	_player->connect_video (_delay_line);
+	_delay_line->connect_video (_matcher);
+	_matcher->connect_video (_encoder);
 	
-	if (_matcher && _delay_line && _playlist->has_audio ()) {
-		_playlist->connect_audio (_delay_line);
-		_delay_line->connect_audio (_matcher);
-		_matcher->connect_audio (_gain);
-		_gain->connect_audio (_encoder);
-	}
+	_player->connect_audio (_delay_line);
+	_delay_line->connect_audio (_matcher);
+	_matcher->connect_audio (_gain);
+	_gain->connect_audio (_encoder);
 }
 
 void
 Transcoder::go ()
 {
 	_encoder->process_begin ();
-	try {
-		while (1) {
-			if (_playlist->pass ()) {
-				break;
-			}
-			_playlist->set_progress (_job);
+	while (1) {
+		if (_player->pass ()) {
+			break;
 		}
-		
-	} catch (...) {
-		_encoder->process_end ();
-		throw;
-	}
-	
-	if (_delay_line) {
-		_delay_line->process_end ();
-	}
-	if (_matcher) {
-		_matcher->process_end ();
-	}
-	if (_gain) {
-		_gain->process_end ();
+		_player->set_progress (_job);
 	}
+
+	_delay_line->process_end ();
+	_matcher->process_end ();
+	_gain->process_end ();
 	_encoder->process_end ();
 }
+
+float
+Transcoder::current_encoding_rate () const
+{
+	return _encoder->current_encoding_rate ();
+}
+
+int
+Transcoder::video_frames_out () const
+{
+	return _encoder->video_frames_out ();
+}