Updated cs_CZ translation from Tomáš Begeni.

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

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 5ee6cca982a596b5bc1728c5390bf2c5409a28f1..9a840c8ab916b6a594f4e6881f223ad20346f4f5 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-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -35,10 +35,9 @@
 #include "writer.h"
 #include "compose.hpp"
 #include "referenced_reel_asset.h"
-#include "subtitle_content.h"
+#include "text_content.h"
 #include "player_video.h"
 #include <boost/signals2.hpp>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 #include "i18n.h"
@@ -46,9 +45,17 @@
 using std::string;
 using std::cout;
 using std::list;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::vector;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::dynamic_pointer_cast;
+using std::make_shared;
+using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using namespace dcpomatic;
+
 
 /** Construct a DCP encoder.
  *  @param film Film that we are encoding.
@@ -56,18 +63,21 @@ using boost::dynamic_pointer_cast;
  */
 DCPEncoder::DCPEncoder (shared_ptr<const Film> film, weak_ptr<Job> job)
        : Encoder (film, job)
-       , _film (film)
-       , _job (job)
+       , _writer(film, job)
+       , _j2k_encoder(film, _writer)
        , _finishing (false)
        , _non_burnt_subtitles (false)
 {
-       _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_subtitle_connection = _player->Subtitle.connect (bind (&DCPEncoder::subtitle, this, _1, _2));
-
-       BOOST_FOREACH (shared_ptr<const Content> c, film->content ()) {
-               if (c->subtitle && c->subtitle->use() && !c->subtitle->burn()) {
-                       _non_burnt_subtitles = true;
+       _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));
+
+       for (auto c: film->content ()) {
+               for (auto i: c->text) {
+                       if (i->use() && !i->burn()) {
+                               _non_burnt_subtitles = true;
+                       }
                }
        }
 }
@@ -77,84 +87,77 @@ DCPEncoder::~DCPEncoder ()
        /* We must stop receiving more video data before we die */
        _player_video_connection.release ();
        _player_audio_connection.release ();
-       _player_subtitle_connection.release ();
+       _player_text_connection.release ();
+       _player_atmos_connection.release ();
 }
 
 void
 DCPEncoder::go ()
 {
-       _writer.reset (new Writer (_film, _job));
-       _writer->start ();
-
-       _j2k_encoder.reset (new J2KEncoder (_film, _writer));
-       _j2k_encoder->begin ();
+       _writer.start();
+       _j2k_encoder.begin();
 
        {
-               shared_ptr<Job> job = _job.lock ();
+               auto job = _job.lock ();
                DCPOMATIC_ASSERT (job);
                job->sub (_("Encoding"));
        }
 
        if (_non_burnt_subtitles) {
-               _writer->write (_player->get_subtitle_fonts ());
+               _writer.write(_player.get_subtitle_fonts());
        }
 
-       while (!_player->pass ()) {}
+       while (!_player.pass()) {}
 
-       BOOST_FOREACH (ReferencedReelAsset i, _player->get_reel_assets ()) {
-               _writer->write (i);
+       for (auto i: get_referenced_reel_assets(_film, _film->playlist())) {
+               _writer.write(i);
        }
 
        _finishing = true;
-       _j2k_encoder->end ();
-       _writer->finish ();
+       _j2k_encoder.end();
+       _writer.finish(_film->dir(_film->dcp_name()));
 }
 
 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);
-       }
-
-       _j2k_encoder->encode (data, time);
+       _j2k_encoder.encode(data, time);
 }
 
 void
 DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 {
-       _writer->write (data);
+       _writer.write(data, time);
 
-       shared_ptr<Job> job = _job.lock ();
+       auto job = _job.lock ();
        DCPOMATIC_ASSERT (job);
        job->set_progress (float(time.get()) / _film->length().get());
 }
 
 void
-DCPEncoder::subtitle (PlayerSubtitles data, DCPTimePeriod period)
+DCPEncoder::text (PlayerText data, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
 {
-       if (_non_burnt_subtitles) {
-               _writer->write (data, period);
+       if (type == TextType::CLOSED_CAPTION || _non_burnt_subtitles) {
+               _writer.write(data, type, track, period);
        }
 }
 
-float
-DCPEncoder::current_rate () const
+
+void
+DCPEncoder::atmos (shared_ptr<const dcp::AtmosFrame> data, DCPTime time, AtmosMetadata metadata)
 {
-       if (!_j2k_encoder) {
-               return 0;
-       }
+       _writer.write(data, time, metadata);
+}
+
 
-       return _j2k_encoder->current_encoding_rate ();
+optional<float>
+DCPEncoder::current_rate () const
+{
+       return _j2k_encoder.current_encoding_rate();
 }
 
 Frame
 DCPEncoder::frames_done () const
 {
-       if (!_j2k_encoder) {
-               return 0;
-       }
-
-       return _j2k_encoder->video_frames_enqueued ();
+       return _j2k_encoder.video_frames_enqueued();
 }