X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=2e33931bd50872cc5edbb16c274af19e336a5bb1;hb=f861018389acd9d277fe34d7621182b9b54f977f;hp=b74d09174ee1a53f6d77dab2e7864691559ef605;hpb=c55d8bcda8f4da74bbc9489127354211cea8f2ff;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index b74d09174..2e33931bd 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -18,55 +18,93 @@
 */
 
 /** @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 "gain.h"
+#include "video_decoder.h"
+#include "audio_decoder.h"
+#include "player.h"
+#include "trimmer.h"
 
-using namespace std;
-using namespace boost;
+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 s FilmState of Film that we are transcoding.
- *  @param o Options.
+ *  @param f Film that we are transcoding.
  *  @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, shared_ptr<Job> j)
 	: _job (j)
-	, _encoder (e)
-	, _decoder (decoder_factory (s, o, j, l))
+	, _player (f->player ())
+	, _encoder (new Encoder (f))
 {
-	assert (_encoder);
+	_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()));
+
+	int const trim_start = f->trim_type() == Film::ENCODE ? f->trim_start() : 0;
+	int const trim_end = f->trim_type() == Film::ENCODE ? f->trim_end() : 0;
+	_trimmer.reset (new Trimmer (
+				f->log(), trim_start, trim_end, f->content_length(),
+				f->audio_frame_rate(), f->video_frame_rate(), f->dcp_frame_rate()
+				));
+	
+	if (!f->with_subtitles ()) {
+		_player->disable_subtitles ();
+	}
+
+	_player->connect_video (_delay_line);
+	_delay_line->connect_video (_matcher);
+	_matcher->connect_video (_trimmer);
+	_trimmer->connect_video (_encoder);
 	
-	_decoder->Video.connect (sigc::mem_fun (*e, &Encoder::process_video));
-	_decoder->Audio.connect (sigc::mem_fun (*e, &Encoder::process_audio));
+	_player->connect_audio (_delay_line);
+	_delay_line->connect_audio (_matcher);
+	_matcher->connect_audio (_gain);
+	_gain->connect_audio (_trimmer);
+	_trimmer->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(), _decoder->audio_sample_format());
-	try {
-		_decoder->go ();
-	} catch (...) {
-		/* process_end() is important as the decoder may have worker
-		   threads that need to be cleaned up.
-		*/
-		_encoder->process_end ();
-		throw;
+	_encoder->process_begin ();
+	while (1) {
+		if (_player->pass ()) {
+			break;
+		}
+		_player->set_progress (_job);
 	}
 
+	_delay_line->process_end ();
+	if (_matcher) {
+		_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 ();
+}