X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=b058c2801160d301142e00509159aa7a243b57a1;hb=71d8cf20889a3c419c9a3e485f461236e5317423;hp=558eda97e55b97222747616f5bc7b3679fd46e39;hpb=0523d4a83d7d334560d261686bdb329eea8bfb96;p=dcpomatic.git diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 558eda97e..b058c2801 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -40,11 +40,19 @@ #include "i18n.h" +#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::GENERAL); +#define LOG_TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TIMING); +#define LOG_WARNING_NC(...) _film->log()->log (__VA_ARGS__, Log::WARNING); + +/* 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::stringstream; using boost::shared_ptr; using boost::weak_ptr; @@ -85,45 +93,42 @@ Writer::Writer (shared_ptr f, weak_ptr j) } _picture_asset->set_edit_rate (_film->video_frame_rate ()); - _picture_asset->set_size (fit_ratio_within (_film->container()->ratio(), _film->full_frame ())); + _picture_asset->set_size (_film->frame_size ()); + _picture_asset->set_interop (_film->interop ()); if (_film->encrypted ()) { _picture_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. Some versions of windows inexplicably - don't like overwriting existing files here, so try to remove it using boost. - */ - boost::system::error_code ec; - boost::filesystem::remove_all (_film->file (_film->audio_mxf_filename ()), ec); - if (ec) { - _film->log()->log ( - String::compose ( - "Could not remove existing audio MXF file %1 (%2)", - _film->file (_film->audio_mxf_filename ()), - ec.value ()) - ); - } - _picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0); - _sound_asset.reset (new libdcp::SoundAsset (_film->directory (), _film->audio_mxf_filename ())); - _sound_asset->set_edit_rate (_film->video_frame_rate ()); - _sound_asset->set_channels (_film->audio_channels ()); - _sound_asset->set_sampling_rate (_film->audio_frame_rate ()); + if (_film->audio_channels ()) { + _sound_asset.reset (new libdcp::SoundAsset (_film->directory (), _film->audio_mxf_filename ())); + _sound_asset->set_edit_rate (_film->video_frame_rate ()); + _sound_asset->set_channels (_film->audio_channels ()); + _sound_asset->set_sampling_rate (_film->audio_frame_rate ()); + _sound_asset->set_interop (_film->interop ()); - if (_film->encrypted ()) { - _sound_asset->set_key (_film->key ()); + 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 (); } - - _sound_asset_writer = _sound_asset->start_write (); _thread = new boost::thread (boost::bind (&Writer::thread, this)); job->sub (_("Encoding image data")); } +Writer::~Writer () +{ + terminate_thread (false); +} + void Writer::write (shared_ptr encoded, int frame, Eyes eyes) { @@ -189,7 +194,9 @@ Writer::fake_write (int frame, Eyes eyes) void Writer::write (shared_ptr audio) { - _sound_asset_writer->write (audio->data(), audio->frames()); + if (_sound_asset) { + _sound_asset_writer->write (audio->data(), audio->frames()); + } } /** This must be called from Writer::thread() with an appropriate lock held */ @@ -236,9 +243,9 @@ try break; } - TIMING (N_("writer sleeps with a queue of %1"), _queue.size()); + LOG_TIMING (N_("writer sleeps with a queue of %1"), _queue.size()); _empty_condition.wait (lock); - TIMING (N_("writer wakes with a queue of %1"), _queue.size()); + LOG_TIMING (N_("writer wakes with a queue of %1"), _queue.size()); } if (_finish && _queue.empty()) { @@ -257,7 +264,7 @@ try switch (qi.type) { case QueueItem::FULL: { - _film->log()->log (String::compose (N_("Writer FULL-writes %1 to MXF"), qi.frame)); + LOG_GENERAL (N_("Writer FULL-writes %1 to MXF"), qi.frame); if (!qi.encoded) { qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, qi.eyes, false))); } @@ -269,14 +276,14 @@ try break; } case QueueItem::FAKE: - _film->log()->log (String::compose (N_("Writer FAKE-writes %1 to MXF"), qi.frame)); + LOG_GENERAL (N_("Writer FAKE-writes %1 to MXF"), qi.frame); _picture_asset_writer->fake_write (qi.size); _last_written[qi.eyes].reset (); ++_fake_written; break; case QueueItem::REPEAT: { - _film->log()->log (String::compose (N_("Writer REPEAT-writes %1 to MXF"), qi.frame)); + LOG_GENERAL (N_("Writer REPEAT-writes %1 to MXF"), qi.frame); libdcp::FrameInfo fin = _picture_asset_writer->write ( _last_written[qi.eyes]->data(), _last_written[qi.eyes]->size() @@ -325,11 +332,10 @@ try lock.unlock (); - _film->log()->log ( - String::compose ( - "Writer full (awaiting %1 [last eye was %2]); pushes %3 to disk", - _last_written_frame + 1, - _last_written_eyes, qi.frame) + LOG_GENERAL ( + "Writer full (awaiting %1 [last eye was %2]); pushes %3 to disk", + _last_written_frame + 1, + _last_written_eyes, qi.frame ); qi.encoded->write (_film, qi.frame, qi.eyes); @@ -347,26 +353,40 @@ catch (...) } void -Writer::finish () +Writer::terminate_thread (bool can_throw) { - if (!_thread) { + boost::mutex::scoped_lock lock (_mutex); + if (_thread == 0) { return; } - boost::mutex::scoped_lock lock (_mutex); _finish = true; _empty_condition.notify_all (); _full_condition.notify_all (); lock.unlock (); - _thread->join (); - rethrow (); + _thread->join (); + if (can_throw) { + rethrow (); + } delete _thread; _thread = 0; +} + +void +Writer::finish () +{ + if (!_thread) { + return; + } + + terminate_thread (true); _picture_asset_writer->finalize (); - _sound_asset_writer->finalize (); + if (_sound_asset_writer) { + _sound_asset_writer->finalize (); + } int const frames = _last_written_frame + 1; @@ -386,7 +406,7 @@ Writer::finish () if (ec) { /* hard link failed; copy instead */ boost::filesystem::copy_file (video_from, video_to); - _film->log()->log ("Hard-link failed; fell back to copying"); + LOG_WARNING_NC ("Hard-link failed; fell back to copying"); } /* And update the asset */ @@ -396,19 +416,21 @@ Writer::finish () /* Move the audio MXF into the DCP */ - boost::filesystem::path audio_to; - audio_to /= _film->dir (_film->dcp_name ()); - audio_to /= _film->audio_mxf_filename (); - - boost::filesystem::rename (_film->file (_film->audio_mxf_filename ()), audio_to, ec); - if (ec) { - throw FileError ( - String::compose (_("could not move audio MXF into the DCP (%1)"), ec.value ()), _film->file (_film->audio_mxf_filename ()) - ); + if (_sound_asset) { + boost::filesystem::path audio_to; + audio_to /= _film->dir (_film->dcp_name ()); + audio_to /= _film->audio_mxf_filename (); + + boost::filesystem::rename (_film->file (_film->audio_mxf_filename ()), audio_to, ec); + if (ec) { + throw FileError ( + String::compose (_("could not move audio MXF into the DCP (%1)"), ec.value ()), _film->file (_film->audio_mxf_filename ()) + ); + } + + _sound_asset->set_directory (_film->dir (_film->dcp_name ())); + _sound_asset->set_duration (frames); } - - _sound_asset->set_directory (_film->dir (_film->dcp_name ())); - _sound_asset->set_duration (frames); libdcp::DCP dcp (_film->dir (_film->dcp_name())); @@ -437,15 +459,17 @@ Writer::finish () job->sub (_("Computing image digest")); _picture_asset->compute_digest (boost::bind (&Job::set_progress, job.get(), _1, false)); - job->sub (_("Computing audio digest")); - _sound_asset->compute_digest (boost::bind (&Job::set_progress, job.get(), _1, false)); + if (_sound_asset) { + job->sub (_("Computing audio digest")); + _sound_asset->compute_digest (boost::bind (&Job::set_progress, job.get(), _1, false)); + } libdcp::XMLMetadata meta = Config::instance()->dcp_metadata (); meta.set_issue_date_now (); dcp.write_xml (_film->interop (), meta, _film->is_signed() ? make_signer () : shared_ptr ()); - _film->log()->log ( - String::compose (N_("Wrote %1 FULL, %2 FAKE, %3 REPEAT; %4 pushed to disk"), _full_written, _fake_written, _repeat_written, _pushed_to_disk) + LOG_GENERAL ( + N_("Wrote %1 FULL, %2 FAKE, %3 REPEAT; %4 pushed to disk"), _full_written, _fake_written, _repeat_written, _pushed_to_disk ); } @@ -481,14 +505,14 @@ Writer::check_existing_picture_mxf_frame (FILE* mxf, int f, Eyes eyes) /* Read the frame info as written */ FILE* ifi = fopen_boost (_film->info_path (f, eyes), "r"); if (!ifi) { - _film->log()->log (String::compose ("Existing frame %1 has no info file", f)); + LOG_GENERAL ("Existing frame %1 has no info file", f); return false; } libdcp::FrameInfo info (ifi); fclose (ifi); if (info.size == 0) { - _film->log()->log (String::compose ("Existing frame %1 has no info file", f)); + LOG_GENERAL ("Existing frame %1 has no info file", f); return false; } @@ -497,13 +521,13 @@ Writer::check_existing_picture_mxf_frame (FILE* mxf, int f, Eyes eyes) EncodedData data (info.size); size_t const read = fread (data.data(), 1, data.size(), mxf); if (read != static_cast (data.size ())) { - _film->log()->log (String::compose ("Existing frame %1 is incomplete", f)); + LOG_GENERAL ("Existing frame %1 is incomplete", f); return false; } string const existing_hash = md5_digest (data.data(), data.size()); if (existing_hash != info.hash) { - _film->log()->log (String::compose ("Existing frame %1 failed hash check", f)); + LOG_GENERAL ("Existing frame %1 failed hash check", f); return false; } @@ -519,7 +543,7 @@ Writer::check_existing_picture_mxf () p /= _film->internal_video_mxf_filename (); FILE* mxf = fopen_boost (p, "rb"); if (!mxf) { - _film->log()->log (String::compose ("Could not open existing MXF at %1 (errno=%2)", p.string(), errno)); + LOG_GENERAL ("Could not open existing MXF at %1 (errno=%2)", p.string(), errno); return; } @@ -533,7 +557,9 @@ Writer::check_existing_picture_mxf () shared_ptr job = _job.lock (); assert (job); - job->set_progress (float (_first_nonexistant_frame) / N); + if (N > 0) { + job->set_progress (float (_first_nonexistant_frame) / N); + } if (_film->three_d ()) { if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_LEFT)) { @@ -548,7 +574,7 @@ Writer::check_existing_picture_mxf () } } - _film->log()->log (String::compose ("Have existing frame %1", _first_nonexistant_frame)); + LOG_GENERAL ("Have existing frame %1", _first_nonexistant_frame); ++_first_nonexistant_frame; }