Slightly-improved log message.

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

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 31c265e2f73e82a60a590d251e99b89c729027a6..f59ccb0f535e5f5e7c850be847146e9bfc4a99cf 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -33,6 +33,7 @@
 #include "encoded_data.h"
 #include "version.h"
 #include "font.h"
+#include "util.h"
 #include <dcp/mono_picture_mxf.h>
 #include <dcp/stereo_picture_mxf.h>
 #include <dcp/sound_mxf.h>
@@ -82,6 +83,7 @@ Writer::Writer (shared_ptr<const Film> f, weak_ptr<Job> j)
        , _queued_full_in_memory (0)
        , _last_written_frame (-1)
        , _last_written_eyes (EYES_RIGHT)
+       , _maximum_frames_in_memory (0)
        , _full_written (0)
        , _fake_written (0)
        , _pushed_to_disk (0)
@@ -103,9 +105,6 @@ Writer::Writer (shared_ptr<const Film> f, weak_ptr<Job> j)
                _picture_mxf.reset (new dcp::MonoPictureMXF (dcp::Fraction (_film->video_frame_rate (), 1)));
        }
 
-       job->sub (_("Checking existing image data"));
-       check_existing_picture_mxf ();
-
        _picture_mxf->set_size (_film->frame_size ());
 
        if (_film->encrypted ()) {
@@ -128,7 +127,7 @@ Writer::Writer (shared_ptr<const Film> f, weak_ptr<Job> j)
                /* Write the sound MXF into the film directory so that we leave the creation
                   of the DCP directory until the last minute.
                */
-               _sound_mxf_writer = _sound_mxf->start_write (_film->directory() / _film->audio_mxf_filename(), _film->interop() ? dcp::INTEROP : dcp::SMPTE);
+               _sound_mxf_writer = _sound_mxf->start_write (_film->directory() / audio_mxf_filename (_sound_mxf), _film->interop() ? dcp::INTEROP : dcp::SMPTE);
        }
 
        /* Check that the signer is OK if we need one */
@@ -136,6 +135,9 @@ Writer::Writer (shared_ptr<const Film> f, weak_ptr<Job> j)
                throw InvalidSignerError ();
        }
 
+       job->sub (_("Checking existing image data"));
+       check_existing_picture_mxf ();
+       
        _thread = new boost::thread (boost::bind (&Writer::thread, this));
 
        job->sub (_("Encoding image data"));
@@ -151,7 +153,7 @@ Writer::write (shared_ptr<const EncodedData> encoded, int frame, Eyes eyes)
 {
        boost::mutex::scoped_lock lock (_mutex);
 
-       while (_queued_full_in_memory > maximum_frames_in_memory ()) {
+       while (_queued_full_in_memory > _maximum_frames_in_memory) {
                /* The queue is too big; wait until that is sorted out */
                _full_condition.wait (lock);
        }
@@ -184,7 +186,7 @@ Writer::fake_write (int frame, Eyes eyes)
 {
        boost::mutex::scoped_lock lock (_mutex);
 
-       while (_queued_full_in_memory > maximum_frames_in_memory ()) {
+       while (_queued_full_in_memory > _maximum_frames_in_memory) {
                /* The queue is too big; wait until that is sorted out */
                _full_condition.wait (lock);
        }
@@ -266,7 +268,7 @@ try
 
                while (true) {
                        
-                       if (_finish || _queued_full_in_memory > maximum_frames_in_memory () || have_sequenced_image_at_queue_head ()) {
+                       if (_finish || _queued_full_in_memory > _maximum_frames_in_memory || have_sequenced_image_at_queue_head ()) {
                                /* We've got something to do: go and do it */
                                break;
                        }
@@ -315,7 +317,7 @@ try
                        switch (qi.type) {
                        case QueueItem::FULL:
                        {
-                               LOG_GENERAL (N_("Writer FULL-writes %1 to MXF"), qi.frame);
+                               LOG_GENERAL (N_("Writer FULL-writes %1 (%2) to MXF"), qi.frame, qi.eyes);
                                if (!qi.encoded) {
                                        qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, qi.eyes, false)));
                                }
@@ -352,7 +354,7 @@ try
                        }
                }
 
-               while (_queued_full_in_memory > maximum_frames_in_memory ()) {
+               while (_queued_full_in_memory > _maximum_frames_in_memory) {
                        done_something = true;
                        /* Too many frames in memory which can't yet be written to the stream.
                           Write some FULL frames to disk.
@@ -366,21 +368,24 @@ try
                        }
 
                        DCPOMATIC_ASSERT (i != _queue.rend());
-                       QueueItem qi = *i;
-
                        ++_pushed_to_disk;
-                       
                        lock.unlock ();
 
+                       /* i is valid here, even though we don't hold a lock on the mutex,
+                          since list iterators are unaffected by insertion and only this
+                          thread could erase the last item in the list.
+                       */
+
                        LOG_GENERAL (
                                "Writer full (awaiting %1 [last eye was %2]); pushes %3 to disk",
                                _last_written_frame + 1,
-                               _last_written_eyes, qi.frame
+                               _last_written_eyes, i->frame
                                );
                        
-                       qi.encoded->write (_film, qi.frame, qi.eyes);
+                       i->encoded->write (_film, i->frame, i->eyes);
+                       
                        lock.lock ();
-                       qi.encoded.reset ();
+                       i->encoded.reset ();
                        --_queued_full_in_memory;
                }
 
@@ -442,7 +447,7 @@ Writer::finish ()
        
        boost::filesystem::path video_to;
        video_to /= _film->dir (_film->dcp_name());
-       video_to /= _film->video_mxf_filename ();
+       video_to /= video_mxf_filename (_picture_mxf);
 
        boost::system::error_code ec;
        boost::filesystem::create_hard_link (video_from, video_to, ec);
@@ -462,12 +467,12 @@ Writer::finish ()
        if (_sound_mxf) {
                boost::filesystem::path audio_to;
                audio_to /= _film->dir (_film->dcp_name ());
-               audio_to /= _film->audio_mxf_filename ();
+               audio_to /= audio_mxf_filename (_sound_mxf);
                
-               boost::filesystem::rename (_film->file (_film->audio_mxf_filename ()), audio_to, ec);
+               boost::filesystem::rename (_film->file (audio_mxf_filename (_sound_mxf)), audio_to, ec);
                if (ec) {
                        throw FileError (
-                               String::compose (_("could not move audio MXF into the DCP (%1)"), ec.value ()), _film->file (_film->audio_mxf_filename ())
+                               String::compose (_("could not move audio MXF into the DCP (%1)"), ec.value ()), audio_mxf_filename (_sound_mxf)
                                );
                }
 
@@ -529,7 +534,7 @@ Writer::finish ()
                        dcp.add (shared_ptr<dcp::Font> (new dcp::Font (to)));
                }
 
-               _subtitle_content->write_xml (_film->dir (_film->dcp_name ()) / _subtitle_content->id () / _film->subtitle_xml_filename ());
+               _subtitle_content->write_xml (_film->dir (_film->dcp_name ()) / _subtitle_content->id () / subtitle_content_filename (_subtitle_content));
                reel->add (shared_ptr<dcp::ReelSubtitleAsset> (
                                   new dcp::ReelSubtitleAsset (
                                           _subtitle_content,
@@ -704,8 +709,8 @@ operator== (QueueItem const & a, QueueItem const & b)
        return a.frame == b.frame && a.eyes == b.eyes;
 }
 
-int
-Writer::maximum_frames_in_memory () const
+void
+Writer::set_encoder_threads (int threads)
 {
-       return Config::instance()->num_local_encoding_threads() + 4;
+       _maximum_frames_in_memory = rint (threads * 1.1);
 }