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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 2e33931bd..c018c9243 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-2015 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
@@ -24,77 +24,84 @@
  *  as a parameter to the constructor.
  */
 
-#include <iostream>
-#include <boost/signals2.hpp>
 #include "transcoder.h"
 #include "encoder.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"
+#include "job.h"
+#include "writer.h"
+#include "compose.hpp"
+#include "referenced_reel_asset.h"
+#include "subtitle_content.h"
+#include <boost/signals2.hpp>
+#include <boost/foreach.hpp>
+#include <iostream>
 
 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.
+/** Construct a transcoder.
  *  @param f Film that we are transcoding.
- *  @param j Job that we are running under, or 0.
- *  @param e Encoder to use.
+ *  @param j Job that this transcoder is being used in.
  */
-Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<Job> j)
-	: _job (j)
-	, _player (f->player ())
-	, _encoder (new Encoder (f))
+Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> j)
+	: _film (film)
+	, _player (new Player (film, film->playlist ()))
+	, _writer (new Writer (film, j))
+	, _encoder (new Encoder (film, _writer))
+	, _finishing (false)
 {
-	_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);
-	
-	_player->connect_audio (_delay_line);
-	_delay_line->connect_audio (_matcher);
-	_matcher->connect_audio (_gain);
-	_gain->connect_audio (_trimmer);
-	_trimmer->connect_audio (_encoder);
 }
 
 void
 Transcoder::go ()
 {
-	_encoder->process_begin ();
-	while (1) {
-		if (_player->pass ()) {
-			break;
+	_writer->start ();
+	_encoder->begin ();
+
+	DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
+	DCPTime const length = _film->length ();
+
+	int burnt_subtitles = 0;
+	int non_burnt_subtitles = 0;
+	BOOST_FOREACH (shared_ptr<const Content> c, _film->content ()) {
+		shared_ptr<const SubtitleContent> sc = dynamic_pointer_cast<const SubtitleContent> (c);
+		if (sc && sc->use_subtitles()) {
+			if (sc->burn_subtitles()) {
+				++burnt_subtitles;
+			} else {
+				++non_burnt_subtitles;
+			}
 		}
-		_player->set_progress (_job);
 	}
 
-	_delay_line->process_end ();
-	if (_matcher) {
-		_matcher->process_end ();
+	if (non_burnt_subtitles) {
+		_writer->write (_player->get_subtitle_fonts ());
 	}
-	_gain->process_end ();
-	_encoder->process_end ();
+
+	for (DCPTime t; t < length; t += frame) {
+		_encoder->encode (_player->get_video (t, true));
+		_writer->write (_player->get_audio (t, frame, true));
+
+		if (non_burnt_subtitles) {
+			_writer->write (_player->get_subtitles (t, frame, true, false, true));
+		}
+	}
+
+	BOOST_FOREACH (ReferencedReelAsset i, _player->get_reel_assets ()) {
+		_writer->write (i);
+	}
+
+	_finishing = true;
+	_encoder->end ();
+	_writer->finish ();
 }
 
 float