Prevent creation of a DCP with missing content or DCP content that needs KDMs/OVs.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 8afd647092512c2d802d9541e1ef5680cac86752..ee099c7df3f427a59ceccb1c3dc66a3d273214ef 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -36,6 +36,7 @@
 #include "compose.hpp"
 #include "referenced_reel_asset.h"
 #include "subtitle_content.h"
+#include "player_video.h"
 #include <boost/signals2.hpp>
 #include <boost/foreach.hpp>
 #include <iostream>
@@ -53,7 +54,7 @@ using boost::dynamic_pointer_cast;
  *  @param f Film that we are transcoding.
  *  @param j Job that this transcoder is being used in.
  */
-Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> j)
+Transcoder::Transcoder (shared_ptr<const Film> film, weak_ptr<Job> j)
        : _film (film)
        , _job (j)
        , _player (new Player (film, film->playlist ()))
@@ -70,7 +71,11 @@ Transcoder::go ()
        _writer->start ();
        _encoder->begin ();
 
-       _job->sub (_("Encoding picture and sound"));
+       {
+               shared_ptr<Job> job = _job.lock ();
+               DCPOMATIC_ASSERT (job);
+               job->sub (_("Encoding"));
+       }
 
        DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
        DCPTime const length = _film->length ();
@@ -92,14 +97,33 @@ Transcoder::go ()
        }
 
        for (DCPTime t; t < length; t += frame) {
-               _encoder->encode (_player->get_video (t, true));
+
+               BOOST_FOREACH (shared_ptr<PlayerVideo> i, _player->get_video (t, true)) {
+                       if (!_film->three_d()) {
+                               /* 2D DCP */
+                               if (i->eyes() == EYES_RIGHT) {
+                                       /* Discard right-eye images */
+                                       continue;
+                               } else if (i->eyes() == EYES_LEFT) {
+                                       /* Use left-eye images for both eyes */
+                                       i->set_eyes (EYES_BOTH);
+                               }
+                       }
+
+                       _encoder->encode (i);
+               }
+
                _writer->write (_player->get_audio (t, frame, true));
 
                if (non_burnt_subtitles) {
                        _writer->write (_player->get_subtitles (t, frame, true, false, true));
                }
 
-               _job->set_progress (float(t.get()) / length.get());
+               {
+                       shared_ptr<Job> job = _job.lock ();
+                       DCPOMATIC_ASSERT (job);
+                       job->set_progress (float(t.get()) / length.get());
+               }
        }
 
        BOOST_FOREACH (ReferencedReelAsset i, _player->get_reel_assets ()) {
@@ -118,7 +142,7 @@ Transcoder::current_encoding_rate () const
 }
 
 int
-Transcoder::video_frames_out () const
+Transcoder::video_frames_enqueued () const
 {
-       return _encoder->video_frames_out ();
+       return _encoder->video_frames_enqueued ();
 }