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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 4e8932268..c667a1486 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2015 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/>.
 
 */
 
@@ -33,11 +34,15 @@
 #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;
 using std::list;
@@ -49,11 +54,12 @@ using boost::dynamic_pointer_cast;
  *  @param f Film that we are transcoding.
  *  @param j Job that this transcoder is being used in.
  */
-Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> 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, j, _writer))
+	, _encoder (new Encoder (film, _writer))
 	, _finishing (false)
 {
 
@@ -65,15 +71,20 @@ Transcoder::go ()
 	_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 ());
 	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()) {
+		if (c->subtitle && c->subtitle->use()) {
+			if (c->subtitle->burn()) {
 				++burnt_subtitles;
 			} else {
 				++non_burnt_subtitles;
@@ -86,16 +97,39 @@ Transcoder::go ()
 	}
 
 	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);
+
+		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));
+			_writer->write (_player->get_subtitles (t, frame, true, false, true));
+		}
+
+		{
+			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 ();
@@ -108,7 +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 ();
 }