X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=49742f98d551b12b6168f0d54d0b8f1c937a679b;hp=ba4d3b040baa432812cfe85e972ea9f6c9d052c1;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=4ba8772aef261da209bbb882325fd61a8b479fd7

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index ba4d3b040..49742f98d 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,8 +24,6 @@
  *  as a parameter to the constructor.
  */
 
-#include <iostream>
-#include <boost/signals2.hpp>
 #include "transcoder.h"
 #include "encoder.h"
 #include "film.h"
@@ -33,54 +31,84 @@
 #include "audio_decoder.h"
 #include "player.h"
 #include "job.h"
+#include "writer.h"
+#include "compose.hpp"
+#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;
 
-static void
-video_proxy (weak_ptr<Encoder> encoder, shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, bool same)
-{
-	shared_ptr<Encoder> e = encoder.lock ();
-	if (e) {
-		e->process_video (image, eyes, conversion, same);
-	}
-}
-
-static void
-audio_proxy (weak_ptr<Encoder> encoder, shared_ptr<const AudioBuffers> audio)
-{
-	shared_ptr<Encoder> e = encoder.lock ();
-	if (e) {
-		e->process_audio (audio);
-	}
-}
-
-/** 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 ())
-	, _encoder (new Encoder (f, j))
+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, j, _writer))
 	, _finishing (false)
 {
-	_player->Video.connect (bind (video_proxy, _encoder, _1, _2, _3, _4));
-	_player->Audio.connect (bind (audio_proxy, _encoder, _1));
+
 }
 
 void
 Transcoder::go ()
 {
-	_encoder->process_begin ();
-	while (!_player->pass ()) {}
+	_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;
+			}
+		}
+	}
 
-	_finishing = true;
-	_encoder->process_end ();
+	if (non_burnt_subtitles) {
+		_writer->write (_player->get_subtitle_fonts ());
+	}
+
+	for (DCPTime t; t < 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);
+		}
+
+		shared_ptr<AudioBuffers> audio = _player->get_audio (t, frame, true);
+		if (audio) {
+			_writer->write (audio);
+		}
 
-	_player->statistics().dump (_film->log ());
+		if (non_burnt_subtitles) {
+			_writer->write (_player->get_subtitles (t, frame, true, false));
+		}
+	}
+
+	/* XXX: we should be passing through details of positions, at least... */
+	BOOST_FOREACH (shared_ptr<dcp::ReelAsset> i, _player->get_reel_assets ()) {
+		_writer->write (i);
+	}
+
+	_finishing = true;
+	_encoder->end ();
+	_writer->finish ();
 }
 
 float
@@ -94,4 +122,3 @@ Transcoder::video_frames_out () const
 {
 	return _encoder->video_frames_out ();
 }
-