X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=c667a1486e61ee4fd8e70337ce416ffa422c67f9;hp=a4cd36a4fb509f17ba6f58eae2729e0bb2901060;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=74fe68e5895654e27a7cf8097917c1e95fa89519

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index a4cd36a4f..c667a1486 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -24,8 +25,6 @@
  *  as a parameter to the constructor.
  */
 
-#include <iostream>
-#include <boost/signals2.hpp>
 #include "transcoder.h"
 #include "encoder.h"
 #include "film.h"
@@ -33,6 +32,16 @@
 #include "audio_decoder.h"
 #include "player.h"
 #include "job.h"
+#include "writer.h"
+#include "compose.hpp"
+#include "referenced_reel_asset.h"
+#include "subtitle_content.h"
+#include "player_video.h"
+#include <boost/signals2.hpp>
+#include <boost/foreach.hpp>
+#include <iostream>
+
+#include "i18n.h"
 
 using std::string;
 using std::cout;
@@ -41,14 +50,16 @@ 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 ())
-	, _encoder (new Encoder (f, j))
+Transcoder::Transcoder (shared_ptr<const Film> film, weak_ptr<Job> j)
+	: _film (film)
+	, _job (j)
+	, _player (new Player (film, film->playlist ()))
+	, _writer (new Writer (film, j))
+	, _encoder (new Encoder (film, _writer))
 	, _finishing (false)
 {
 
@@ -57,21 +68,71 @@ Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
 void
 Transcoder::go ()
 {
-	_encoder->process_begin ();
+	_writer->start ();
+	_encoder->begin ();
+
+	{
+		shared_ptr<Job> job = _job.lock ();
+		DCPOMATIC_ASSERT (job);
+		job->sub (_("Encoding picture and sound"));
+	}
 
 	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);
+	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;
+			}
 		}
-		_encoder->process_audio (_player->get_audio (t, frame, true));
 	}
 
-	_finishing = true;
-	_encoder->process_end ();
+	if (non_burnt_subtitles) {
+		_writer->write (_player->get_subtitle_fonts ());
+	}
+
+	for (DCPTime t; t < length; t += frame) {
+
+		BOOST_FOREACH (shared_ptr<PlayerVideo> i, _player->get_video (t, true)) {
+			if (!_film->three_d()) {
+				/* 2D DCP */
+				if (i->eyes() == EYES_RIGHT) {
+					/* Discard right-eye images */
+					continue;
+				} else if (i->eyes() == EYES_LEFT) {
+					/* Use left-eye images for both eyes */
+					i->set_eyes (EYES_BOTH);
+				}
+			}
+
+			_encoder->encode (i);
+		}
+
+		_writer->write (_player->get_audio (t, frame, true));
+
+		if (non_burnt_subtitles) {
+			_writer->write (_player->get_subtitles (t, frame, true, false, true));
+		}
 
-	_player->statistics().dump (_film->log ());
+		{
+			shared_ptr<Job> job = _job.lock ();
+			DCPOMATIC_ASSERT (job);
+			job->set_progress (float(t.get()) / length.get());
+		}
+	}
+
+	BOOST_FOREACH (ReferencedReelAsset i, _player->get_reel_assets ()) {
+		_writer->write (i);
+	}
+
+	_finishing = true;
+	_encoder->end ();
+	_writer->finish ();
 }
 
 float
@@ -81,8 +142,7 @@ Transcoder::current_encoding_rate () const
 }
 
 int
-Transcoder::video_frames_out () const
+Transcoder::video_frames_enqueued () const
 {
-	return _encoder->video_frames_out ();
+	return _encoder->video_frames_enqueued ();
 }
-