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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 01f54be3f..ea3f27ad8 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -28,71 +28,71 @@
 #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 "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);
+	_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 (f->audio_stream()) {
-		AudioStream st = f->audio_stream().get();
-		_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()));
+	if (!f->with_subtitles ()) {
+		_player->disable_subtitles ();
 	}
 
-	/* Set up the decoder to use the film's set streams */
-	_decoder->set_audio_stream (f->audio_stream ());
-	_decoder->set_subtitle_stream (f->subtitle_stream ());
-
-	if (_matcher) {
-		_decoder->connect_video (_matcher);
-		_matcher->connect_video (_encoder);
-	} else {
-		_decoder->connect_video (_encoder);
-	}
+	_player->connect_video (_delay_line);
+	_delay_line->connect_video (_matcher);
+	_matcher->connect_video (_encoder);
 	
-	if (_matcher && _delay_line) {
-		_decoder->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);
 }
 
-/** Run the decoder, passing its output to the encoder, until the decoder
- *  has no more data to present.
- */
 void
 Transcoder::go ()
 {
 	_encoder->process_begin ();
-	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;
+	while (1) {
+		if (_player->pass ()) {
+			break;
+		}
+		_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 ();
+}