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 3f5b6f5913a889e52cb6a91d8cc92578df35d43b..4614903dbec11996f437bd315b2e755a9fcc8cc3 100644 (file)
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -142,7 +142,10 @@ FFmpegEncoder::go ()
 
                for (int j = 0; j < gets_per_frame; ++j) {
                        pair<shared_ptr<PlayerVideo>, DCPTime> v = _butler->get_video ();
 
                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 ();
                }
 
                _history.event ();


@@ -220,6 +223,17 @@ FFmpegEncoder::FileEncoderSet::FileEncoderSet (
 shared_ptr<FFmpegFileEncoder>
 FFmpegEncoder::FileEncoderSet::get (Eyes eyes) const
 {
 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;
        map<Eyes, boost::shared_ptr<FFmpegFileEncoder> >::const_iterator i = _encoders.find (eyes);
        DCPOMATIC_ASSERT (i != _encoders.end());
        return i->second;