X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=959fac8572f55d5593fdd04b0f878bb99200c54f;hb=d0d93259d096faa0d410a27450445a3a1a16c430;hp=a809e55d2cf0bcb1c482a94a9fd94a3758580967;hpb=572f030509c2b0c1f662a54624ab0be6efdd9024;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index a809e55d2..959fac857 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -18,37 +18,69 @@
 */
 
 /** @file  src/transcoder.cc
- *  @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
+ *  @brief A class which takes a Film and some Options, then uses those to transcode the film.
  *
  *  A decoder is selected according to the content type, and the encoder can be specified
  *  as a parameter to the constructor.
  */
 
 #include <iostream>
-#include <sigc++/signal.h>
+#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"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::cout;
+using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 
 /** Construct a transcoder using a Decoder that we create and a supplied Encoder.
- *  @param s FilmState of Film that we are transcoding.
- *  @param o Options.
+ *  @param f Film that we are transcoding.
+ *  @param o Decode options.
  *  @param j Job that we are running under, or 0.
- *  @param l Log that we can write to.
  *  @param e Encoder to use.
  */
-Transcoder::Transcoder (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Job* j, Log* l, shared_ptr<Encoder> e)
+Transcoder::Transcoder (shared_ptr<Film> f, DecodeOptions o, Job* j, shared_ptr<Encoder> e)
 	: _job (j)
 	, _encoder (e)
-	, _decoder (decoder_factory (s, o, j, l))
+	, _decoders (decoder_factory (f, o))
 {
 	assert (_encoder);
+
+	if (f->audio_stream()) {
+		shared_ptr<AudioStream> st = f->audio_stream();
+		_matcher.reset (new Matcher (f->log(), st->sample_rate(), f->frames_per_second()));
+		_delay_line.reset (new DelayLine (f->log(), st->channels(), f->audio_delay() * st->sample_rate() / 1000));
+		_gain.reset (new Gain (f->log(), f->audio_gain()));
+	}
+
+	/* Set up the decoder to use the film's set streams */
+	_decoders.video->set_subtitle_stream (f->subtitle_stream ());
+	if (_decoders.audio) {
+		_decoders.audio->set_audio_stream (f->audio_stream ());
+	}
+
+	if (_matcher) {
+		_decoders.video->connect_video (_matcher);
+		_matcher->connect_video (_encoder);
+	} else {
+		_decoders.video->connect_video (_encoder);
+	}
 	
-	_decoder->Video.connect (sigc::mem_fun (*e, &Encoder::process_video));
-	_decoder->Audio.connect (sigc::mem_fun (*e, &Encoder::process_audio));
+	if (_matcher && _delay_line && _decoders.audio) {
+		_decoders.audio->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
@@ -57,16 +89,42 @@ Transcoder::Transcoder (shared_ptr<const FilmState> s, shared_ptr<const Options>
 void
 Transcoder::go ()
 {
-	_encoder->process_begin (_decoder->audio_channel_layout());
+	_encoder->process_begin ();
 	try {
-		_decoder->go ();
+		bool done[2] = { false, false };
+		
+		while (1) {
+			if (!done[0]) {
+				done[0] = _decoders.video->pass ();
+				if (_job) {
+					_decoders.video->set_progress (_job);
+				}
+			}
+
+			if (!done[1] && _decoders.audio && dynamic_pointer_cast<Decoder> (_decoders.audio) != dynamic_pointer_cast<Decoder> (_decoders.video)) {
+				done[1] = _decoders.audio->pass ();
+			} else {
+				done[1] = true;
+			}
+
+			if (done[0] && done[1]) {
+				break;
+			}
+		}
+		
 	} 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 ();
 }