X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=bb65c1f2b9b7584ab8b93ad854f5ee6ef1711c32;hp=9e2cf4bd4fbef9624d78f3d8ca8dc0034d01f113;hb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;hpb=644bb89cb752eb89d639e16ee0bff70d25a75750 diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 9e2cf4bd4..bb65c1f2b 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,39 +30,25 @@ #include "job.h" #include "cross.h" #include "audio_buffers.h" -#include "md5_digester.h" -#include "encoded_data.h" #include "version.h" #include "font.h" #include "util.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "reel_writer.h" #include -#include -#include -#include -#include #include #include #include +#include #include "i18n.h" -#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); -#define LOG_TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TYPE_TIMING); -#define LOG_WARNING_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_WARNING); -#define LOG_WARNING(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_WARNING); -#define LOG_ERROR(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_ERROR); -#define LOG_DEBUG(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_DEBUG); -#define LOG_DEBUG_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_DEBUG); +#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); +#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL); +#define LOG_DEBUG_ENCODE(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_DEBUG_ENCODE); +#define LOG_TIMING(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_TIMING); +#define LOG_WARNING_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_WARNING); +#define LOG_WARNING(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_WARNING); +#define LOG_ERROR(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_ERROR); /* OS X strikes again */ #undef set_key @@ -71,22 +58,24 @@ 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 f, weak_ptr j) - : _film (f) +Writer::Writer (shared_ptr film, weak_ptr j) + : _film (film) , _job (j) - , _first_nonexistant_frame (0) , _thread (0) , _finish (false) , _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) + , _repeat_written (0) , _pushed_to_disk (0) { /* Remove any old DCP */ @@ -95,62 +84,28 @@ Writer::Writer (shared_ptr f, weak_ptr j) shared_ptr job = _job.lock (); DCPOMATIC_ASSERT (job); - /* Create our picture asset in a subdirectory, named according to those - film's parameters which affect the video output. We will hard-link - it into the DCP later. - */ - - if (_film->three_d ()) { - _picture_asset.reset (new dcp::StereoPictureAsset (dcp::Fraction (_film->video_frame_rate (), 1))); - } else { - _picture_asset.reset (new dcp::MonoPictureAsset (dcp::Fraction (_film->video_frame_rate (), 1))); + 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))); } - _picture_asset->set_size (_film->frame_size ()); - - if (_film->encrypted ()) { - _picture_asset->set_key (_film->key ()); - } - - _picture_asset->set_file ( - _film->internal_video_asset_dir() / _film->internal_video_asset_filename() - ); - - job->sub (_("Checking existing image data")); - check_existing_picture_asset (); - - _picture_asset_writer = _picture_asset->start_write ( - _film->internal_video_asset_dir() / _film->internal_video_asset_filename(), - _film->interop() ? dcp::INTEROP : dcp::SMPTE, - _first_nonexistant_frame > 0 - ); - - if (_film->audio_channels ()) { - _sound_asset.reset ( - new dcp::SoundAsset (dcp::Fraction (_film->video_frame_rate(), 1), _film->audio_frame_rate (), _film->audio_channels ()) - ); - - if (_film->encrypted ()) { - _sound_asset->set_key (_film->key ()); - } - - /* Write the sound asset into the film directory so that we leave the creation - of the DCP directory until the last minute. - */ - _sound_asset_writer = _sound_asset->start_write ( - _film->directory() / audio_asset_filename (_sound_asset), - _film->interop() ? dcp::INTEROP : dcp::SMPTE - ); - } + /* We can keep track of the current audio and subtitle reels easily because audio + and subs arrive to the Writer in sequence. This is not so for video. + */ + _audio_reel = _reels.begin (); + _subtitle_reel = _reels.begin (); /* Check that the signer is OK if we need one */ - if (_film->is_signed() && !Config::instance()->signer()->valid ()) { + if (_film->is_signed() && !Config::instance()->signer_chain()->valid ()) { throw InvalidSignerError (); } +} +void +Writer::start () +{ _thread = new boost::thread (boost::bind (&Writer::thread, this)); - - job->sub (_("Encoding image data")); } Writer::~Writer () @@ -158,10 +113,16 @@ Writer::~Writer () terminate_thread (false); } +/** Pass a video frame to the writer for writing to disk at some point. + * This method can be called with frames out of order. + * @param encoded JPEG2000-encoded data. + * @param frame Frame index within the DCP. + * @param eyes Eyes that this frame image is for. + */ void -Writer::write (shared_ptr encoded, int frame, Eyes eyes) +Writer::write (Data encoded, Frame frame, Eyes eyes) { - boost::mutex::scoped_lock lock (_mutex); + boost::mutex::scoped_lock lock (_state_mutex); while (_queued_full_in_memory > _maximum_frames_in_memory) { /* The queue is too big; wait until that is sorted out */ @@ -171,7 +132,8 @@ Writer::write (shared_ptr encoded, int frame, Eyes eyes) QueueItem qi; qi.type = QueueItem::FULL; qi.encoded = encoded; - qi.frame = frame; + qi.reel = video_reel (frame); + qi.frame = frame - _reels[qi.reel].start (); if (_film->three_d() && eyes == EYES_BOTH) { /* 2D material in a 3D DCP; fake the 3D */ @@ -191,27 +153,69 @@ Writer::write (shared_ptr encoded, int frame, Eyes eyes) _empty_condition.notify_all (); } +bool +Writer::can_repeat (Frame frame) const +{ + return frame > _reels[video_reel(frame)].start(); +} + +/** Repeat the last frame that was written to a reel as a new frame. + * @param frame Frame index within the DCP of the new (repeated) frame. + * @param eyes Eyes that this repeated frame image is for. + */ void -Writer::fake_write (int frame, Eyes eyes) +Writer::repeat (Frame frame, Eyes eyes) { - boost::mutex::scoped_lock lock (_mutex); + boost::mutex::scoped_lock lock (_state_mutex); while (_queued_full_in_memory > _maximum_frames_in_memory) { /* The queue is too big; wait until that is sorted out */ _full_condition.wait (lock); } - - FILE* file = fopen_boost (_film->info_file (), "rb"); + + QueueItem qi; + qi.type = QueueItem::REPEAT; + qi.reel = video_reel (frame); + qi.frame = frame - _reels[qi.reel].start (); + if (_film->three_d() && eyes == EYES_BOTH) { + qi.eyes = EYES_LEFT; + _queue.push_back (qi); + qi.eyes = EYES_RIGHT; + _queue.push_back (qi); + } else { + qi.eyes = eyes; + _queue.push_back (qi); + } + + /* Now there's something to do: wake anything wait()ing on _empty_condition */ + _empty_condition.notify_all (); +} + +void +Writer::fake_write (Frame frame, Eyes eyes) +{ + boost::mutex::scoped_lock lock (_state_mutex); + + while (_queued_full_in_memory > _maximum_frames_in_memory) { + /* The queue is too big; wait until that is sorted out */ + _full_condition.wait (lock); + } + + size_t const reel = video_reel (frame); + Frame const reel_frame = frame - _reels[reel].start (); + + FILE* file = fopen_boost (_film->info_file(_reels[reel].period()), "rb"); if (!file) { - throw ReadFileError (_film->info_file ()); + throw ReadFileError (_film->info_file(_reels[reel].period())); } - dcp::FrameInfo info = read_frame_info (file, frame, eyes); + dcp::FrameInfo info = _reels[reel].read_frame_info (file, reel_frame, eyes); fclose (file); - + QueueItem qi; qi.type = QueueItem::FAKE; qi.size = info.size; - qi.frame = frame; + qi.reel = reel; + qi.frame = reel_frame; if (_film->three_d() && eyes == EYES_BOTH) { qi.eyes = EYES_LEFT; _queue.push_back (qi); @@ -226,12 +230,23 @@ Writer::fake_write (int frame, Eyes eyes) _empty_condition.notify_all (); } -/** This method is not thread safe */ +/** Write one video frame's worth of 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 (_sound_asset_writer) { - _sound_asset_writer->write (audio->data(), audio->frames()); + if (_audio_reel == _reels.end ()) { + /* This audio is off the end of the last reel; ignore it */ + return; + } + + _audio_reel->write (audio); + + /* 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; } } @@ -245,20 +260,23 @@ Writer::have_sequenced_image_at_queue_head () _queue.sort (); + QueueItem const & f = _queue.front(); + ReelWriter const & reel = _reels[f.reel]; + /* The queue should contain only EYES_LEFT/EYES_RIGHT pairs or EYES_BOTH */ - if (_queue.front().eyes == EYES_BOTH) { + if (f.eyes == EYES_BOTH) { /* 2D */ - return _queue.front().frame == (_last_written_frame + 1); + return f.frame == (reel.last_written_video_frame() + 1); } /* 3D */ - if (_last_written_eyes == EYES_LEFT && _queue.front().frame == _last_written_frame && _queue.front().eyes == EYES_RIGHT) { + if (reel.last_written_eyes() == EYES_LEFT && f.frame == reel.last_written_video_frame() && f.eyes == EYES_RIGHT) { return true; } - if (_last_written_eyes == EYES_RIGHT && _queue.front().frame == (_last_written_frame + 1) && _queue.front().eyes == EYES_LEFT) { + if (reel.last_written_eyes() == EYES_RIGHT && f.frame == (reel.last_written_video_frame() + 1) && f.eyes == EYES_LEFT) { return true; } @@ -271,22 +289,19 @@ try { while (true) { - boost::mutex::scoped_lock lock (_mutex); - - /* This is for debugging only */ - bool done_something = false; + boost::mutex::scoped_lock lock (_state_mutex); while (true) { - + 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; } /* Nothing to do: wait until something happens which may indicate that we do */ - LOG_TIMING (N_("writer sleeps with a queue of %1"), _queue.size()); + LOG_TIMING (N_("writer-sleep queue=%1"), _queue.size()); _empty_condition.wait (lock); - LOG_TIMING (N_("writer wakes with a queue of %1"), _queue.size()); + LOG_TIMING (N_("writer-wake queue=%1"), _queue.size()); } if (_finish && _queue.empty()) { @@ -299,24 +314,22 @@ try _finish is true). */ if (_finish && (!have_sequenced_image_at_queue_head() || _queue.empty())) { - done_something = true; /* (Hopefully temporarily) log anything that was not written */ if (!_queue.empty() && !have_sequenced_image_at_queue_head()) { 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); + } } - LOG_WARNING (N_("Last written frame %1, last written eyes %2"), _last_written_frame, _last_written_eyes); } return; } + /* Write any frames that we can write; i.e. those that are in sequence. */ while (have_sequenced_image_at_queue_head ()) { - done_something = true; QueueItem qi = _queue.front (); _queue.pop_front (); if (qi.type == QueueItem::FULL && qi.encoded) { @@ -324,48 +337,34 @@ try } lock.unlock (); + + ReelWriter& reel = _reels[qi.reel]; + switch (qi.type) { case QueueItem::FULL: - { - LOG_GENERAL (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.reset (new EncodedData (_film->j2c_path (qi.frame, qi.eyes, false))); + qi.encoded = Data (_film->j2c_path (qi.reel, qi.frame, qi.eyes, false)); } - - dcp::FrameInfo fin = _picture_asset_writer->write (qi.encoded->data(), qi.encoded->size()); - qi.encoded->write_info (_film, qi.frame, qi.eyes, fin); - _last_written[qi.eyes] = qi.encoded; + reel.write (qi.encoded, qi.frame, qi.eyes); ++_full_written; break; - } case QueueItem::FAKE: - LOG_GENERAL (N_("Writer FAKE-writes %1"), qi.frame); - _picture_asset_writer->fake_write (qi.size); - _last_written[qi.eyes].reset (); + LOG_DEBUG_ENCODE (N_("Writer FAKE-writes %1"), qi.frame); + reel.fake_write (qi.frame, qi.eyes, qi.size); ++_fake_written; break; + case QueueItem::REPEAT: + LOG_DEBUG_ENCODE (N_("Writer REPEAT-writes %1"), qi.frame); + reel.repeat_write (qi.frame, qi.eyes); + ++_repeat_written; + break; } - lock.lock (); - _last_written_frame = qi.frame; - _last_written_eyes = qi.eyes; - - shared_ptr job = _job.lock (); - DCPOMATIC_ASSERT (job); - int64_t total = _film->length().frames (_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) / total); - } + lock.lock (); } 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. */ @@ -386,27 +385,18 @@ try 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, i->frame + LOG_GENERAL ("Writer full; pushes %1 to disk", i->frame); + + i->encoded->write_via_temp ( + _film->j2c_path (i->reel, i->frame, i->eyes, true), + _film->j2c_path (i->reel, i->frame, i->eyes, false) ); - - i->encoded->write (_film, i->frame, i->eyes); - + lock.lock (); i->encoded.reset (); --_queued_full_in_memory; } - if (!done_something) { - LOG_DEBUG_NC ("Writer loop ran without doing anything"); - LOG_DEBUG ("_queued_full_in_memory=%1", _queued_full_in_memory); - LOG_DEBUG ("_queue_size=%1", _queue.size ()); - LOG_DEBUG ("_finish=%1", _finish); - LOG_DEBUG ("_last_written_frame=%1", _last_written_frame); - } - /* The queue has probably just gone down a bit; notify anything wait()ing on _full_condition */ _full_condition.notify_all (); } @@ -419,24 +409,27 @@ catch (...) void Writer::terminate_thread (bool can_throw) { - boost::mutex::scoped_lock lock (_mutex); + boost::mutex::scoped_lock lock (_state_mutex); if (_thread == 0) { return; } - + _finish = true; _empty_condition.notify_all (); _full_condition.notify_all (); lock.unlock (); - _thread->join (); + if (_thread->joinable ()) { + _thread->join (); + } + if (can_throw) { rethrow (); } - + delete _thread; _thread = 0; -} +} void Writer::finish () @@ -444,51 +437,19 @@ Writer::finish () if (!_thread) { return; } - - terminate_thread (true); - - _picture_asset_writer->finalize (); - if (_sound_asset_writer) { - _sound_asset_writer->finalize (); - } - - /* Hard-link the video asset into the DCP */ - boost::filesystem::path video_from = _picture_asset->file (); - - boost::filesystem::path video_to; - video_to /= _film->dir (_film->dcp_name()); - video_to /= video_asset_filename (_picture_asset); - - boost::system::error_code ec; - boost::filesystem::create_hard_link (video_from, video_to, ec); - if (ec) { - LOG_WARNING_NC ("Hard-link failed; copying instead"); - boost::filesystem::copy_file (video_from, video_to, ec); - if (ec) { - LOG_ERROR ("Failed to copy video file from %1 to %2 (%3)", video_from.string(), video_to.string(), ec.message ()); - throw FileError (ec.message(), video_from); - } - } - _picture_asset->set_file (video_to); + LOG_GENERAL_NC ("Terminating writer thread"); - /* Move the audio asset into the DCP */ + terminate_thread (true); - if (_sound_asset) { - boost::filesystem::path audio_to; - audio_to /= _film->dir (_film->dcp_name ()); - audio_to /= audio_asset_filename (_sound_asset); - - boost::filesystem::rename (_film->file (audio_asset_filename (_sound_asset)), audio_to, ec); - if (ec) { - throw FileError ( - String::compose (_("could not move audio asset into the DCP (%1)"), ec.value ()), audio_asset_filename (_sound_asset) - ); - } + LOG_GENERAL_NC ("Finishing ReelWriters"); - _sound_asset->set_file (audio_to); + BOOST_FOREACH (ReelWriter& i, _reels) { + i.finish (); } + LOG_GENERAL_NC ("Writing XML"); + dcp::DCP dcp (_film->dir (_film->dcp_name())); shared_ptr cpl ( @@ -497,164 +458,84 @@ Writer::finish () _film->dcp_content_type()->libdcp_kind () ) ); - + dcp.add (cpl); - shared_ptr reel (new dcp::Reel ()); + /* Calculate digests for each reel in parallel */ - shared_ptr mono = dynamic_pointer_cast (_picture_asset); - if (mono) { - reel->add (shared_ptr (new dcp::ReelMonoPictureAsset (mono, 0))); - } + shared_ptr job = _job.lock (); + job->sub (_("Computing digests")); - shared_ptr stereo = dynamic_pointer_cast (_picture_asset); - if (stereo) { - reel->add (shared_ptr (new dcp::ReelStereoPictureAsset (stereo, 0))); - } + boost::asio::io_service service; + boost::thread_group pool; - if (_sound_asset) { - reel->add (shared_ptr (new dcp::ReelSoundAsset (_sound_asset, 0))); - } + shared_ptr work (new boost::asio::io_service::work (service)); - if (_subtitle_asset) { - boost::filesystem::path const liberation = shared_path () / "LiberationSans-Regular.ttf"; + int const threads = max (1, Config::instance()->num_local_encoding_threads ()); - /* Add all the fonts to the subtitle content */ - BOOST_FOREACH (shared_ptr i, _fonts) { - _subtitle_asset->add_font (i->id, i->file.get_value_or (liberation)); - } + for (int i = 0; i < threads; ++i) { + pool.create_thread (boost::bind (&boost::asio::io_service::run, &service)); + } - _subtitle_asset->write ( - _film->dir (_film->dcp_name ()) / _subtitle_asset->id () / subtitle_content_filename (_subtitle_asset) - ); - - reel->add (shared_ptr ( - new dcp::ReelSubtitleAsset ( - _subtitle_asset, - dcp::Fraction (_film->video_frame_rate(), 1), - _picture_asset->intrinsic_duration (), - 0 - ) - )); - } - - cpl->add (reel); + 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); + work.reset (); + pool.join_all (); + service.stop (); - job->sub (_("Computing image digest")); - _picture_asset->hash (boost::bind (&Job::set_progress, job.get(), _1, false)); + /* Add reels to CPL */ - if (_sound_asset) { - job->sub (_("Computing audio digest")); - _sound_asset->hash (boost::bind (&Job::set_progress, job.get(), _1, false)); + BOOST_FOREACH (ReelWriter& i, _reels) { + cpl->add (i.create_reel (_reel_assets, _fonts)); } dcp::XMLMetadata meta; + meta.creator = Config::instance()->dcp_creator (); + if (meta.creator.empty ()) { + meta.creator = String::compose ("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit); + } meta.issuer = Config::instance()->dcp_issuer (); - meta.creator = String::compose ("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit); + if (meta.issuer.empty ()) { + meta.issuer = String::compose ("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit); + } meta.set_issue_date_now (); - shared_ptr signer; + cpl->set_metadata (meta); + + shared_ptr signer; if (_film->is_signed ()) { - signer = Config::instance()->signer (); + signer = Config::instance()->signer_chain (); /* We did check earlier, but check again here to be on the safe side */ if (!signer->valid ()) { throw InvalidSignerError (); } } - 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 pushed to disk"), _full_written, _fake_written, _pushed_to_disk + N_("Wrote %1 FULL, %2 FAKE, %3 REPEAT, %4 pushed to disk"), _full_written, _fake_written, _repeat_written, _pushed_to_disk ); } -bool -Writer::check_existing_picture_asset_frame (FILE* asset, int f, Eyes eyes) -{ - /* Read the frame info as written */ - FILE* file = fopen_boost (_film->info_file (), "rb"); - if (!file) { - LOG_GENERAL ("Existing frame %1 has no info file", f); - return false; - } - - dcp::FrameInfo info = read_frame_info (file, f, eyes); - fclose (file); - if (info.size == 0) { - LOG_GENERAL ("Existing frame %1 has no info file", f); - return false; - } - - /* Read the data from the asset and hash it */ - dcpomatic_fseek (asset, info.offset, SEEK_SET); - EncodedData data (info.size); - size_t const read = fread (data.data(), 1, data.size(), asset); - if (read != static_cast (data.size ())) { - LOG_GENERAL ("Existing frame %1 is incomplete", f); - return false; - } - - MD5Digester digester; - digester.add (data.data(), data.size()); - if (digester.get() != info.hash) { - LOG_GENERAL ("Existing frame %1 failed hash check", f); - return false; - } - - return true; -} - -void -Writer::check_existing_picture_asset () -{ - /* Try to open the existing asset */ - FILE* asset = fopen_boost (_picture_asset->file(), "rb"); - if (!asset) { - LOG_GENERAL ("Could not open existing asset at %1 (errno=%2)", _picture_asset->file().string(), errno); - return; - } - - while (true) { - - shared_ptr job = _job.lock (); - DCPOMATIC_ASSERT (job); - - job->set_progress_unknown (); - - if (_film->three_d ()) { - if (!check_existing_picture_asset_frame (asset, _first_nonexistant_frame, EYES_LEFT)) { - break; - } - if (!check_existing_picture_asset_frame (asset, _first_nonexistant_frame, EYES_RIGHT)) { - break; - } - } else { - if (!check_existing_picture_asset_frame (asset, _first_nonexistant_frame, EYES_BOTH)) { - break; - } - } - - LOG_GENERAL ("Have existing frame %1", _first_nonexistant_frame); - ++_first_nonexistant_frame; - } - - fclose (asset); -} - -/** @param frame Frame index. +/** @param frame Frame index within the whole DCP. * @return true if we can fake-write this frame. */ bool -Writer::can_fake_write (int frame) const +Writer::can_fake_write (Frame frame) const { /* We have to do a proper write of the first frame so that we can set up the JPEG2000 parameters in the asset writer. */ - return (frame != 0 && frame < _first_nonexistant_frame); + + ReelWriter const & reel = _reels[video_reel(frame)]; + + /* Make frame relative to the start of the reel */ + frame -= reel.start (); + return (frame != 0 && frame < reel.first_nonexistant_frame()); } void @@ -664,42 +545,39 @@ Writer::write (PlayerSubtitles subs) return; } - if (!_subtitle_asset) { - string lang = _film->subtitle_language (); - if (lang.empty ()) { - lang = "Unknown"; - } - if (_film->interop ()) { - shared_ptr s (new dcp::InteropSubtitleAsset ()); - s->set_movie_title (_film->name ()); - s->set_language (lang); - s->set_reel_number ("1"); - _subtitle_asset = s; - } else { - shared_ptr s (new dcp::SMPTESubtitleAsset ()); - s->set_content_title_text (_film->name ()); - s->set_language (lang); - s->set_edit_rate (dcp::Fraction (_film->video_frame_rate (), 1)); - s->set_time_code_rate (_film->video_frame_rate ()); - _subtitle_asset = s; - } - } - - for (list::const_iterator i = subs.text.begin(); i != subs.text.end(); ++i) { - _subtitle_asset->add (*i); + if (_subtitle_reel->period().to <= subs.from) { + ++_subtitle_reel; } + + _subtitle_reel->write (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 operator< (QueueItem const & a, QueueItem const & b) { + if (a.reel != b.reel) { + return a.reel < b.reel; + } + if (a.frame != b.frame) { return a.frame < b.frame; } @@ -710,11 +588,54 @@ operator< (QueueItem const & a, QueueItem const & b) bool operator== (QueueItem const & a, QueueItem const & b) { - return a.frame == b.frame && a.eyes == b.eyes; + return a.reel == b.reel && a.frame == b.frame && a.eyes == b.eyes; } void Writer::set_encoder_threads (int threads) { - _maximum_frames_in_memory = rint (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 +Writer::write (ReferencedReelAsset asset) +{ + _reel_assets.push_back (asset); +} + +size_t +Writer::video_reel (int frame) const +{ + DCPTime t = DCPTime::from_frames (frame, _film->video_frame_rate ()); + size_t i = 0; + while (i < _reels.size() && !_reels[i].period().contains (t)) { + ++i; + } + + 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 = 0; + 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); }