X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=c667a1486e61ee4fd8e70337ce416ffa422c67f9;hb=80cb87b94c1a6ddb814aed086bd077c1aed9ff7b;hp=eb787dee82c52ca3795cb5a145170710e6d1cd85;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index eb787dee8..c667a1486 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -36,10 +36,13 @@
 #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;
@@ -51,8 +54,9 @@ 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, _writer))
@@ -67,6 +71,12 @@ 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 ();
 
@@ -87,12 +97,33 @@ Transcoder::go ()
 	}
 
 	for (DCPTime t; t < length; t += frame) {
-		_encoder->encode (_player->get_video (t, true));
+
+		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));
 		}
+
+		{
+			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 ()) {
@@ -111,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 ();
 }