Make Atmos content work more like other content. Now its MXFs

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

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index cfc7da903dd6d55538d17d4f9a2707bf1ebddb06..438a73fd64d4b95ea93facb66091a2f7d0b84d30 100644 (file)
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -49,6 +49,8 @@ using std::list;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
+using boost::optional;
+using namespace dcpomatic;
 
 /** Construct a DCP encoder.
  *  @param film Film that we are encoding.
@@ -61,11 +63,14 @@ DCPEncoder::DCPEncoder (shared_ptr<const Film> film, weak_ptr<Job> job)
 {
        _player_video_connection = _player->Video.connect (bind (&DCPEncoder::video, this, _1, _2));
        _player_audio_connection = _player->Audio.connect (bind (&DCPEncoder::audio, this, _1, _2));
-       _player_text_connection = _player->Text.connect (bind (&DCPEncoder::text, this, _1, _2, _3));
+       _player_text_connection = _player->Text.connect (bind (&DCPEncoder::text, this, _1, _2, _3, _4));
+       _player_atmos_connection = _player->Atmos.connect (bind (&DCPEncoder::atmos, this, _1, _2, _3));
 
        BOOST_FOREACH (shared_ptr<const Content> c, film->content ()) {
-               if (c->subtitle && c->subtitle->use() && !c->subtitle->burn()) {
-                       _non_burnt_subtitles = true;
+               BOOST_FOREACH (shared_ptr<TextContent> i, c->text) {
+                       if (i->use() && !i->burn()) {
+                               _non_burnt_subtitles = true;
+                       }
                }
        }
 }
@@ -76,6 +81,7 @@ DCPEncoder::~DCPEncoder ()
        _player_video_connection.release ();
        _player_audio_connection.release ();
        _player_text_connection.release ();
+       _player_atmos_connection.release ();
 }
 
 void
@@ -122,9 +128,14 @@ DCPEncoder::go ()
 void
 DCPEncoder::video (shared_ptr<PlayerVideo> data, DCPTime time)
 {
-       if (!_film->three_d() && data->eyes() == EYES_LEFT) {
-               /* Use left-eye images for both eyes */
-               data->set_eyes (EYES_BOTH);
+       if (!_film->three_d()) {
+               if (data->eyes() == EYES_LEFT) {
+                       /* Use left-eye images for both eyes... */
+                       data->set_eyes (EYES_BOTH);
+               } else if (data->eyes() == EYES_RIGHT) {
+                       /* ...and discard the right */
+                       return;
+               }
        }
 
        _j2k_encoder->encode (data, time);
@@ -141,18 +152,26 @@ DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 }
 
 void
-DCPEncoder::text (PlayerText data, TextType type, DCPTimePeriod period)
+DCPEncoder::text (PlayerText data, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
 {
        if (type == TEXT_CLOSED_CAPTION || _non_burnt_subtitles) {
-               _writer->write (data, type, period);
+               _writer->write (data, type, track, period);
        }
 }
 
-float
+
+void
+DCPEncoder::atmos (shared_ptr<const dcp::AtmosFrame> data, DCPTime time, AtmosMetadata metadata)
+{
+       _writer->write (data, time, metadata);
+}
+
+
+optional<float>
 DCPEncoder::current_rate () const
 {
        if (!_j2k_encoder) {
-               return 0;
+               return optional<float>();
        }
 
        return _j2k_encoder->current_encoding_rate ();