X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=a4cd36a4fb509f17ba6f58eae2729e0bb2901060;hb=39bc73fe192f932ed6695eb87b19de446e8b4f55;hp=48cf402d77bac4f36ababbac36adff4fb880d5e9;hpb=83742c7e6edcf958e0820abc77c029f4ada4880f;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 48cf402d7..a4cd36a4f 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -28,107 +28,61 @@
 #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 "trimmer.h"
+#include "player.h"
+#include "job.h"
 
 using std::string;
+using std::cout;
+using std::list;
 using boost::shared_ptr;
+using boost::weak_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 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)
-	: _job (j)
-	, _encoder (e)
-	, _decoders (decoder_factory (f, o))
+Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
+	: _film (f)
+	, _player (f->make_player ())
+	, _encoder (new Encoder (f, j))
+	, _finishing (false)
 {
-	assert (_encoder);
 
-	shared_ptr<AudioStream> st = f->audio_stream();
-	if (st && st->sample_rate ()) {
-		_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));
-	_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()
-				));
-
-	/* 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 ());
-	}
-
-	_decoders.video->connect_video (_delay_line);
-	if (_matcher) {
-		_delay_line->connect_video (_matcher);
-		_matcher->connect_video (_trimmer);
-	} else {
-		_delay_line->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);
-	}
-	_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;
+	DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
+	for (DCPTime t; t < _film->length(); t += frame) {
+		list<shared_ptr<PlayerVideoFrame> > v = _player->get_video (t, true);
+		for (list<shared_ptr<PlayerVideoFrame> >::const_iterator i = v.begin(); i != v.end(); ++i) {
+			_encoder->process_video (*i);
 		}
-		
-		if (done[0] && done[1]) {
-			break;
-		}
-	}
-	
-	_delay_line->process_end ();
-	if (_matcher) {
-		_matcher->process_end ();
+		_encoder->process_audio (_player->get_audio (t, frame, true));
 	}
-	_gain->process_end ();
+
+	_finishing = true;
 	_encoder->process_end ();
+
+	_player->statistics().dump (_film->log ());
+}
+
+float
+Transcoder::current_encoding_rate () const
+{
+	return _encoder->current_encoding_rate ();
 }
+
+int
+Transcoder::video_frames_out () const
+{
+	return _encoder->video_frames_out ();
+}
+