X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=6744e9193ce9d415d1ad36eeceedd9f52f25ac83;hb=d62877ae6c4e316e43f4052e4b9ba673610012cf;hp=66d5606afd30525378e66ae94b5889d84e104316;hpb=ca4d051ceafb77c281583c4e50b391f230544313;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 66d5606af..6744e9193 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -28,44 +28,86 @@
 #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 "gain.h"
+#include "video_decoder.h"
+#include "audio_decoder.h"
+#include "player.h"
 
 using std::string;
 using boost::shared_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 o Options.
  *  @param j Job that we are running under, or 0.
  *  @param e Encoder to use.
  */
-Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<const Options> o, Job* j, shared_ptr<Encoder> e)
+Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<Job> j)
 	: _job (j)
-	, _encoder (e)
-	, _decoder (decoder_factory (f, o, j))
+	, _player (f->player ())
+	, _encoder (new Encoder (f))
 {
-	assert (_encoder);
+	if (f->has_audio ()) {
+		_matcher.reset (new Matcher (f->log(), f->audio_frame_rate(), f->video_frame_rate()));
+		_delay_line.reset (new DelayLine (f->log(), f->audio_channels(), f->audio_delay() * f->audio_frame_rate() / 1000));
+		_gain.reset (new Gain (f->log(), f->audio_gain()));
+	}
+
+	if (_matcher) {
+		_player->connect_video (_matcher);
+		_matcher->connect_video (_encoder);
+	} else {
+		_player->connect_video (_encoder);
+	}
 	
-	_decoder->Video.connect (bind (&Encoder::process_video, e, _1, _2, _3));
-	_decoder->Audio.connect (bind (&Encoder::process_audio, e, _1, _2));
+	if (_matcher && _delay_line && f->has_audio ()) {
+		_player->connect_audio (_delay_line);
+		_delay_line->connect_audio (_matcher);
+		_matcher->connect_audio (_gain);
+		_gain->connect_audio (_encoder);
+	}
 }
 
-/** Run the decoder, passing its output to the encoder, until the decoder
- *  has no more data to present.
- */
 void
 Transcoder::go ()
 {
-	_encoder->process_begin (_decoder->audio_channel_layout());
+	_encoder->process_begin ();
 	try {
-		_decoder->go ();
+		while (1) {
+			if (_player->pass ()) {
+				break;
+			}
+			_player->set_progress (_job);
+		}
+		
 	} catch (...) {
-		/* process_end() is important as the decoder may have worker
-		   threads that need to be cleaned up.
-		*/
 		_encoder->process_end ();
 		throw;
 	}
-
+	
+	if (_delay_line) {
+		_delay_line->process_end ();
+	}
+	if (_matcher) {
+		_matcher->process_end ();
+	}
+	if (_gain) {
+		_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 ();
+}