Fix the behaviour of FileGroup when seeking too far.

[dcpomatic.git] / src / lib / ffmpeg_encoder.cc

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 4614903dbec11996f437bd315b2e755a9fcc8cc3..bf7bdbd040d97e920541297b1eb0cef96db6a0fc 100644 (file)
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -41,6 +41,9 @@ using std::map;
 using boost::shared_ptr;
 using boost::bind;
 using boost::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 FFmpegEncoder::FFmpegEncoder (
        shared_ptr<const Film> film,
@@ -54,6 +57,44 @@ FFmpegEncoder::FFmpegEncoder (
        : Encoder (film, job)
        , _history (1000)
 {
+       _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);
+               }
+       } else {
+               _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) {
 
@@ -72,7 +113,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(),
@@ -81,33 +122,6 @@ 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
@@ -141,7 +155,11 @@ FFmpegEncoder::go ()
                }
 
                for (int j = 0; j < gets_per_frame; ++j) {
-                       pair<shared_ptr<PlayerVideo>, DCPTime> v = _butler->get_video ();
+                       Butler::Error e;
+                       pair<shared_ptr<PlayerVideo>, DCPTime> v = _butler->get_video (&e);
+                       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);
@@ -177,6 +195,8 @@ FFmpegEncoder::go ()
        BOOST_FOREACH (FileEncoderSet i, _file_encoders) {
                i.flush ();
        }
+
+       _butler->rethrow ();
 }
 
 float