X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=c507c552758bb4ca8ee9a0f081042b9de20f5f42;hb=080051edd655be1a8aa4b8dc21d0c262282d8444;hp=47c6b838142619a355cab1f0fbc298f84586df9b;hpb=0fc3ae397e281035627ad8848b4a50c093ae5e4f;p=dcpomatic.git diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 47c6b8381..c507c5527 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,7 +30,6 @@ #include "job.h" #include "cross.h" #include "audio_buffers.h" -#include "md5_digester.h" #include "version.h" #include "font.h" #include "util.h" @@ -39,6 +39,7 @@ #include #include #include +#include #include "i18n.h" @@ -58,6 +59,9 @@ 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; @@ -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 @@ -92,11 +95,10 @@ Writer::Writer (shared_ptr film, weak_ptr j) _subtitle_reel = _reels.begin (); /* Check that the signer is OK if we need one */ - if (_film->is_signed() && !Config::instance()->signer_chain()->valid ()) { - throw InvalidSignerError (); + string reason; + if (_film->is_signed() && !Config::instance()->signer_chain()->valid(&reason)) { + throw InvalidSignerError (reason); } - - job->sub (_("Encoding image data")); } void @@ -227,23 +229,40 @@ Writer::fake_write (Frame frame, Eyes eyes) _empty_condition.notify_all (); } -/** Write one video frame's worth of audio frames to the DCP. +/** Write some audio frames to the DCP. * @param audio Audio data or 0 if there is no audio to be written here (i.e. it is referenced). * This method is not thread safe. */ void Writer::write (shared_ptr audio) { - if (_audio_reel == _reels.end ()) { - /* This audio is off the end of the last reel; ignore it */ - return; - } + /* The audio we get might span a reel boundary, and if so we have to write it in bits */ - _audio_reel->write (audio); + int32_t offset = 0; + while (offset < audio->frames ()) { + + if (_audio_reel == _reels.end ()) { + /* This audio is off the end of the last reel; ignore it */ + return; + } + + int32_t const this_time = min ( + audio->frames() - offset, + (int32_t) (_audio_reel->period().duration().frames_floor(_film->audio_frame_rate()) - _audio_reel->total_written_audio_frames()) + ); + + if (this_time == audio->frames()) { + /* Easy case: we can write all the audio to this reel */ + _audio_reel->write (audio); + } else { + /* Write the part we can */ + shared_ptr part (new AudioBuffers (audio->channels(), this_time)); + part->copy_from (audio.get(), this_time, offset, 0); + _audio_reel->write (part); + ++_audio_reel; + } - /* written is in video frames, not audio frames */ - if (_audio_reel->total_written_audio_frames() >= _audio_reel->period().duration().frames_floor (_film->video_frame_rate())) { - ++_audio_reel; + offset += this_time; } } @@ -316,9 +335,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 +358,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 +378,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 +394,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 +403,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), @@ -471,16 +479,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)); + } - shared_ptr job = _job.lock (); - DCPOMATIC_ASSERT (job); - i.calculate_digests (job); + work.reset (); + pool.join_all (); + service.stop (); + /* Add reels to CPL */ + + 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); @@ -497,12 +528,13 @@ Writer::finish () if (_film->is_signed ()) { signer = Config::instance()->signer_chain (); /* We did check earlier, but check again here to be on the safe side */ - if (!signer->valid ()) { - throw InvalidSignerError (); + string reason; + if (!signer->valid (&reason)) { + throw InvalidSignerError (reason); } } - 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 @@ -527,13 +559,13 @@ Writer::can_fake_write (Frame frame) const } void -Writer::write (PlayerSubtitles subs) +Writer::write (PlayerSubtitles subs, DCPTimePeriod period) { if (subs.text.empty ()) { return; } - if (_subtitle_reel->period().to <= subs.from) { + if (_subtitle_reel->period().to <= period.from) { ++_subtitle_reel; } @@ -543,8 +575,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 @@ -600,3 +644,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); +}