X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=ba004d634f4b6c7d2e933ce080e82b9dbfb10df3;hb=2d5beb0d6794df13ad1df47e84fd7a57d1d1c64d;hp=1012c45442b69320e9b4bd7aac14143167755065;hpb=8c6e4c8e4f37450f44cb4ca9918406a6f2cc6055;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 1012c4544..ba004d634 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 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,8 +24,6 @@
  *  as a parameter to the constructor.
  */
 
-#include <iostream>
-#include <boost/signals2.hpp>
 #include "transcoder.h"
 #include "encoder.h"
 #include "film.h"
@@ -34,6 +32,12 @@
 #include "player.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;
@@ -42,15 +46,15 @@ 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 e Encoder to use.
+ *  @param j Job that this transcoder is being used in.
  */
-Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
-	: _film (f)
-	, _player (f->make_player ())
-	, _writer (new Writer (f, j))
-	, _encoder (new Encoder (f, j, _writer))
+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)
 {
 
@@ -59,25 +63,44 @@ Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
 void
 Transcoder::go ()
 {
+	_writer->start ();
 	_encoder->begin ();
 
 	DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
-	for (DCPTime t; t < _film->length(); t += frame) {
-		list<shared_ptr<PlayerVideo> > v = _player->get_video (t, true);
-		for (list<shared_ptr<PlayerVideo> >::const_iterator i = v.begin(); i != v.end(); ++i) {
-			_encoder->enqueue (*i);
+	DCPTime const length = _film->length ();
+
+	int burnt_subtitles = 0;
+	int non_burnt_subtitles = 0;
+	BOOST_FOREACH (shared_ptr<const Content> c, _film->content ()) {
+		if (c->subtitle && c->subtitle->use()) {
+			if (c->subtitle->burn()) {
+				++burnt_subtitles;
+			} else {
+				++non_burnt_subtitles;
+			}
 		}
+	}
+
+	if (non_burnt_subtitles) {
+		_writer->write (_player->get_subtitle_fonts ());
+	}
+
+	for (DCPTime t; t < length; t += frame) {
+		_encoder->encode (_player->get_video (t, true));
 		_writer->write (_player->get_audio (t, frame, true));
-		if (!_film->burn_subtitles ()) {
-			_writer->write (_player->get_subtitles (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 ();
-
-	_player->statistics().dump (_film->log ());
 }
 
 float
@@ -91,4 +114,3 @@ Transcoder::video_frames_out () const
 {
 	return _encoder->video_frames_out ();
 }
-