X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=8b51eb58759a1364ed9af4fc80ff388401b164e1;hp=77a6bb589183de5e159898204617eeab3b7d156c;hb=ac34066d5e448d1984d11a180be74e31b6e13b5c;hpb=ddcd4f3ba0af3e9d49dbb68127317cd0d871a248 diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 77a6bb589..8b51eb587 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2019 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + #include "writer.h" #include "compose.hpp" #include "film.h" @@ -38,8 +39,7 @@ #include "text_content.h" #include #include -#include -#include +#include #include #include #include @@ -47,21 +47,20 @@ #include "i18n.h" + /* OS X strikes again */ #undef set_key -using std::make_pair; -using std::pair; -using std::string; -using std::list; + using std::cout; -using std::map; -using std::min; +using std::dynamic_pointer_cast; +using std::make_shared; using std::max; +using std::min; +using std::shared_ptr; +using std::string; using std::vector; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::weak_ptr; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; @@ -71,37 +70,22 @@ using dcp::ArrayData; using namespace dcpomatic; -static -void -ignore_progress (float) -{ - -} - - /** @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) - , _finish (false) - , _queued_full_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 (); + auto job = _job.lock (); int reel_index = 0; - list const reels = film()->reels(); - BOOST_FOREACH (DCPTimePeriod p, reels) { + auto const reels = film()->reels(); + for (auto p: reels) { _reels.push_back (ReelWriter(weak_film, p, job, reel_index++, reels.size(), text_only)); } @@ -112,7 +96,7 @@ Writer::Writer (weak_ptr weak_film, weak_ptr j, bool text_only) */ _audio_reel = _reels.begin (); _subtitle_reel = _reels.begin (); - BOOST_FOREACH (DCPTextTrack i, film()->closed_caption_tracks()) { + for (auto i: film()->closed_caption_tracks()) { _caption_reels[i] = _reels.begin (); } _atmos_reel = _reels.begin (); @@ -124,6 +108,7 @@ Writer::Writer (weak_ptr weak_film, weak_ptr j, bool text_only) } } + void Writer::start () { @@ -135,6 +120,7 @@ Writer::start () } } + Writer::~Writer () { if (!_text_only) { @@ -142,6 +128,7 @@ Writer::~Writer () } } + /** 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. @@ -161,17 +148,17 @@ Writer::write (shared_ptr encoded, Frame frame, Eyes eyes) } QueueItem qi; - qi.type = QueueItem::FULL; + qi.type = QueueItem::Type::FULL; qi.encoded = encoded; 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; + qi.eyes = Eyes::LEFT; _queue.push_back (qi); ++_queued_full_in_memory; - qi.eyes = EYES_RIGHT; + qi.eyes = Eyes::RIGHT; _queue.push_back (qi); ++_queued_full_in_memory; } else { @@ -184,12 +171,14 @@ Writer::write (shared_ptr encoded, Frame 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. @@ -208,13 +197,13 @@ Writer::repeat (Frame frame, Eyes eyes) } QueueItem qi; - qi.type = QueueItem::REPEAT; + qi.type = QueueItem::Type::REPEAT; qi.reel = video_reel (frame); qi.frame = frame - _reels[qi.reel].start (); - if (film()->three_d() && eyes == EYES_BOTH) { - qi.eyes = EYES_LEFT; + if (film()->three_d() && eyes == Eyes::BOTH) { + qi.eyes = Eyes::LEFT; _queue.push_back (qi); - qi.eyes = EYES_RIGHT; + qi.eyes = Eyes::RIGHT; _queue.push_back (qi); } else { qi.eyes = eyes; @@ -225,6 +214,7 @@ Writer::repeat (Frame frame, Eyes eyes) _empty_condition.notify_all (); } + void Writer::fake_write (Frame frame, Eyes eyes) { @@ -242,7 +232,7 @@ Writer::fake_write (Frame frame, Eyes eyes) Frame const frame_in_reel = frame - _reels[reel].start (); QueueItem qi; - qi.type = QueueItem::FAKE; + qi.type = QueueItem::Type::FAKE; { shared_ptr info_file = film()->info_file_handle(_reels[reel].period(), true); @@ -251,10 +241,10 @@ Writer::fake_write (Frame frame, Eyes eyes) qi.reel = reel; qi.frame = frame_in_reel; - if (film()->three_d() && eyes == EYES_BOTH) { - qi.eyes = EYES_LEFT; + if (film()->three_d() && eyes == Eyes::BOTH) { + qi.eyes = Eyes::LEFT; _queue.push_back (qi); - qi.eyes = EYES_RIGHT; + qi.eyes = Eyes::RIGHT; _queue.push_back (qi); } else { qi.eyes = eyes; @@ -265,6 +255,7 @@ Writer::fake_write (Frame frame, Eyes eyes) _empty_condition.notify_all (); } + /** Write some audio frames to the DCP. * @param audio Audio data. * @param time Time of this data within the DCP. @@ -303,11 +294,14 @@ Writer::write (shared_ptr audio, DCPTime const time) end - _audio_reel->period().to }; + /* Be careful that part_lengths[0] + part_lengths[1] can't be bigger than audio->frames() */ Frame part_frames[2] = { part_lengths[0].frames_ceil(afr), - part_lengths[1].frames_ceil(afr) + part_lengths[1].frames_floor(afr) }; + DCPOMATIC_ASSERT ((part_frames[0] + part_frames[1]) <= audio->frames()); + if (part_frames[0]) { shared_ptr part (new AudioBuffers(audio, part_frames[0], 0)); _audio_reel->write (part); @@ -348,7 +342,7 @@ Writer::have_sequenced_image_at_queue_head () } _queue.sort (); - QueueItem const & f = _queue.front(); + auto const & f = _queue.front(); return _last_written[f.reel].next(f); } @@ -356,18 +350,18 @@ Writer::have_sequenced_image_at_queue_head () bool Writer::LastWritten::next (QueueItem qi) const { - if (qi.eyes == EYES_BOTH) { + if (qi.eyes == Eyes::BOTH) { /* 2D */ return qi.frame == (_frame + 1); } /* 3D */ - if (_eyes == EYES_LEFT && qi.frame == _frame && qi.eyes == EYES_RIGHT) { + if (_eyes == Eyes::LEFT && qi.frame == _frame && qi.eyes == Eyes::RIGHT) { return true; } - if (_eyes == EYES_RIGHT && qi.frame == (_frame + 1) && qi.eyes == EYES_LEFT) { + if (_eyes == Eyes::RIGHT && qi.frame == (_frame + 1) && qi.eyes == Eyes::LEFT) { return true; } @@ -387,6 +381,8 @@ void Writer::thread () try { + start_of_thread ("Writer"); + while (true) { boost::mutex::scoped_lock lock (_state_mutex); @@ -413,8 +409,8 @@ 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()); - BOOST_FOREACH (QueueItem const& i, _queue) { - if (i.type == QueueItem::FULL) { + for (auto const& i: _queue) { + if (i.type == QueueItem::Type::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); @@ -426,19 +422,19 @@ 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 (); + auto qi = _queue.front (); _last_written[qi.reel].update (qi); _queue.pop_front (); - if (qi.type == QueueItem::FULL && qi.encoded) { + if (qi.type == QueueItem::Type::FULL && qi.encoded) { --_queued_full_in_memory; } lock.unlock (); - ReelWriter& reel = _reels[qi.reel]; + auto& reel = _reels[qi.reel]; switch (qi.type) { - case QueueItem::FULL: + case QueueItem::Type::FULL: LOG_DEBUG_ENCODE (N_("Writer FULL-writes %1 (%2)"), qi.frame, (int) qi.eyes); if (!qi.encoded) { qi.encoded.reset (new ArrayData(film()->j2c_path(qi.reel, qi.frame, qi.eyes, false))); @@ -446,12 +442,12 @@ try reel.write (qi.encoded, qi.frame, qi.eyes); ++_full_written; break; - case QueueItem::FAKE: + case QueueItem::Type::FAKE: LOG_DEBUG_ENCODE (N_("Writer FAKE-writes %1"), qi.frame); reel.fake_write (qi.size); ++_fake_written; break; - case QueueItem::REPEAT: + case QueueItem::Type::REPEAT: LOG_DEBUG_ENCODE (N_("Writer REPEAT-writes %1"), qi.frame); reel.repeat_write (qi.frame, qi.eyes); ++_repeat_written; @@ -469,8 +465,8 @@ try /* Find one from the back of the queue */ _queue.sort (); - list::reverse_iterator i = _queue.rbegin (); - while (i != _queue.rend() && (i->type != QueueItem::FULL || !i->encoded)) { + auto i = _queue.rbegin (); + while (i != _queue.rend() && (i->type != QueueItem::Type::FULL || !i->encoded)) { ++i; } @@ -504,6 +500,7 @@ catch (...) store_current (); } + void Writer::terminate_thread (bool can_throw) { @@ -526,37 +523,10 @@ Writer::terminate_thread (bool can_throw) } -/** @param output_dcp Path to DCP folder to write */ void -Writer::finish (boost::filesystem::path output_dcp) +Writer::calculate_digests () { - if (_thread.joinable()) { - LOG_GENERAL_NC ("Terminating writer thread"); - terminate_thread (true); - } - - LOG_GENERAL_NC ("Finishing ReelWriters"); - - BOOST_FOREACH (ReelWriter& i, _reels) { - i.finish (output_dcp); - } - - LOG_GENERAL_NC ("Writing XML"); - - dcp::DCP dcp (output_dcp); - - shared_ptr cpl ( - new dcp::CPL ( - film()->dcp_name(), - film()->dcp_content_type()->libdcp_kind () - ) - ); - - dcp.add (cpl); - - /* Calculate digests for each reel in parallel */ - - shared_ptr job = _job.lock (); + auto job = _job.lock (); if (job) { job->sub (_("Computing digests")); } @@ -564,75 +534,135 @@ Writer::finish (boost::filesystem::path output_dcp) boost::asio::io_service service; boost::thread_group pool; - shared_ptr work (new boost::asio::io_service::work (service)); + auto work = make_shared(service); - int const threads = max (1, Config::instance()->master_encoding_threads ()); + int const threads = max (1, Config::instance()->master_encoding_threads()); for (int i = 0; i < threads; ++i) { pool.create_thread (boost::bind (&boost::asio::io_service::run, &service)); } - boost::function set_progress; + std::function set_progress; if (job) { set_progress = boost::bind (&Writer::set_digest_progress, this, job.get(), _1); } else { - set_progress = &ignore_progress; + set_progress = [](float) { + boost::this_thread::interruption_point(); + }; } - BOOST_FOREACH (ReelWriter& i, _reels) { + 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 (); + + try { + pool.join_all (); + } catch (boost::thread_interrupted) { + /* join_all was interrupted, so we need to interrupt the threads + * in our pool then try again to join them. + */ + pool.interrupt_all (); + pool.join_all (); + } + service.stop (); +} + + +/** @param output_dcp Path to DCP folder to write */ +void +Writer::finish (boost::filesystem::path output_dcp) +{ + if (_thread.joinable()) { + LOG_GENERAL_NC ("Terminating writer thread"); + terminate_thread (true); + } + + LOG_GENERAL_NC ("Finishing ReelWriters"); + + for (auto& i: _reels) { + write_hanging_text (i); + i.finish (output_dcp); + } + + LOG_GENERAL_NC ("Writing XML"); + + dcp::DCP dcp (output_dcp); + + auto cpl = make_shared( + film()->dcp_name(), + film()->dcp_content_type()->libdcp_kind(), + film()->interop() ? dcp::Standard::INTEROP : dcp::Standard::SMPTE + ); + + dcp.add (cpl); + + calculate_digests (); /* Add reels */ - BOOST_FOREACH (ReelWriter& i, _reels) { + for (auto& i: _reels) { cpl->add (i.create_reel(_reel_assets, _fonts, output_dcp, _have_subtitles, _have_closed_captions)); } /* Add metadata */ - string creator = Config::instance()->dcp_creator(); + auto creator = Config::instance()->dcp_creator(); if (creator.empty()) { creator = String::compose("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit); } - string issuer = Config::instance()->dcp_issuer(); + auto issuer = Config::instance()->dcp_issuer(); if (issuer.empty()) { issuer = String::compose("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit); } + cpl->set_creator (creator); + cpl->set_issuer (issuer); + cpl->set_ratings (film()->ratings()); vector cv; - BOOST_FOREACH (string i, film()->content_versions()) { + 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()); + if (film()->release_territory()) { + 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()); + if (film()->chain()) { + cpl->set_chain (*film()->chain()); + } + if (film()->distributor()) { + cpl->set_distributor (*film()->distributor()); + } + if (film()->facility()) { + cpl->set_facility (*film()->facility()); + } + if (film()->luminance()) { + cpl->set_luminance (*film()->luminance()); + } + if (film()->sign_language_video_language()) { + cpl->set_sign_language_video_language (*film()->sign_language_video_language()); + } - list ac = film()->mapped_audio_channels(); + auto 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; + find(ac.begin(), ac.end(), static_cast(dcp::Channel::BSL)) != ac.end() || + find(ac.begin(), ac.end(), static_cast(dcp::Channel::BSR)) != ac.end() + ) ? dcp::MCASoundField::SEVEN_POINT_ONE : dcp::MCASoundField::FIVE_POINT_ONE; dcp::MainSoundConfiguration msc (field, film()->audio_channels()); - BOOST_FOREACH (int i, ac) { - if (i < film()->audio_channels()) { + for (auto i: ac) { + if (static_cast(i) < film()->audio_channels()) { msc.set_mapping (i, static_cast(i)); } } @@ -640,15 +670,19 @@ Writer::finish (boost::filesystem::path output_dcp) 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())); + auto active_area = film()->active_area(); + if (active_area.width > 0 && active_area.height > 0) { + /* It's not allowed to have a zero active area width or height */ + cpl->set_main_picture_active_area (active_area); } - shared_ptr signer; - signer = Config::instance()->signer_chain (); + auto sl = film()->subtitle_languages().second; + if (!sl.empty()) { + cpl->set_additional_subtitle_languages(sl); + } + + auto 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)) { @@ -656,11 +690,10 @@ Writer::finish (boost::filesystem::path output_dcp) } dcp.write_xml ( - film()->interop() ? dcp::INTEROP : dcp::SMPTE, issuer, creator, dcp::LocalTime().as_string(), - String::compose("Created by libdcp %1", dcp::version), + film()->dcp_name(), signer, Config::instance()->dcp_metadata_filename_format() ); @@ -672,46 +705,53 @@ Writer::finish (boost::filesystem::path output_dcp) write_cover_sheet (output_dcp); } + void Writer::write_cover_sheet (boost::filesystem::path output_dcp) { - boost::filesystem::path const cover = film()->file("COVER_SHEET.txt"); - FILE* f = fopen_boost (cover, "w"); + auto const cover = film()->file("COVER_SHEET.txt"); + auto f = fopen_boost (cover, "w"); if (!f) { throw OpenFileError (cover, errno, OpenFileError::WRITE); } - string text = Config::instance()->cover_sheet (); + auto 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()->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"); + auto audio_language = film()->audio_language(); + if (audio_language) { + boost::algorithm::replace_all (text, "$AUDIO_LANGUAGE", audio_language->description()); } else { - boost::algorithm::replace_all (text, "$SUBTITLE_LANGUAGE", subtitle_languages.front().description()); + boost::algorithm::replace_all (text, "$AUDIO_LANGUAGE", _("None")); + } + + auto subtitle_languages = film()->subtitle_languages(); + if (subtitle_languages.first) { + boost::algorithm::replace_all (text, "$SUBTITLE_LANGUAGE", subtitle_languages.first->description()); + } else { + boost::algorithm::replace_all (text, "$SUBTITLE_LANGUAGE", _("None")); } boost::uintmax_t size = 0; for ( - boost::filesystem::recursive_directory_iterator i = boost::filesystem::recursive_directory_iterator(output_dcp); + auto i = boost::filesystem::recursive_directory_iterator(output_dcp); i != boost::filesystem::recursive_directory_iterator(); ++i) { - if (boost::filesystem::is_regular_file (i->path ())) { - size += boost::filesystem::file_size (i->path ()); + if (boost::filesystem::is_regular_file (i->path())) { + size += boost::filesystem::file_size (i->path()); } } if (size > (1000000000L)) { - boost::algorithm::replace_all (text, "$SIZE", String::compose ("%1GB", dcp::locale_convert (size / 1000000000.0, 1, true))); + boost::algorithm::replace_all (text, "$SIZE", String::compose("%1GB", dcp::locale_convert(size / 1000000000.0, 1, true))); } else { - boost::algorithm::replace_all (text, "$SIZE", String::compose ("%1MB", dcp::locale_convert (size / 1000000.0, 1, true))); + 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()); - string description = String::compose("%1.%2", ch.first, ch.second); + auto ch = audio_channel_types (film()->mapped_audio_channels(), film()->audio_channels()); + auto description = String::compose("%1.%2", ch.first, ch.second); if (description == "0.0") { description = _("None"); @@ -722,15 +762,14 @@ Writer::write_cover_sheet (boost::filesystem::path output_dcp) } boost::algorithm::replace_all (text, "$AUDIO", description); - int h, m, s, fr; - film()->length().split(film()->video_frame_rate(), h, m, s, fr); + auto const hmsf = film()->length().split(film()->video_frame_rate()); string length; - if (h == 0 && m == 0) { - length = String::compose("%1s", s); - } else if (h == 0 && m > 0) { - length = String::compose("%1m%2s", m, s); - } else if (h > 0 && m > 0) { - length = String::compose("%1h%2m%3s", h, m, s); + if (hmsf.h == 0 && hmsf.m == 0) { + length = String::compose("%1s", hmsf.s); + } else if (hmsf.h == 0 && hmsf.m > 0) { + length = String::compose("%1m%2s", hmsf.m, hmsf.s); + } else if (hmsf.h > 0 && hmsf.m > 0) { + length = String::compose("%1h%2m%3s", hmsf.h, hmsf.m, hmsf.s); } boost::algorithm::replace_all (text, "$LENGTH", length); @@ -739,6 +778,7 @@ Writer::write_cover_sheet (boost::filesystem::path output_dcp) fclose (f); } + /** @param frame Frame index within the whole DCP. * @return true if we can fake-write this frame. */ @@ -754,25 +794,26 @@ Writer::can_fake_write (Frame frame) const parameters in the asset writer. */ - ReelWriter const & reel = _reels[video_reel(frame)]; + auto 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()); } -/** @param track Closed caption track if type == TEXT_CLOSED_CAPTION */ + +/** @param track Closed caption track if type == TextType::CLOSED_CAPTION */ void Writer::write (PlayerText text, TextType type, optional track, DCPTimePeriod period) { - vector::iterator* reel = 0; + vector::iterator* reel = nullptr; switch (type) { - case TEXT_OPEN_SUBTITLE: + case TextType::OPEN_SUBTITLE: reel = &_subtitle_reel; _have_subtitles = true; break; - case TEXT_CLOSED_CAPTION: + case TextType::CLOSED_CAPTION: DCPOMATIC_ASSERT (track); DCPOMATIC_ASSERT (_caption_reels.find(*track) != _caption_reels.end()); reel = &_caption_reels[*track]; @@ -786,19 +827,43 @@ Writer::write (PlayerText text, TextType type, optional track, DCP while ((*reel)->period().to <= period.from) { ++(*reel); DCPOMATIC_ASSERT (*reel != _reels.end()); + write_hanging_text (**reel); + } + + auto back_off = [this](DCPTimePeriod period) { + period.to -= DCPTime::from_frames(2, film()->video_frame_rate()); + return period; + }; + + if (period.to > (*reel)->period().to) { + /* This text goes off the end of the reel. Store parts of it that should go into + * other reels. + */ + for (auto i = std::next(*reel); i != _reels.end(); ++i) { + auto overlap = i->period().overlap(period); + if (overlap) { + _hanging_texts.push_back (HangingText{text, type, track, back_off(*overlap)}); + } + } + /* Back off from the reel boundary by a couple of frames to avoid tripping checks + * for subtitles being too close together. + */ + period.to = (*reel)->period().to; + period = back_off(period); } (*reel)->write (text, type, track, period); } + void Writer::write (vector fonts) { /* Just keep a list of unique fonts and we'll deal with them in ::finish */ - BOOST_FOREACH (FontData const& i, fonts) { + for (auto const& i: fonts) { bool got = false; - BOOST_FOREACH (FontData const& j, _fonts) { + for (auto& j: _fonts) { if (i == j) { got = true; } @@ -810,6 +875,7 @@ Writer::write (vector fonts) } } + bool operator< (QueueItem const & a, QueueItem const & b) { @@ -824,12 +890,14 @@ operator< (QueueItem const & a, QueueItem const & b) return static_cast (a.eyes) < static_cast (b.eyes); } + bool operator== (QueueItem const & a, QueueItem const & b) { return a.reel == b.reel && a.frame == b.frame && a.eyes == b.eyes; } + void Writer::set_encoder_threads (int threads) { @@ -838,16 +906,18 @@ Writer::set_encoder_threads (int threads) _maximum_queue_size = threads * 16; } + 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()); + auto t = DCPTime::from_frames (frame, film()->video_frame_rate()); size_t i = 0; while (i < _reels.size() && !_reels[i].period().contains (t)) { ++i; @@ -857,6 +927,7 @@ Writer::video_reel (int frame) const return i; } + void Writer::set_digest_progress (Job* job, float progress) { @@ -864,27 +935,48 @@ Writer::set_digest_progress (Job* job, float progress) _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); + for (auto const& i: _digest_progresses) { + min_progress = min (min_progress, i.second); } job->set_progress (min_progress); Waker waker; waker.nudge (); + + boost::this_thread::interruption_point(); } /** Calculate hashes for any referenced MXF assets which do not already have one */ void -Writer::calculate_referenced_digests (boost::function set_progress) +Writer::calculate_referenced_digests (std::function set_progress) +try { - BOOST_FOREACH (ReferencedReelAsset 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()); + for (auto const& i: _reel_assets) { + auto file = dynamic_pointer_cast(i.asset); + if (file && !file->hash()) { + file->asset_ref().asset()->hash (set_progress); + file->set_hash (file->asset_ref().asset()->hash()); } } +} catch (boost::thread_interrupted) { + /* set_progress contains an interruption_point, so any of these methods + * may throw thread_interrupted, at which point we just give up. + */ } + +void +Writer::write_hanging_text (ReelWriter& reel) +{ + vector new_hanging_texts; + for (auto i: _hanging_texts) { + if (i.period.from == reel.period().from) { + reel.write (i.text, i.type, i.track, i.period); + } else { + new_hanging_texts.push_back (i); + } + } + _hanging_texts = new_hanging_texts; +}