X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_encoder.cc;h=8f36bbda1a7b58ea3a9e738ade3caad0d11a0f64;hb=4f9314a311de379b105741273a15821da62a75cc;hp=5f29b64da51b498e8a656bc56cce9933f365ef70;hpb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 5f29b64da..8f36bbda1 100644
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -18,26 +18,25 @@
 
 */
 
+
+#include "butler.h"
+#include "cross.h"
 #include "ffmpeg_encoder.h"
 #include "film.h"
+#include "image.h"
 #include "job.h"
+#include "log.h"
 #include "player.h"
 #include "player_video.h"
-#include "log.h"
-#include "image.h"
-#include "cross.h"
-#include "butler.h"
 #include "compose.hpp"
 #include <iostream>
 
 #include "i18n.h"
 
+
 using std::cout;
 using std::list;
 using std::make_shared;
-using std::map;
-using std::pair;
-using std::runtime_error;
 using std::shared_ptr;
 using std::string;
 using std::weak_ptr;
@@ -48,6 +47,7 @@ using namespace dcpomatic;
 using namespace boost::placeholders;
 #endif
 
+
 /** @param key Key to use to encrypt MP4 outputs */
 FFmpegEncoder::FFmpegEncoder (
 	shared_ptr<const Film> film,
@@ -108,7 +108,7 @@ FFmpegEncoder::FFmpegEncoder (
 	}
 
 	_butler = std::make_shared<Butler>(
-		_film, _player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), VideoRange::VIDEO, true, false
+		_film, _player, map, _output_audio_channels, bind(&PlayerVideo::force, FFmpegFileEncoder::pixel_format(format)), VideoRange::VIDEO, Image::Alignment::PADDED, false, false
 		);
 }
 
@@ -176,14 +176,17 @@ FFmpegEncoder::go ()
 
 		for (int j = 0; j < gets_per_frame; ++j) {
 			Butler::Error e;
-			auto v = _butler->get_video (true, &e);
+			auto v = _butler->get_video (Butler::Behaviour::BLOCKING, &e);
 			_butler->rethrow ();
-			if (!v.first) {
-				throw DecodeError(String::compose("Error during decoding: %1", e.summary()));
-			}
-			shared_ptr<FFmpegFileEncoder> fe = encoder->get (v.first->eyes());
-			if (fe) {
-				fe->video(v.first, v.second);
+			if (v.first) {
+				auto fe = encoder->get (v.first->eyes());
+				if (fe) {
+					fe->video(v.first, v.second - reel->from);
+				}
+			} else {
+				if (e.code != Butler::Error::Code::FINISHED) {
+					throw DecodeError(String::compose("Error during decoding: %1", e.summary()));
+				}
 			}
 		}
 
@@ -194,14 +197,14 @@ FFmpegEncoder::go ()
 			_last_time = i;
 		}
 
-		shared_ptr<Job> job = _job.lock ();
+		auto job = _job.lock ();
 		if (job) {
 			job->set_progress (float(i.get()) / _film->length().get());
 		}
 
 		waker.nudge ();
 
-		_butler->get_audio (interleaved, audio_frames);
+		_butler->get_audio (Butler::Behaviour::BLOCKING, interleaved, audio_frames);
 		/* XXX: inefficient; butler interleaves and we deinterleave again */
 		float* p = interleaved;
 		for (int j = 0; j < audio_frames; ++j) {
@@ -273,11 +276,11 @@ FFmpegEncoder::FileEncoderSet::get (Eyes eyes) const
 			eyes = Eyes::BOTH;
 		} else if (eyes == Eyes::RIGHT) {
 			/* ...and ignore the right eye.*/
-			return shared_ptr<FFmpegFileEncoder>();
+			return {};
 		}
 	}
 
-	map<Eyes, std::shared_ptr<FFmpegFileEncoder> >::const_iterator i = _encoders.find (eyes);
+	auto i = _encoders.find (eyes);
 	DCPOMATIC_ASSERT (i != _encoders.end());
 	return i->second;
 }