X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_encoder.cc;h=a3d2ff86f3446d2429bc2ccb979a8d57cbbd7635;hp=7c641f5ab5e684720bc0187ef48307bdff4cea88;hb=2f796cd531de522a3b7ed03a9942f3c55f3a0b5b;hpb=4d11fe7cea71b0564df9a21a3cc706509d12b0d1

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 7c641f5ab..a3d2ff86f 100644
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -59,8 +59,50 @@ FFmpegEncoder::FFmpegEncoder (
 #endif
 	)
 	: Encoder (film, job)
-	, _history (1000)
+	, _history (200)
 {
+	_player->set_always_burn_open_subtitles ();
+	_player->set_play_referenced ();
+
+	int const ch = film->audio_channels ();
+
+	AudioMapping map;
+	if (mixdown_to_stereo) {
+		_output_audio_channels = 2;
+		map = AudioMapping (ch, 2);
+		float const overall_gain = 2 / (4 + sqrt(2));
+		float const minus_3dB = 1 / sqrt(2);
+		if (ch == 2) {
+			map.set (dcp::LEFT, 0, 1);
+			map.set (dcp::RIGHT, 1, 1);
+		} else if (ch == 4) {
+			map.set (dcp::LEFT,   0, overall_gain);
+			map.set (dcp::RIGHT,  1, overall_gain);
+			map.set (dcp::CENTRE, 0, overall_gain * minus_3dB);
+			map.set (dcp::CENTRE, 1, overall_gain * minus_3dB);
+			map.set (dcp::LS,     0, overall_gain);
+		} else if (ch >= 6) {
+			map.set (dcp::LEFT,   0, overall_gain);
+			map.set (dcp::RIGHT,  1, overall_gain);
+			map.set (dcp::CENTRE, 0, overall_gain * minus_3dB);
+			map.set (dcp::CENTRE, 1, overall_gain * minus_3dB);
+			map.set (dcp::LS,     0, overall_gain);
+			map.set (dcp::RS,     1, overall_gain);
+		}
+		/* XXX: maybe we should do something better for >6 channel DCPs */
+	} else {
+		/* Our encoders don't really want to encode any channel count between 9 and 15 inclusive,
+		 * so let's just use 16 channel exports for any project with more than 8 channels.
+		 */
+		_output_audio_channels = ch > 8 ? 16 : ch;
+		map = AudioMapping (ch, _output_audio_channels);
+		for (int i = 0; i < ch; ++i) {
+			map.set (i, i, 1);
+		}
+	}
+
+	_butler.reset (new Butler(_player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), true, false));
+
 	int const files = split_reels ? film->reels().size() : 1;
 	for (int i = 0; i < files; ++i) {
 
@@ -79,7 +121,7 @@ FFmpegEncoder::FFmpegEncoder (
 				_film->frame_size(),
 				_film->video_frame_rate(),
 				_film->audio_frame_rate(),
-				mixdown_to_stereo ? 2 : film->audio_channels(),
+				_output_audio_channels,
 				format,
 				x264_crf,
 				_film->three_d(),
@@ -92,35 +134,9 @@ FFmpegEncoder::FFmpegEncoder (
 				)
 			);
 	}
-
-	_player->set_always_burn_open_subtitles ();
-	_player->set_play_referenced ();
-
-	int const ch = film->audio_channels ();
-
-	AudioMapping map;
-	if (mixdown_to_stereo) {
-		_output_audio_channels = 2;
-		map = AudioMapping (ch, 2);
-		float const overall_gain = 2 / (4 + sqrt(2));
-		float const minus_3dB = 1 / sqrt(2);
-		map.set (dcp::LEFT,   0, overall_gain);
-		map.set (dcp::RIGHT,  1, overall_gain);
-		map.set (dcp::CENTRE, 0, overall_gain * minus_3dB);
-		map.set (dcp::CENTRE, 1, overall_gain * minus_3dB);
-		map.set (dcp::LS,     0, overall_gain);
-		map.set (dcp::RS,     1, overall_gain);
-	} else {
-		_output_audio_channels = ch;
-		map = AudioMapping (ch, ch);
-		for (int i = 0; i < ch; ++i) {
-			map.set (i, i, 1);
-		}
-	}
-
-	_butler.reset (new Butler(_player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), true, false));
 }
 
+
 void
 FFmpegEncoder::go ()
 {
@@ -130,6 +146,8 @@ FFmpegEncoder::go ()
 		job->sub (_("Encoding"));
 	}
 
+	Waker waker;
+
 	list<DCPTimePeriod> reel_periods = _film->reels ();
 	list<DCPTimePeriod>::const_iterator reel = reel_periods.begin ();
 	list<FileEncoderSet>::iterator encoder = _file_encoders.begin ();
@@ -150,8 +168,16 @@ FFmpegEncoder::go ()
 		}
 
 		for (int j = 0; j < gets_per_frame; ++j) {
-			pair<shared_ptr<PlayerVideo>, DCPTime> v = _butler->get_video ();
-			encoder->get(v.first->eyes())->video(v.first, v.second);
+			Butler::Error e;
+			pair<shared_ptr<PlayerVideo>, DCPTime> v = _butler->get_video (true, &e);
+			_butler->rethrow ();
+			if (!v.first) {
+				throw ProgrammingError(__FILE__, __LINE__, String::compose("butler returned no video; error was %1", static_cast<int>(e)));
+			}
+			shared_ptr<FFmpegFileEncoder> fe = encoder->get (v.first->eyes());
+			if (fe) {
+				fe->video(v.first, v.second);
+			}
 		}
 
 		_history.event ();
@@ -166,6 +192,8 @@ FFmpegEncoder::go ()
 			job->set_progress (float(i.get()) / _film->length().get());
 		}
 
+		waker.nudge ();
+
 		_butler->get_audio (interleaved, audio_frames);
 		/* XXX: inefficient; butler interleaves and we deinterleave again */
 		float* p = interleaved;
@@ -183,7 +211,7 @@ FFmpegEncoder::go ()
 	}
 }
 
-float
+optional<float>
 FFmpegEncoder::current_rate () const
 {
 	return _history.rate ();
@@ -243,6 +271,17 @@ FFmpegEncoder::FileEncoderSet::FileEncoderSet (
 shared_ptr<FFmpegFileEncoder>
 FFmpegEncoder::FileEncoderSet::get (Eyes eyes) const
 {
+	if (_encoders.size() == 1) {
+		/* We are doing a 2D export... */
+		if (eyes == EYES_LEFT) {
+			/* ...but we got some 3D data; put the left eye into the output... */
+			eyes = EYES_BOTH;
+		} else if (eyes == EYES_RIGHT) {
+			/* ...and ignore the right eye.*/
+			return shared_ptr<FFmpegFileEncoder>();
+		}
+	}
+
 	map<Eyes, boost::shared_ptr<FFmpegFileEncoder> >::const_iterator i = _encoders.find (eyes);
 	DCPOMATIC_ASSERT (i != _encoders.end());
 	return i->second;