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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index faafcaf8b..2e33931bd 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -28,14 +28,13 @@
 #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"
 #include "trimmer.h"
 
 using std::string;
@@ -44,87 +43,52 @@ 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 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, Job* j, shared_ptr<Encoder> e)
+Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<Job> j)
 	: _job (j)
-	, _encoder (e)
-	, _decoders (decoder_factory (f, o))
+	, _player (f->player ())
+	, _encoder (new Encoder (f))
 {
-	assert (_encoder);
-
-	shared_ptr<AudioStream> st = f->audio_stream();
-	if (st) {
-		_matcher.reset (new Matcher (f->log(), st->sample_rate(), f->source_frame_rate()));
-	}
-	_delay_line.reset (new DelayLine (f->log(), f->audio_delay() / 1000.0f));
+	_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 sr = st ? st->sample_rate() : 0;
 	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->length().get_value_or(0),
-				sr, f->source_frame_rate(), f->dcp_frame_rate()
+				f->log(), trim_start, trim_end, f->content_length(),
+				f->audio_frame_rate(), f->video_frame_rate(), f->dcp_frame_rate()
 				));
-
-	/* Set up the decoder to use the film's set streams */
-	_decoders.video->set_subtitle_stream (f->subtitle_stream ());
-	if (f->audio_stream ()) {
-	    _decoders.audio->set_audio_stream (f->audio_stream ());
+	
+	if (!f->with_subtitles ()) {
+		_player->disable_subtitles ();
 	}
 
-	_decoders.video->connect_video (_delay_line);
-	if (_matcher) {
-		_delay_line->connect_video (_matcher);
-		_matcher->connect_video (_trimmer);
-	} else {
-		_delay_line->connect_video (_trimmer);
-	}
+	_player->connect_video (_delay_line);
+	_delay_line->connect_video (_matcher);
+	_matcher->connect_video (_trimmer);
 	_trimmer->connect_video (_encoder);
 	
-	_decoders.audio->connect_audio (_delay_line);
-	if (_matcher) {
-		_delay_line->connect_audio (_matcher);
-		_matcher->connect_audio (_gain);
-	} else {
-		_delay_line->connect_audio (_gain);
-	}
+	_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 ();
-
-	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]) {
+		if (_player->pass ()) {
 			break;
 		}
+		_player->set_progress (_job);
 	}
-	
+
 	_delay_line->process_end ();
 	if (_matcher) {
 		_matcher->process_end ();
@@ -132,3 +96,15 @@ Transcoder::go ()
 	_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 ();
+}