Trying to create export audio encoders with between 9 and 15 channels

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

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 448fc2a5298e4e506f99c52cef110ec5bbaf21e5..438a73fd64d4b95ea93facb66091a2f7d0b84d30 100644 (file)
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -64,6 +64,7 @@ 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, _4));
+       _player_atmos_connection = _player->Atmos.connect (bind (&DCPEncoder::atmos, this, _1, _2, _3));
 
        BOOST_FOREACH (shared_ptr<const Content> c, film->content ()) {
                BOOST_FOREACH (shared_ptr<TextContent> i, c->text) {
@@ -80,6 +81,7 @@ DCPEncoder::~DCPEncoder ()
        _player_video_connection.release ();
        _player_audio_connection.release ();
        _player_text_connection.release ();
+       _player_atmos_connection.release ();
 }
 
 void
@@ -126,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);
@@ -152,6 +159,14 @@ DCPEncoder::text (PlayerText data, TextType type, optional<DCPTextTrack> track,
        }
 }
 
+
+void
+DCPEncoder::atmos (shared_ptr<const dcp::AtmosFrame> data, DCPTime time, AtmosMetadata metadata)
+{
+       _writer->write (data, time, metadata);
+}
+
+
 optional<float>
 DCPEncoder::current_rate () const
 {