X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=8c5a8241505daacd5066332f00fcf201b7eec22b;hp=5e8f8fc9fd1935476a1a8f7238b3b4b14acf5be8;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hpb=f3d195de9fbd795f44a82c274c01891eec77a1d4 diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 5e8f8fc9f..8c5a82415 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -23,6 +23,7 @@ #include "film.h" #include "ratio.h" #include "log.h" +#include "dcpomatic_log.h" #include "dcp_video.h" #include "dcp_content_type.h" #include "audio_mapping.h" @@ -31,12 +32,13 @@ #include "cross.h" #include "audio_buffers.h" #include "version.h" -#include "font.h" +#include "font_data.h" #include "util.h" #include "reel_writer.h" +#include "text_content.h" #include #include -#include +#include #include #include #include @@ -44,14 +46,6 @@ #include "i18n.h" -#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 @@ -63,41 +57,68 @@ 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 std::vector; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; +using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::Data; +using dcp::ArrayData; +using namespace dcpomatic; + + +static +void +ignore_progress (float) +{ + +} -Writer::Writer (shared_ptr film, weak_ptr j) - : _film (film) + +/** @param j Job to report progress to, or 0. + * @param text_only true to enable only the text (subtitle/ccap) parts of the writer. + */ +Writer::Writer (weak_ptr weak_film, weak_ptr j, bool text_only) + : WeakConstFilm (weak_film) , _job (j) - , _thread (0) , _finish (false) , _queued_full_in_memory (0) - , _maximum_frames_in_memory (0) + /* These will be reset to sensible values when J2KEncoder is created */ + , _maximum_frames_in_memory (8) + , _maximum_queue_size (8) , _full_written (0) , _fake_written (0) , _repeat_written (0) , _pushed_to_disk (0) + , _text_only (text_only) + , _have_subtitles (false) { shared_ptr job = _job.lock (); - DCPOMATIC_ASSERT (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))); + list const reels = film()->reels(); + for (auto p: reels) { + _reels.push_back (ReelWriter(weak_film, p, job, reel_index++, reels.size(), text_only)); } - /* 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. + _last_written.resize (reels.size()); + + /* We can keep track of the current audio, subtitle and closed caption reels easily because audio + and captions arrive to the Writer in sequence. This is not so for video. */ _audio_reel = _reels.begin (); _subtitle_reel = _reels.begin (); + for (auto i: film()->closed_caption_tracks()) { + _caption_reels[i] = _reels.begin (); + } + _atmos_reel = _reels.begin (); - /* Check that the signer is OK if we need one */ + /* Check that the signer is OK */ string reason; - if (_film->is_signed() && !Config::instance()->signer_chain()->valid(&reason)) { + if (!Config::instance()->signer_chain()->valid(&reason)) { throw InvalidSignerError (reason); } } @@ -105,12 +126,19 @@ Writer::Writer (shared_ptr film, weak_ptr j) void Writer::start () { - _thread = new boost::thread (boost::bind (&Writer::thread, this)); + if (!_text_only) { + _thread = boost::thread (boost::bind(&Writer::thread, this)); +#ifdef DCPOMATIC_LINUX + pthread_setname_np (_thread.native_handle(), "writer"); +#endif + } } Writer::~Writer () { - terminate_thread (false); + if (!_text_only) { + terminate_thread (false); + } } /** Pass a video frame to the writer for writing to disk at some point. @@ -120,12 +148,14 @@ Writer::~Writer () * @param eyes Eyes that this frame image is for. */ void -Writer::write (Data encoded, Frame frame, Eyes eyes) +Writer::write (shared_ptr encoded, 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 */ + /* There are too many full frames in memory; wake the main writer thread and + wait until it sorts everything out */ + _empty_condition.notify_all (); _full_condition.wait (lock); } @@ -135,7 +165,7 @@ Writer::write (Data encoded, Frame frame, Eyes eyes) qi.reel = video_reel (frame); qi.frame = frame - _reels[qi.reel].start (); - if (_film->three_d() && eyes == EYES_BOTH) { + if (film()->three_d() && eyes == EYES_BOTH) { /* 2D material in a 3D DCP; fake the 3D */ qi.eyes = EYES_LEFT; _queue.push_back (qi); @@ -168,8 +198,11 @@ Writer::repeat (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 */ + while (_queue.size() > _maximum_queue_size && have_sequenced_image_at_queue_head()) { + /* The queue is too big, and the main writer thread can run and fix it, so + wake it and wait until it has done. + */ + _empty_condition.notify_all (); _full_condition.wait (lock); } @@ -177,7 +210,7 @@ Writer::repeat (Frame frame, Eyes eyes) qi.type = QueueItem::REPEAT; qi.reel = video_reel (frame); qi.frame = frame - _reels[qi.reel].start (); - if (_film->three_d() && eyes == EYES_BOTH) { + if (film()->three_d() && eyes == EYES_BOTH) { qi.eyes = EYES_LEFT; _queue.push_back (qi); qi.eyes = EYES_RIGHT; @@ -196,27 +229,28 @@ 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 */ + while (_queue.size() > _maximum_queue_size && have_sequenced_image_at_queue_head()) { + /* The queue is too big, and the main writer thread can run and fix it, so + wake it and wait until it has done. + */ + _empty_condition.notify_all (); _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(_reels[reel].period())); - } - dcp::FrameInfo info = _reels[reel].read_frame_info (file, reel_frame, eyes); - fclose (file); + Frame const frame_in_reel = frame - _reels[reel].start (); QueueItem qi; qi.type = QueueItem::FAKE; - qi.size = info.size; + + { + shared_ptr info_file = film()->info_file_handle(_reels[reel].period(), true); + qi.size = _reels[reel].read_frame_info(info_file, frame_in_reel, eyes).size; + } + qi.reel = reel; - qi.frame = reel_frame; - if (_film->three_d() && eyes == EYES_BOTH) { + qi.frame = frame_in_reel; + if (film()->three_d() && eyes == EYES_BOTH) { qi.eyes = EYES_LEFT; _queue.push_back (qi); qi.eyes = EYES_RIGHT; @@ -231,41 +265,80 @@ Writer::fake_write (Frame frame, Eyes eyes) } /** 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). + * @param audio Audio data. + * @param time Time of this data within the DCP. * This method is not thread safe. */ void -Writer::write (shared_ptr audio) +Writer::write (shared_ptr audio, DCPTime const time) { + DCPOMATIC_ASSERT (audio); + + int const afr = film()->audio_frame_rate(); + + DCPTime const end = time + DCPTime::from_frames(audio->frames(), afr); + /* The audio we get might span a reel boundary, and if so we have to write it in bits */ - int32_t offset = 0; - while (offset < audio->frames ()) { + DCPTime t = time; + while (t < end) { if (_audio_reel == _reels.end ()) { /* This audio is off the end of the last reel; ignore it */ return; } - int32_t const remaining = audio->frames() - offset; - int32_t const reel_space = _audio_reel->period().duration().frames_floor(_film->audio_frame_rate()) - _audio_reel->total_written_audio_frames(); - - if (remaining <= reel_space) { + if (end <= _audio_reel->period().to) { /* Easy case: we can write all the audio to this reel */ _audio_reel->write (audio); - offset += remaining; + t = end; + } else if (_audio_reel->period().to <= t) { + /* This reel is entirely before the start of our audio; just skip the reel */ + ++_audio_reel; } else { - /* Write the part we can */ - shared_ptr part (new AudioBuffers (audio->channels(), reel_space)); - part->copy_from (audio.get(), reel_space, offset, 0); - _audio_reel->write (part); + /* This audio is over a reel boundary; split the audio into two and write the first part */ + DCPTime part_lengths[2] = { + _audio_reel->period().to - t, + end - _audio_reel->period().to + }; + + Frame part_frames[2] = { + part_lengths[0].frames_ceil(afr), + part_lengths[1].frames_ceil(afr) + }; + + if (part_frames[0]) { + shared_ptr part (new AudioBuffers(audio, part_frames[0], 0)); + _audio_reel->write (part); + } + + if (part_frames[1]) { + audio.reset (new AudioBuffers(audio, part_frames[1], part_frames[0])); + } else { + audio.reset (); + } + ++_audio_reel; - offset += reel_space; + t += part_lengths[0]; } } } -/** This must be called from Writer::thread() with an appropriate lock held */ + +void +Writer::write (shared_ptr atmos, DCPTime time, AtmosMetadata metadata) +{ + if (_atmos_reel->period().to == time) { + ++_atmos_reel; + DCPOMATIC_ASSERT (_atmos_reel != _reels.end()); + } + + /* We assume that we get a video frame's worth of data here */ + _atmos_reel->write (atmos, metadata); +} + + +/** Caller must hold a lock on _state_mutex */ bool Writer::have_sequenced_image_at_queue_head () { @@ -274,30 +347,41 @@ Writer::have_sequenced_image_at_queue_head () } _queue.sort (); - QueueItem const & f = _queue.front(); - ReelWriter const & reel = _reels[f.reel]; + return _last_written[f.reel].next(f); +} - /* The queue should contain only EYES_LEFT/EYES_RIGHT pairs or EYES_BOTH */ - if (f.eyes == EYES_BOTH) { +bool +Writer::LastWritten::next (QueueItem qi) const +{ + if (qi.eyes == EYES_BOTH) { /* 2D */ - return f.frame == (reel.last_written_video_frame() + 1); + return qi.frame == (_frame + 1); } /* 3D */ - if (reel.last_written_eyes() == EYES_LEFT && f.frame == reel.last_written_video_frame() && f.eyes == EYES_RIGHT) { + if (_eyes == EYES_LEFT && qi.frame == _frame && qi.eyes == EYES_RIGHT) { return true; } - if (reel.last_written_eyes() == EYES_RIGHT && f.frame == (reel.last_written_video_frame() + 1) && f.eyes == EYES_LEFT) { + if (_eyes == EYES_RIGHT && qi.frame == (_frame + 1) && qi.eyes == EYES_LEFT) { return true; } return false; } + +void +Writer::LastWritten::update (QueueItem qi) +{ + _frame = qi.frame; + _eyes = qi.eyes; +} + + void Writer::thread () try @@ -319,10 +403,6 @@ try LOG_TIMING (N_("writer-wake queue=%1"), _queue.size()); } - if (_finish && _queue.empty()) { - return; - } - /* We stop here if we have been asked to finish, and if either the queue is empty or we do not have a sequenced image at its head (if this is the case we will never terminate as no new frames will be sent once @@ -332,11 +412,11 @@ try /* (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, (int) i->eyes); + for (auto const& i: _queue) { + if (i.type == QueueItem::FULL) { + 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, (int) i->eyes); + LOG_WARNING (N_("- type FAKE, size %1, frame %2, eyes %3"), i.size, i.frame, (int) i.eyes); } } } @@ -346,6 +426,7 @@ try /* Write any frames that we can write; i.e. those that are in sequence. */ while (have_sequenced_image_at_queue_head ()) { QueueItem qi = _queue.front (); + _last_written[qi.reel].update (qi); _queue.pop_front (); if (qi.type == QueueItem::FULL && qi.encoded) { --_queued_full_in_memory; @@ -359,14 +440,14 @@ try case QueueItem::FULL: 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)); + qi.encoded.reset (new ArrayData(film()->j2c_path(qi.reel, qi.frame, qi.eyes, false))); } reel.write (qi.encoded, qi.frame, qi.eyes); ++_full_written; break; case QueueItem::FAKE: LOG_DEBUG_ENCODE (N_("Writer FAKE-writes %1"), qi.frame); - reel.fake_write (qi.frame, qi.eyes, qi.size); + reel.fake_write (qi.size); ++_fake_written; break; case QueueItem::REPEAT: @@ -377,6 +458,7 @@ try } lock.lock (); + _full_condition.notify_all (); } while (_queued_full_in_memory > _maximum_frames_in_memory) { @@ -394,7 +476,7 @@ 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(); + int const awaiting = _last_written[_queue.front().reel].frame() + 1; lock.unlock (); /* i is valid here, even though we don't hold a lock on the mutex, @@ -405,17 +487,15 @@ try 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), - _film->j2c_path (i->reel, i->frame, i->eyes, false) + film()->j2c_path(i->reel, i->frame, i->eyes, true), + film()->j2c_path(i->reel, i->frame, i->eyes, false) ); lock.lock (); i->encoded.reset (); --_queued_full_in_memory; + _full_condition.notify_all (); } - - /* The queue has probably just gone down a bit; notify anything wait()ing on _full_condition */ - _full_condition.notify_all (); } } catch (...) @@ -426,53 +506,48 @@ catch (...) void Writer::terminate_thread (bool can_throw) { + boost::this_thread::disable_interruption dis; + boost::mutex::scoped_lock lock (_state_mutex); - if (_thread == 0) { - return; - } _finish = true; _empty_condition.notify_all (); _full_condition.notify_all (); lock.unlock (); - if (_thread->joinable ()) { - _thread->join (); - } + try { + _thread.join (); + } catch (...) {} if (can_throw) { rethrow (); } - - delete _thread; - _thread = 0; } + +/** @param output_dcp Path to DCP folder to write */ void -Writer::finish () +Writer::finish (boost::filesystem::path output_dcp) { - if (!_thread) { - return; + if (_thread.joinable()) { + LOG_GENERAL_NC ("Terminating writer thread"); + terminate_thread (true); } - LOG_GENERAL_NC ("Terminating writer thread"); - - terminate_thread (true); - LOG_GENERAL_NC ("Finishing ReelWriters"); - BOOST_FOREACH (ReelWriter& i, _reels) { - i.finish (); + for (auto& i: _reels) { + i.finish (output_dcp); } LOG_GENERAL_NC ("Writing XML"); - dcp::DCP dcp (_film->dir (_film->dcp_name())); + dcp::DCP dcp (output_dcp); shared_ptr cpl ( new dcp::CPL ( - _film->dcp_name(), - _film->dcp_content_type()->libdcp_kind () + film()->dcp_name(), + film()->dcp_content_type()->libdcp_kind () ) ); @@ -481,7 +556,9 @@ Writer::finish () /* Calculate digests for each reel in parallel */ shared_ptr job = _job.lock (); - job->sub (_("Computing digests")); + if (job) { + job->sub (_("Computing digests")); + } boost::asio::io_service service; boost::thread_group pool; @@ -494,73 +571,131 @@ Writer::finish () 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); + boost::function set_progress; + if (job) { + set_progress = boost::bind (&Writer::set_digest_progress, this, job.get(), _1); + } else { + set_progress = &ignore_progress; + } + + for (auto& i: _reels) { service.post (boost::bind (&ReelWriter::calculate_digests, &i, set_progress)); } + service.post (boost::bind (&Writer::calculate_referenced_digests, this, set_progress)); work.reset (); pool.join_all (); service.stop (); - /* Add reels to CPL */ + /* Add reels */ - BOOST_FOREACH (ReelWriter& i, _reels) { - cpl->add (i.create_reel (_reel_assets, _fonts)); + for (auto& i: _reels) { + cpl->add (i.create_reel(_reel_assets, _fonts, output_dcp, _have_subtitles, _have_closed_captions)); } - 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); + /* Add metadata */ + + string creator = Config::instance()->dcp_creator(); + if (creator.empty()) { + creator = String::compose("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit); } - meta.issuer = Config::instance()->dcp_issuer (); - if (meta.issuer.empty ()) { - meta.issuer = String::compose ("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit); + + string issuer = Config::instance()->dcp_issuer(); + if (issuer.empty()) { + issuer = String::compose("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit); } - meta.set_issue_date_now (); - cpl->set_metadata (meta); + cpl->set_ratings (film()->ratings()); - shared_ptr signer; - if (_film->is_signed ()) { - signer = Config::instance()->signer_chain (); - /* We did check earlier, but check again here to be on the safe side */ - string reason; - if (!signer->valid (&reason)) { - throw InvalidSignerError (reason); + vector cv; + for (auto i: film()->content_versions()) { + cv.push_back (dcp::ContentVersion(i)); + } + cpl->set_content_versions (cv); + + cpl->set_full_content_title_text (film()->name()); + cpl->set_full_content_title_text_language (film()->name_language()); + cpl->set_release_territory (film()->release_territory()); + cpl->set_version_number (film()->version_number()); + cpl->set_status (film()->status()); + cpl->set_chain (film()->chain()); + cpl->set_distributor (film()->distributor()); + cpl->set_facility (film()->facility()); + cpl->set_luminance (film()->luminance()); + + list ac = film()->mapped_audio_channels(); + dcp::MCASoundField field = ( + find(ac.begin(), ac.end(), static_cast(dcp::BSL)) != ac.end() || + find(ac.begin(), ac.end(), static_cast(dcp::BSR)) != ac.end() + ) ? dcp::SEVEN_POINT_ONE : dcp::FIVE_POINT_ONE; + + dcp::MainSoundConfiguration msc (field, film()->audio_channels()); + for (auto i: ac) { + if (i < film()->audio_channels()) { + msc.set_mapping (i, static_cast(i)); } } - dcp.write_xml (_film->interop () ? dcp::INTEROP : dcp::SMPTE, meta, signer, Config::instance()->dcp_metadata_filename_format()); + cpl->set_main_sound_configuration (msc.to_string()); + cpl->set_main_sound_sample_rate (film()->audio_frame_rate()); + cpl->set_main_picture_stored_area (film()->frame_size()); + cpl->set_main_picture_active_area (film()->active_area()); + + vector sl = film()->subtitle_languages(); + if (sl.size() > 1) { + cpl->set_additional_subtitle_languages(std::vector(sl.begin() + 1, sl.end())); + } + + shared_ptr signer; + signer = Config::instance()->signer_chain (); + /* We did check earlier, but check again here to be on the safe side */ + string reason; + if (!signer->valid (&reason)) { + throw InvalidSignerError (reason); + } + + dcp.write_xml ( + film()->interop() ? dcp::INTEROP : dcp::SMPTE, + issuer, + creator, + dcp::LocalTime().as_string(), + String::compose("Created by libdcp %1", dcp::version), + 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 ); - write_cover_sheet (); + write_cover_sheet (output_dcp); } void -Writer::write_cover_sheet () +Writer::write_cover_sheet (boost::filesystem::path output_dcp) { - boost::filesystem::path const cover = _film->file ("COVER_SHEET.txt"); + boost::filesystem::path const cover = film()->file("COVER_SHEET.txt"); FILE* f = fopen_boost (cover, "w"); if (!f) { - throw OpenFileError (cover, errno, false); + throw OpenFileError (cover, errno, OpenFileError::WRITE); } string text = Config::instance()->cover_sheet (); - boost::algorithm::replace_all (text, "$CPL_NAME", _film->name()); - boost::algorithm::replace_all (text, "$TYPE", _film->dcp_content_type()->pretty_name()); - boost::algorithm::replace_all (text, "$CONTAINER", _film->container()->nickname()); - boost::algorithm::replace_all (text, "$AUDIO_LANGUAGE", _film->isdcf_metadata().audio_language); - boost::algorithm::replace_all (text, "$SUBTITLE_LANGUAGE", _film->isdcf_metadata().subtitle_language); + boost::algorithm::replace_all (text, "$CPL_NAME", film()->name()); + boost::algorithm::replace_all (text, "$TYPE", film()->dcp_content_type()->pretty_name()); + boost::algorithm::replace_all (text, "$CONTAINER", film()->container()->container_nickname()); + boost::algorithm::replace_all (text, "$AUDIO_LANGUAGE", film()->isdcf_metadata().audio_language); + + vector subtitle_languages = film()->subtitle_languages(); + if (subtitle_languages.empty()) { + boost::algorithm::replace_all (text, "$SUBTITLE_LANGUAGE", "None"); + } else { + boost::algorithm::replace_all (text, "$SUBTITLE_LANGUAGE", subtitle_languages.front().description()); + } boost::uintmax_t size = 0; for ( - boost::filesystem::recursive_directory_iterator i = boost::filesystem::recursive_directory_iterator(_film->dir(_film->dcp_name())); + boost::filesystem::recursive_directory_iterator i = boost::filesystem::recursive_directory_iterator(output_dcp); i != boost::filesystem::recursive_directory_iterator(); ++i) { if (boost::filesystem::is_regular_file (i->path ())) { @@ -574,7 +709,7 @@ Writer::write_cover_sheet () boost::algorithm::replace_all (text, "$SIZE", String::compose ("%1MB", dcp::locale_convert (size / 1000000.0, 1, true))); } - pair ch = audio_channel_types (_film->mapped_audio_channels(), _film->audio_channels()); + pair ch = audio_channel_types (film()->mapped_audio_channels(), film()->audio_channels()); string description = String::compose("%1.%2", ch.first, ch.second); if (description == "0.0") { @@ -587,7 +722,7 @@ Writer::write_cover_sheet () boost::algorithm::replace_all (text, "$AUDIO", description); int h, m, s, fr; - _film->length().split (_film->video_frame_rate(), h, m, s, fr); + film()->length().split(film()->video_frame_rate(), h, m, s, fr); string length; if (h == 0 && m == 0) { length = String::compose("%1s", s); @@ -599,7 +734,7 @@ Writer::write_cover_sheet () boost::algorithm::replace_all (text, "$LENGTH", length); - fwrite (text.c_str(), 1, text.length(), f); + checked_fwrite (text.c_str(), text.length(), f, cover); fclose (f); } @@ -609,6 +744,11 @@ Writer::write_cover_sheet () bool Writer::can_fake_write (Frame frame) const { + if (film()->encrypted()) { + /* We need to re-write the frame because the asset ID is embedded in the HMAC... I think... */ + return false; + } + /* We have to do a proper write of the first frame so that we can set up the JPEG2000 parameters in the asset writer. */ @@ -620,29 +760,45 @@ Writer::can_fake_write (Frame frame) const return (frame != 0 && frame < reel.first_nonexistant_frame()); } +/** @param track Closed caption track if type == TEXT_CLOSED_CAPTION */ void -Writer::write (PlayerSubtitles subs, DCPTimePeriod period) +Writer::write (PlayerText text, TextType type, optional track, DCPTimePeriod period) { - if (subs.text.empty ()) { - return; - } - - if (_subtitle_reel->period().to <= period.from) { - ++_subtitle_reel; - } - - _subtitle_reel->write (subs); + vector::iterator* reel = 0; + + switch (type) { + case TEXT_OPEN_SUBTITLE: + reel = &_subtitle_reel; + _have_subtitles = true; + break; + case TEXT_CLOSED_CAPTION: + DCPOMATIC_ASSERT (track); + DCPOMATIC_ASSERT (_caption_reels.find(*track) != _caption_reels.end()); + reel = &_caption_reels[*track]; + _have_closed_captions.insert (*track); + break; + default: + DCPOMATIC_ASSERT (false); + } + + DCPOMATIC_ASSERT (*reel != _reels.end()); + while ((*reel)->period().to <= period.from) { + ++(*reel); + DCPOMATIC_ASSERT (*reel != _reels.end()); + } + + (*reel)->write (text, type, track, period); } void -Writer::write (list > fonts) +Writer::write (vector fonts) { /* Just keep a list of unique fonts and we'll deal with them in ::finish */ - BOOST_FOREACH (shared_ptr i, fonts) { + for (auto const& i: fonts) { bool got = false; - BOOST_FOREACH (shared_ptr j, _fonts) { - if (*i == *j) { + for (auto& j: _fonts) { + if (i == j) { got = true; } } @@ -676,16 +832,9 @@ operator== (QueueItem const & a, QueueItem const & b) void Writer::set_encoder_threads (int threads) { - /* 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); + boost::mutex::scoped_lock lm (_state_mutex); + _maximum_frames_in_memory = lrint (threads * Config::instance()->frames_in_memory_multiplier()); + _maximum_queue_size = threads * 16; } void @@ -697,7 +846,7 @@ Writer::write (ReferencedReelAsset asset) size_t Writer::video_reel (int frame) const { - DCPTime t = DCPTime::from_frames (frame, _film->video_frame_rate ()); + DCPTime t = DCPTime::from_frames (frame, film()->video_frame_rate()); size_t i = 0; while (i < _reels.size() && !_reels[i].period().contains (t)) { ++i; @@ -710,14 +859,31 @@ Writer::video_reel (int frame) const 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); + + _digest_progresses[boost::this_thread::get_id()] = progress; 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); + + Waker waker; + waker.nudge (); } + + +/** Calculate hashes for any referenced MXF assets which do not already have one */ +void +Writer::calculate_referenced_digests (boost::function set_progress) +{ + for (auto const& i: _reel_assets) { + shared_ptr mxf = dynamic_pointer_cast(i.asset); + if (mxf && !mxf->hash()) { + mxf->asset_ref().asset()->hash (set_progress); + mxf->set_hash (mxf->asset_ref().asset()->hash()); + } + } +} +