X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.cc;h=ca9134c04d29e52400579330eb34d4fa75a5196e;hb=f0e95aa5b7ada81a1c40f06facab2e94e45ab26c;hp=f8a5971911278b96eb5332691c23f52de7aca2f3;hpb=a3241f40b061480a0907699a5857075388216643;p=dcpomatic.git

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index f8a597191..ca9134c04 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -96,7 +96,6 @@ Encoder::process_begin ()
 	ServerFinder::instance()->connect (boost::bind (&Encoder::server_found, this, _1));
 }
 
-
 void
 Encoder::process_end ()
 {
@@ -199,9 +198,12 @@ Encoder::process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversi
 		return;
 	}
 
-	if (_writer->thrown ()) {
-		_writer->rethrow ();
-	}
+	_writer->rethrow ();
+	/* Re-throw any exception raised by one of our threads.  If more
+	   than one has thrown an exception, only one will be rethrown, I think;
+	   but then, if that happens something has gone badly wrong.
+	*/
+	rethrow ();
 
 	if (_writer->can_fake_write (_video_frames_out)) {
 		_writer->fake_write (_video_frames_out, eyes);
@@ -216,8 +218,8 @@ Encoder::process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversi
 		TIMING ("adding to queue of %1", _queue.size ());
 		_queue.push_back (shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
-						  image->image(), _video_frames_out, eyes, conversion, _film->video_frame_rate(),
-						  _film->j2k_bandwidth(), _film->log()
+						  image->image(PIX_FMT_RGB24, false), _video_frames_out, eyes, conversion, _film->video_frame_rate(),
+						  _film->j2k_bandwidth(), _film->resolution(), _film->log()
 						  )
 					  ));
 		
@@ -257,6 +259,7 @@ Encoder::terminate_threads ()
 
 void
 Encoder::encoder_thread (optional<ServerDescription> server)
+try
 {
 	/* Number of seconds that we currently wait between attempts
 	   to connect to the server; not relevant for localhost
@@ -338,6 +341,10 @@ Encoder::encoder_thread (optional<ServerDescription> server)
 		_condition.notify_all ();
 	}
 }
+catch (...)
+{
+	store_current ();
+}
 
 void
 Encoder::server_found (ServerDescription s)