Fix crash when exporting a 2D project containing 3D content (#1680).

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

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 8bb9b5e45b7556fab9fdd5fc67cf7db85d51c5a2..4614903dbec11996f437bd315b2e755a9fcc8cc3 100644 (file)
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -73,7 +73,6 @@ FFmpegEncoder::FFmpegEncoder (
                                _film->video_frame_rate(),
                                _film->audio_frame_rate(),
                                mixdown_to_stereo ? 2 : film->audio_channels(),
-                               _film->log(),
                                format,
                                x264_crf,
                                _film->three_d(),
@@ -108,7 +107,7 @@ FFmpegEncoder::FFmpegEncoder (
                }
        }
 
-       _butler.reset (new Butler (_player, film->log(), map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), true, false));
+       _butler.reset (new Butler(_player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), true, false));
 }
 
 void
@@ -120,6 +119,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 ();
@@ -141,7 +142,10 @@ 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);
+                       shared_ptr<FFmpegFileEncoder> fe = encoder->get (v.first->eyes());
+                       if (fe) {
+                               fe->video(v.first, v.second);
+                       }
                }
 
                _history.event ();
@@ -156,6 +160,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;
@@ -191,7 +197,6 @@ FFmpegEncoder::FileEncoderSet::FileEncoderSet (
        int video_frame_rate,
        int audio_frame_rate,
        int channels,
-       shared_ptr<Log> log,
        ExportFormat format,
        int x264_crf,
        bool three_d,
@@ -202,15 +207,15 @@ FFmpegEncoder::FileEncoderSet::FileEncoderSet (
        if (three_d) {
                /// TRANSLATORS: L here is an abbreviation for "left", to indicate the left-eye part of a 3D export
                _encoders[EYES_LEFT] = shared_ptr<FFmpegFileEncoder>(
-                       new FFmpegFileEncoder(video_frame_size, video_frame_rate, audio_frame_rate, channels, log, format, x264_crf, String::compose("%1_%2%3", output.string(), _("L"), extension))
+                       new FFmpegFileEncoder(video_frame_size, video_frame_rate, audio_frame_rate, channels, format, x264_crf, String::compose("%1_%2%3", output.string(), _("L"), extension))
                        );
                /// TRANSLATORS: R here is an abbreviation for "left", to indicate the left-eye part of a 3D export
                _encoders[EYES_RIGHT] = shared_ptr<FFmpegFileEncoder>(
-                       new FFmpegFileEncoder(video_frame_size, video_frame_rate, audio_frame_rate, channels, log, format, x264_crf, String::compose("%1_%2%3", output.string(), _("R"), extension))
+                       new FFmpegFileEncoder(video_frame_size, video_frame_rate, audio_frame_rate, channels, format, x264_crf, String::compose("%1_%2%3", output.string(), _("R"), extension))
                        );
        } else {
                _encoders[EYES_BOTH]  = shared_ptr<FFmpegFileEncoder>(
-                       new FFmpegFileEncoder(video_frame_size, video_frame_rate, audio_frame_rate, channels, log, format, x264_crf, String::compose("%1%2", output.string(), extension))
+                       new FFmpegFileEncoder(video_frame_size, video_frame_rate, audio_frame_rate, channels, format, x264_crf, String::compose("%1%2", output.string(), extension))
                        );
        }
 }
@@ -218,6 +223,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;