X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=595915883228021dd49f86ce920ea9aa4f9492c0;hb=988ed4fac88965f2fc260f55a05e2db87bb1ecb8;hp=17bd21daf6cb61b0bef42cd6c0167a5166f33aad;hpb=84cab4dbc3beba84ba53cec1054ede7c250a4c9c;p=dcpomatic.git diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 17bd21daf..595915883 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -29,8 +30,6 @@ #include "job.h" #include "cross.h" #include "audio_buffers.h" -#include "md5_digester.h" -#include "data.h" #include "version.h" #include "font.h" #include "util.h" @@ -40,6 +39,7 @@ #include #include #include +#include #include "i18n.h" @@ -59,9 +59,13 @@ using std::pair; using std::string; using std::list; using std::cout; +using std::map; +using std::min; +using std::max; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; +using dcp::Data; Writer::Writer (shared_ptr film, weak_ptr j) : _film (film) @@ -75,14 +79,13 @@ Writer::Writer (shared_ptr film, weak_ptr j) , _repeat_written (0) , _pushed_to_disk (0) { - /* Remove any old DCP */ - boost::filesystem::remove_all (_film->dir (_film->dcp_name ())); - shared_ptr job = _job.lock (); DCPOMATIC_ASSERT (job); - BOOST_FOREACH (DCPTimePeriod p, _film->reels ()) { - _reels.push_back (ReelWriter (film, p, job)); + int reel_index = 0; + list const reels = _film->reels (); + BOOST_FOREACH (DCPTimePeriod p, reels) { + _reels.push_back (ReelWriter (film, p, job, reel_index++, reels.size(), _film->content_summary(p))); } /* We can keep track of the current audio and subtitle reels easily because audio @@ -95,8 +98,6 @@ Writer::Writer (shared_ptr film, weak_ptr j) if (_film->is_signed() && !Config::instance()->signer_chain()->valid ()) { throw InvalidSignerError (); } - - job->sub (_("Encoding image data")); } void @@ -316,9 +317,9 @@ try LOG_WARNING (N_("Finishing writer with a left-over queue of %1:"), _queue.size()); for (list::const_iterator i = _queue.begin(); i != _queue.end(); ++i) { if (i->type == QueueItem::FULL) { - LOG_WARNING (N_("- type FULL, frame %1, eyes %2"), i->frame, i->eyes); + LOG_WARNING (N_("- type FULL, frame %1, eyes %2"), i->frame, (int) i->eyes); } else { - LOG_WARNING (N_("- type FAKE, size %1, frame %2, eyes %3"), i->size, i->frame, i->eyes); + LOG_WARNING (N_("- type FAKE, size %1, frame %2, eyes %3"), i->size, i->frame, (int) i->eyes); } } } @@ -339,7 +340,7 @@ try switch (qi.type) { case QueueItem::FULL: - LOG_DEBUG_ENCODE (N_("Writer FULL-writes %1 (%2)"), qi.frame, qi.eyes); + LOG_DEBUG_ENCODE (N_("Writer FULL-writes %1 (%2)"), qi.frame, (int) qi.eyes); if (!qi.encoded) { qi.encoded = Data (_film->j2c_path (qi.reel, qi.frame, qi.eyes, false)); } @@ -359,19 +360,6 @@ try } lock.lock (); - - shared_ptr job = _job.lock (); - DCPOMATIC_ASSERT (job); - int64_t total = _film->length().frames_round (_film->video_frame_rate ()); - if (_film->three_d ()) { - /* _full_written and so on are incremented for each eye, so we need to double the total - frames to get the correct progress. - */ - total *= 2; - } - if (total) { - job->set_progress (float (_full_written + _fake_written + _repeat_written) / total); - } } while (_queued_full_in_memory > _maximum_frames_in_memory) { @@ -388,6 +376,8 @@ try DCPOMATIC_ASSERT (i != _queue.rend()); ++_pushed_to_disk; + /* For the log message below */ + int const awaiting = _reels[_queue.front().reel].last_written_video_frame(); lock.unlock (); /* i is valid here, even though we don't hold a lock on the mutex, @@ -395,7 +385,7 @@ try thread could erase the last item in the list. */ - LOG_GENERAL ("Writer full; pushes %1 to disk", i->frame); + LOG_GENERAL ("Writer full; pushes %1 to disk while awaiting %2", i->frame, awaiting); i->encoded->write_via_temp ( _film->j2c_path (i->reel, i->frame, i->eyes, true), @@ -429,8 +419,10 @@ Writer::terminate_thread (bool can_throw) _full_condition.notify_all (); lock.unlock (); - DCPOMATIC_ASSERT (_thread->joinable ()); - _thread->join (); + if (_thread->joinable ()) { + _thread->join (); + } + if (can_throw) { rethrow (); } @@ -446,12 +438,18 @@ Writer::finish () return; } + LOG_GENERAL_NC ("Terminating writer thread"); + terminate_thread (true); + LOG_GENERAL_NC ("Finishing ReelWriters"); + BOOST_FOREACH (ReelWriter& i, _reels) { i.finish (); } + LOG_GENERAL_NC ("Writing XML"); + dcp::DCP dcp (_film->dir (_film->dcp_name())); shared_ptr cpl ( @@ -463,16 +461,39 @@ Writer::finish () dcp.add (cpl); + /* Calculate digests for each reel in parallel */ + + shared_ptr job = _job.lock (); + job->sub (_("Computing digests")); + + boost::asio::io_service service; + boost::thread_group pool; + + shared_ptr work (new boost::asio::io_service::work (service)); + + int const threads = max (1, Config::instance()->num_local_encoding_threads ()); + + for (int i = 0; i < threads; ++i) { + pool.create_thread (boost::bind (&boost::asio::io_service::run, &service)); + } + BOOST_FOREACH (ReelWriter& i, _reels) { + boost::function set_progress = boost::bind (&Writer::set_digest_progress, this, job.get(), _1); + service.post (boost::bind (&ReelWriter::calculate_digests, &i, set_progress)); + } - cpl->add (i.create_reel (_reel_assets, _fonts)); + work.reset (); + pool.join_all (); + service.stop (); + + /* Add reels to CPL */ - shared_ptr job = _job.lock (); - DCPOMATIC_ASSERT (job); - i.calculate_digests (job); + BOOST_FOREACH (ReelWriter& i, _reels) { + cpl->add (i.create_reel (_reel_assets, _fonts)); } dcp::XMLMetadata meta; + meta.annotation_text = cpl->annotation_text (); meta.creator = Config::instance()->dcp_creator (); if (meta.creator.empty ()) { meta.creator = String::compose ("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit); @@ -494,7 +515,7 @@ Writer::finish () } } - dcp.write_xml (_film->interop () ? dcp::INTEROP : dcp::SMPTE, meta, signer); + dcp.write_xml (_film->interop () ? dcp::INTEROP : dcp::SMPTE, meta, signer, Config::instance()->dcp_metadata_filename_format()); LOG_GENERAL ( N_("Wrote %1 FULL, %2 FAKE, %3 REPEAT, %4 pushed to disk"), _full_written, _fake_written, _repeat_written, _pushed_to_disk @@ -535,8 +556,20 @@ Writer::write (PlayerSubtitles subs) void Writer::write (list > fonts) { - /* Just keep a list of fonts and we'll deal with them in ::finish */ - copy (fonts.begin (), fonts.end (), back_inserter (_fonts)); + /* Just keep a list of unique fonts and we'll deal with them in ::finish */ + + BOOST_FOREACH (shared_ptr i, fonts) { + bool got = false; + BOOST_FOREACH (shared_ptr j, _fonts) { + if (*i == *j) { + got = true; + } + } + + if (!got) { + _fonts.push_back (i); + } + } } bool @@ -562,7 +595,16 @@ operator== (QueueItem const & a, QueueItem const & b) void Writer::set_encoder_threads (int threads) { - _maximum_frames_in_memory = lrint (threads * 1.1); + /* I think the scaling factor here should be the ratio of the longest frame + encode time to the shortest; if the thread count is T, longest time is L + and the shortest time S we could encode L/S frames per thread whilst waiting + for the L frame to encode so we might have to store LT/S frames. + + However we don't want to use too much memory, so keep it a bit lower than we'd + perhaps like. A J2K frame is typically about 1Mb so 3 here will mean we could + use about 240Mb with 72 encoding threads. + */ + _maximum_frames_in_memory = lrint (threads * 3); } void @@ -583,3 +625,18 @@ Writer::video_reel (int frame) const DCPOMATIC_ASSERT (i < _reels.size ()); return i; } + +void +Writer::set_digest_progress (Job* job, float progress) +{ + /* I believe this is thread-safe */ + _digest_progresses[boost::this_thread::get_id()] = progress; + + boost::mutex::scoped_lock lm (_digest_progresses_mutex); + float min_progress = FLT_MAX; + for (map::const_iterator i = _digest_progresses.begin(); i != _digest_progresses.end(); ++i) { + min_progress = min (min_progress, i->second); + } + + job->set_progress (min_progress); +}