X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fwriter.cc;h=8863816e868b9b92a9e2b19be5fc65e6dfa7412c;hb=0cd87b0438427c02fec78c819adec96b05416d80;hp=f7665a7a7011f1a01efe0a56ac2ebbe884710bb2;hpb=469b5c52512d16bf1dade0f010bb028816d640f5;p=dcpomatic.git diff --git a/src/lib/writer.cc b/src/lib/writer.cc index f7665a7a7..8863816e8 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -23,11 +23,13 @@ #include "audio_mapping.h" #include "compose.hpp" #include "config.h" +#include "constants.h" #include "cross.h" #include "dcp_content_type.h" #include "dcp_video.h" #include "dcpomatic_log.h" #include "film.h" +#include "film_util.h" #include "job.h" #include "log.h" #include "ratio.h" @@ -70,12 +72,12 @@ using dcp::ArrayData; using namespace dcpomatic; -/** @param j Job to report progress to, or 0. +/** @param weak_job 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) +Writer::Writer(weak_ptr weak_film, weak_ptr weak_job, bool text_only) : WeakConstFilm (weak_film) - , _job (j) + , _job(weak_job) /* These will be reset to sensible values when J2KEncoder is created */ , _maximum_frames_in_memory (8) , _maximum_queue_size (8) @@ -153,19 +155,11 @@ Writer::write (shared_ptr encoded, Frame frame, Eyes eyes) 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 */ - qi.eyes = Eyes::LEFT; - _queue.push_back (qi); - ++_queued_full_in_memory; - qi.eyes = Eyes::RIGHT; - _queue.push_back (qi); - ++_queued_full_in_memory; - } else { - qi.eyes = eyes; - _queue.push_back (qi); - ++_queued_full_in_memory; - } + DCPOMATIC_ASSERT((film()->three_d() && eyes != Eyes::BOTH) || (!film()->three_d() && eyes == Eyes::BOTH)); + + qi.eyes = eyes; + _queue.push_back(qi); + ++_queued_full_in_memory; /* Now there's something to do: wake anything wait()ing on _empty_condition */ _empty_condition.notify_all (); @@ -239,17 +233,12 @@ Writer::fake_write (Frame frame, Eyes eyes) qi.size = _reels[reel].read_frame_info(info_file, frame_in_reel, eyes).size; } + DCPOMATIC_ASSERT((film()->three_d() && eyes != Eyes::BOTH) || (!film()->three_d() && eyes == Eyes::BOTH)); + qi.reel = reel; qi.frame = frame_in_reel; - 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); - } + qi.eyes = eyes; + _queue.push_back(qi); /* Now there's something to do: wake anything wait()ing on _empty_condition */ _empty_condition.notify_all (); @@ -465,12 +454,12 @@ try /* Find one from the back of the queue */ _queue.sort (); - auto i = _queue.rbegin (); - while (i != _queue.rend() && (i->type != QueueItem::Type::FULL || !i->encoded)) { - ++i; + auto item = _queue.rbegin(); + while (item != _queue.rend() && (item->type != QueueItem::Type::FULL || !item->encoded)) { + ++item; } - DCPOMATIC_ASSERT (i != _queue.rend()); + DCPOMATIC_ASSERT(item != _queue.rend()); ++_pushed_to_disk; /* For the log message below */ int const awaiting = _last_written[_queue.front().reel].frame() + 1; @@ -481,15 +470,15 @@ try thread could erase the last item in the list. */ - LOG_GENERAL ("Writer full; pushes %1 to disk while awaiting %2", i->frame, awaiting); + LOG_GENERAL("Writer full; pushes %1 to disk while awaiting %2", item->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) + item->encoded->write_via_temp( + film()->j2c_path(item->reel, item->frame, item->eyes, true), + film()->j2c_path(item->reel, item->frame, item->eyes, false) ); lock.lock (); - i->encoded.reset (); + item->encoded.reset(); --_queued_full_in_memory; _full_condition.notify_all (); } @@ -542,19 +531,32 @@ Writer::calculate_digests () pool.create_thread (boost::bind (&boost::asio::io_service::run, &service)); } - std::function set_progress; + std::function set_progress; if (job) { - set_progress = boost::bind (&Writer::set_digest_progress, this, job.get(), _1); + set_progress = boost::bind(&Writer::set_digest_progress, this, job.get(), _1, _2, _3); } else { - set_progress = [](float) { + set_progress = [](int, int64_t, int64_t) { boost::this_thread::interruption_point(); }; } + int index = 0; + for (auto& i: _reels) { - service.post (boost::bind (&ReelWriter::calculate_digests, &i, set_progress)); + service.post( + boost::bind( + &ReelWriter::calculate_digests, + &i, + std::function(boost::bind(set_progress, index, _1, _2)) + )); + ++index; } - service.post (boost::bind (&Writer::calculate_referenced_digests, this, set_progress)); + service.post( + boost::bind( + &Writer::calculate_referenced_digests, + this, + std::function(boost::bind(set_progress, index, _1, _2)) + )); work.reset (); @@ -583,9 +585,9 @@ Writer::finish (boost::filesystem::path output_dcp) LOG_GENERAL_NC ("Finishing ReelWriters"); - for (auto& i: _reels) { - write_hanging_text (i); - i.finish (output_dcp); + for (auto& reel: _reels) { + write_hanging_text(reel); + reel.finish(output_dcp); } LOG_GENERAL_NC ("Writing XML"); @@ -605,7 +607,7 @@ Writer::finish (boost::filesystem::path output_dcp) /* Add reels */ for (auto& i: _reels) { - cpl->add (i.create_reel(_reel_assets, _fonts, _chosen_interop_font, output_dcp, _have_subtitles, _have_closed_captions)); + cpl->add(i.create_reel(_reel_assets, output_dcp, _have_subtitles, _have_closed_captions)); } /* Add metadata */ @@ -627,7 +629,10 @@ Writer::finish (boost::filesystem::path output_dcp) vector cv; for (auto i: film()->content_versions()) { - cv.push_back (dcp::ContentVersion(i)); + /* Make sure we don't end up writing an empty node as some validators + * complain about that. + */ + cv.push_back(!i.empty() ? dcp::ContentVersion(i) : dcp::ContentVersion("1")); } if (cv.empty()) { cv = { dcp::ContentVersion("1") }; @@ -658,22 +663,21 @@ Writer::finish (boost::filesystem::path output_dcp) } dcp::MCASoundField field; - if (film()->audio_channels() == 2) { - field = dcp::MCASoundField::STEREO; - } else if (film()->audio_channels() <= 6) { - field = dcp::MCASoundField::FIVE_POINT_ONE; - } else { + if (channel_is_mapped(film(), dcp::Channel::BSL) || channel_is_mapped(film(), dcp::Channel::BSR)) { field = dcp::MCASoundField::SEVEN_POINT_ONE; + } else { + field = dcp::MCASoundField::FIVE_POINT_ONE; } - dcp::MainSoundConfiguration msc (field, film()->audio_channels()); + auto const audio_channels = film()->audio_channels(); + dcp::MainSoundConfiguration msc(field, audio_channels); for (auto i: film()->mapped_audio_channels()) { - if (static_cast(i) < film()->audio_channels()) { - msc.set_mapping (i, static_cast(i)); + if (i < audio_channels) { + msc.set_mapping(i, static_cast(i)); } } - cpl->set_main_sound_configuration (msc.to_string()); + cpl->set_main_sound_configuration(msc); cpl->set_main_sound_sample_rate (film()->audio_frame_rate()); cpl->set_main_picture_stored_area (film()->frame_size()); @@ -699,7 +703,7 @@ Writer::finish (boost::filesystem::path output_dcp) dcp.set_creator(creator); dcp.set_annotation_text(film()->dcp_name()); - dcp.write_xml (signer, Config::instance()->dcp_metadata_filename_format()); + dcp.write_xml(signer, !film()->limit_to_smpte_bv20(), 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 @@ -713,8 +717,8 @@ void Writer::write_cover_sheet (boost::filesystem::path output_dcp) { auto const cover = film()->file("COVER_SHEET.txt"); - dcp::File f(cover, "w"); - if (!f) { + dcp::File file(cover, "w"); + if (!file) { throw OpenFileError (cover, errno, OpenFileError::WRITE); } @@ -743,11 +747,11 @@ Writer::write_cover_sheet (boost::filesystem::path output_dcp) boost::uintmax_t size = 0; for ( - auto i = boost::filesystem::recursive_directory_iterator(output_dcp); - i != boost::filesystem::recursive_directory_iterator(); + auto i = dcp::filesystem::recursive_directory_iterator(output_dcp); + i != dcp::filesystem::recursive_directory_iterator(); ++i) { - if (boost::filesystem::is_regular_file (i->path())) { - size += boost::filesystem::file_size (i->path()); + if (dcp::filesystem::is_regular_file(i->path())) { + size += dcp::filesystem::file_size(i->path()); } } @@ -781,7 +785,7 @@ Writer::write_cover_sheet (boost::filesystem::path output_dcp) boost::algorithm::replace_all (text, "$LENGTH", length); - f.checked_write(text.c_str(), text.length()); + file.checked_write(text.c_str(), text.length()); } @@ -858,7 +862,7 @@ Writer::write (PlayerText text, TextType type, optional track, DCP period = back_off(period); } - (*reel)->write(text, type, track, period, _fonts); + (*reel)->write(text, type, track, period, _fonts, _chosen_interop_font); } @@ -884,53 +888,9 @@ Writer::write (vector> fonts) } _chosen_interop_font = fonts[0]; } else { - set used_ids; - - /* Return the index of a _N at the end of a string, or string::npos */ - auto underscore_number_position = [](string s) { - auto last_underscore = s.find_last_of("_"); - if (last_underscore == string::npos) { - return string::npos; - } - - for (auto i = last_underscore + 1; i < s.size(); ++i) { - if (!isdigit(s[i])) { - return string::npos; - } - } - - return last_underscore; - }; - - /* Write fonts to _fonts, changing any duplicate IDs so that they are unique */ for (auto font: fonts) { - auto id = fix_id(font->id()); - if (used_ids.find(id) == used_ids.end()) { - /* This ID is unique so we can just use it as-is */ - _fonts.put(font, id); - used_ids.insert(id); - } else { - auto end = underscore_number_position(id); - if (end == string::npos) { - /* This string has no _N suffix, so add one */ - id += "_0"; - end = underscore_number_position(id); - } - - ++end; - - /* Increment the suffix until we find a unique one */ - auto number = dcp::raw_convert(id.substr(end)); - while (used_ids.find(id) != used_ids.end()) { - ++number; - id = String::compose("%1_%2", id.substr(0, end - 1), number); - } - used_ids.insert(id); - } - _fonts.put(font, id); + _fonts.put(font, fix_id(font->id())); } - - DCPOMATIC_ASSERT(_fonts.map().size() == used_ids.size()); } } @@ -977,28 +937,39 @@ size_t Writer::video_reel (int frame) const { auto t = DCPTime::from_frames (frame, film()->video_frame_rate()); - size_t i = 0; - while (i < _reels.size() && !_reels[i].period().contains (t)) { - ++i; + size_t reel_index = 0; + while (reel_index < _reels.size() && !_reels[reel_index].period().contains(t)) { + ++reel_index; } - DCPOMATIC_ASSERT (i < _reels.size ()); - return i; + DCPOMATIC_ASSERT(reel_index < _reels.size ()); + return reel_index; } +/** Update job progress with information about the progress of a single digest calculation + * thread. + * @param id Unique identifier for the thread whose progress has changed. + * @param done Number of bytes that this thread has processed. + * @param size Total number of bytes that this thread must process. + */ void -Writer::set_digest_progress (Job* job, float progress) +Writer::set_digest_progress(Job* job, int id, int64_t done, int64_t size) { boost::mutex::scoped_lock lm (_digest_progresses_mutex); - _digest_progresses[boost::this_thread::get_id()] = progress; - float min_progress = FLT_MAX; + /* Update the progress for this thread */ + _digest_progresses[id] = std::make_pair(done, size); + + /* Get the total progress across all threads and use it to set job progress */ + int64_t total_done = 0; + int64_t total_size = 0; for (auto const& i: _digest_progresses) { - min_progress = min (min_progress, i.second); + total_done += i.second.first; + total_size += i.second.second; } - job->set_progress (min_progress); + job->set_progress(float(total_done) / total_size); Waker waker; waker.nudge (); @@ -1009,13 +980,27 @@ Writer::set_digest_progress (Job* job, float progress) /** Calculate hashes for any referenced MXF assets which do not already have one */ void -Writer::calculate_referenced_digests (std::function set_progress) +Writer::calculate_referenced_digests(std::function set_progress) try { + int64_t total_size = 0; + for (auto const& i: _reel_assets) { + auto file = dynamic_pointer_cast(i.asset); + if (file && !file->hash()) { + auto filename = file->asset_ref().asset()->file(); + DCPOMATIC_ASSERT(filename); + total_size += boost::filesystem::file_size(*filename); + } + } + + int64_t total_done = 0; 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->asset_ref().asset()->hash([&total_done, total_size, set_progress](int64_t done, int64_t) { + set_progress(total_done + done, total_size); + }); + total_done += boost::filesystem::file_size(*file->asset_ref().asset()->file()); file->set_hash (file->asset_ref().asset()->hash()); } } @@ -1032,7 +1017,7 @@ 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, _fonts); + reel.write(i.text, i.type, i.track, i.period, _fonts, _chosen_interop_font); } else { new_hanging_texts.push_back (i); }