X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=717f2855661d02dd263d4197b8d19e31698e97db;hb=11325f810e214935e4115248223c186a6e4cc184;hp=19d06714996d442d18f2fd5b30da0475bf134d3b;hpb=127672223cca569986e35c91265e269ed5a6561c;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 19d067149..717f28556 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -28,77 +28,66 @@
 #include <boost/signals2.hpp>
 #include "transcoder.h"
 #include "encoder.h"
-#include "decoder_factory.h"
 #include "film.h"
-#include "matcher.h"
-#include "delay_line.h"
-#include "options.h"
-#include "gain.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
-#include "playlist.h"
+#include "player.h"
+#include "job.h"
 
 using std::string;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
+static void
+video_proxy (weak_ptr<Encoder> encoder, shared_ptr<const Image> 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.
  *  @param f Film that we are transcoding.
- *  @param o Decode options.
  *  @param j Job that we are running under, or 0.
  *  @param e Encoder to use.
  */
-Transcoder::Transcoder (shared_ptr<Film> f, DecodeOptions o, shared_ptr<Job> j)
+Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
 	: _job (j)
-	, _playlist (f->playlist ())
-	, _encoder (new Encoder (f, _playlist))
+	, _player (f->make_player ())
+	, _encoder (new Encoder (f, j))
 {
-	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()));
-	}
-
-	if (_matcher) {
-		_playlist->connect_video (_matcher);
-		_matcher->connect_video (_encoder);
-	} else {
-		_playlist->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->Video.connect (bind (video_proxy, _encoder, _1, _2, _3, _4));
+	_player->Audio.connect (bind (audio_proxy, _encoder, _1));
 }
 
 void
 Transcoder::go ()
 {
 	_encoder->process_begin ();
-	try {
-		while (1) {
-			if (_playlist->pass ()) {
-				break;
-			}
-			_playlist->set_progress (_job);
-		}
-		
-	} catch (...) {
-		_encoder->process_end ();
-		throw;
-	}
-	
-	if (_delay_line) {
-		_delay_line->process_end ();
-	}
-	if (_matcher) {
-		_matcher->process_end ();
-	}
-	if (_gain) {
-		_gain->process_end ();
-	}
+	while (!_player->pass ()) {}
 	_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 ();
+}
+