X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=125efd644e857933a2bf59d1157061eec405bde8;hb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;hp=103ac2ba135b118f63d839ad80354ff44c4b688f;hpb=153e1cb890fd6b9ac4a01cd51858dee8d8e64f68;p=dcpomatic.git diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 103ac2ba1..125efd644 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -19,12 +19,16 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "writer.h" #include "compose.hpp" #include "film.h" @@ -36,19 +40,25 @@ #include "audio_mapping.h" #include "config.h" #include "job.h" +#include "cross.h" +#include "audio_buffers.h" #include "i18n.h" +/* OS X strikes again */ +#undef set_key + using std::make_pair; using std::pair; using std::string; -using std::ifstream; using std::list; using std::cout; +using std::stringstream; using boost::shared_ptr; using boost::weak_ptr; +using boost::dynamic_pointer_cast; -int const Writer::_maximum_frames_in_memory = 8; +int const Writer::_maximum_frames_in_memory = Config::instance()->num_local_encoding_threads() + 4; Writer::Writer (shared_ptr f, weak_ptr j) : _film (f) @@ -79,41 +89,53 @@ Writer::Writer (shared_ptr f, weak_ptr j) */ if (_film->three_d ()) { - _picture_asset.reset (new libdcp::StereoPictureAsset (_film->internal_video_mxf_dir (), _film->internal_video_mxf_filename ())); + _picture_mxf.reset (new dcp::StereoPictureMXF (dcp::Fraction (_film->video_frame_rate (), 1))); } else { - _picture_asset.reset (new libdcp::MonoPictureAsset (_film->internal_video_mxf_dir (), _film->internal_video_mxf_filename ())); + _picture_mxf.reset (new dcp::MonoPictureMXF (dcp::Fraction (_film->video_frame_rate (), 1))); } - _picture_asset->set_edit_rate (_film->video_frame_rate ()); - _picture_asset->set_size (fit_ratio_within (_film->container()->ratio(), _film->full_frame ())); + _picture_mxf->set_size (_film->frame_size ()); if (_film->encrypted ()) { - _picture_asset->set_key (_film->key ()); + _picture_mxf->set_key (_film->key ()); } - _picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0); - - _sound_asset.reset (new libdcp::SoundAsset (_film->dir (_film->dcp_name()), _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 ()); + _picture_mxf_writer = _picture_mxf->start_write ( + _film->internal_video_mxf_dir() / _film->internal_video_mxf_filename(), + _film->interop() ? dcp::INTEROP : dcp::SMPTE, + _first_nonexistant_frame > 0 + ); + + _sound_mxf.reset (new dcp::SoundMXF (dcp::Fraction (_film->video_frame_rate(), 1), _film->audio_frame_rate (), _film->audio_channels ())); if (_film->encrypted ()) { - _sound_asset->set_key (_film->key ()); + _sound_mxf->set_key (_film->key ()); } - _sound_asset_writer = _sound_asset->start_write (); + /* Write the sound MXF into the film directory so that we leave the creation + of the DCP directory until the last minute. + */ + _sound_mxf_writer = _sound_mxf->start_write (_film->directory() / _film->audio_mxf_filename(), _film->interop() ? dcp::INTEROP : dcp::SMPTE); _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) { boost::mutex::scoped_lock lock (_mutex); + while (_queued_full_in_memory > _maximum_frames_in_memory) { + _full_condition.wait (lock); + } + QueueItem qi; qi.type = QueueItem::FULL; qi.encoded = encoded; @@ -133,7 +155,7 @@ Writer::write (shared_ptr encoded, int frame, Eyes eyes) ++_queued_full_in_memory; } - _condition.notify_all (); + _empty_condition.notify_all (); } void @@ -141,8 +163,13 @@ Writer::fake_write (int frame, Eyes eyes) { boost::mutex::scoped_lock lock (_mutex); - ifstream ifi (_film->info_path (frame, eyes).string().c_str()); - libdcp::FrameInfo info (ifi); + while (_queued_full_in_memory > _maximum_frames_in_memory) { + _full_condition.wait (lock); + } + + FILE* ifi = fopen_boost (_film->info_path (frame, eyes), "r"); + dcp::FrameInfo info (ifi); + fclose (ifi); QueueItem qi; qi.type = QueueItem::FAKE; @@ -158,26 +185,26 @@ Writer::fake_write (int frame, Eyes eyes) _queue.push_back (qi); } - _condition.notify_all (); + _empty_condition.notify_all (); } /** This method is not thread safe */ void Writer::write (shared_ptr audio) { - _sound_asset_writer->write (audio->data(), audio->frames()); + _sound_mxf_writer->write (audio->data(), audio->frames()); } -/** This must be called from Writer::thread() with an appropriate lock held, - * and with _queue sorted. - */ +/** This must be called from Writer::thread() with an appropriate lock held */ bool -Writer::have_sequenced_image_at_queue_head () const +Writer::have_sequenced_image_at_queue_head () { if (_queue.empty ()) { return false; } + _queue.sort (); + /* The queue should contain only EYES_LEFT/EYES_RIGHT pairs or EYES_BOTH */ if (_queue.front().eyes == EYES_BOTH) { @@ -208,14 +235,12 @@ try while (1) { - _queue.sort (); - if (_finish || _queued_full_in_memory > _maximum_frames_in_memory || have_sequenced_image_at_queue_head ()) { break; } TIMING (N_("writer sleeps with a queue of %1"), _queue.size()); - _condition.wait (lock); + _empty_condition.wait (lock); TIMING (N_("writer wakes with a queue of %1"), _queue.size()); } @@ -223,7 +248,7 @@ try return; } - /* Write any frames that we can write; i.e. those that are in sequence */ + /* 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 (); _queue.pop_front (); @@ -240,7 +265,7 @@ try qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, qi.eyes, false))); } - libdcp::FrameInfo fin = _picture_asset_writer->write (qi.encoded->data(), qi.encoded->size()); + dcp::FrameInfo fin = _picture_mxf_writer->write (qi.encoded->data(), qi.encoded->size()); qi.encoded->write_info (_film, qi.frame, qi.eyes, fin); _last_written[qi.eyes] = qi.encoded; ++_full_written; @@ -248,14 +273,14 @@ try } case QueueItem::FAKE: _film->log()->log (String::compose (N_("Writer FAKE-writes %1 to MXF"), qi.frame)); - _picture_asset_writer->fake_write (qi.size); + _picture_mxf_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)); - libdcp::FrameInfo fin = _picture_asset_writer->write ( + dcp::FrameInfo fin = _picture_mxf_writer->write ( _last_written[qi.eyes]->data(), _last_written[qi.eyes]->size() ); @@ -270,12 +295,17 @@ try _last_written_frame = qi.frame; _last_written_eyes = qi.eyes; - if (_film->length()) { - shared_ptr job = _job.lock (); - assert (job); - job->set_progress ( - float (_full_written + _fake_written + _repeat_written) / _film->time_to_video_frames (_film->length()) - ); + shared_ptr job = _job.lock (); + 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 + _repeat_written) / total); } } @@ -284,7 +314,8 @@ try Write some FULL frames to disk. */ - /* Find one */ + /* 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)) { ++i; @@ -309,6 +340,8 @@ try qi.encoded.reset (); --_queued_full_in_memory; } + + _full_condition.notify_all (); } } catch (...) @@ -317,91 +350,112 @@ 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; - _condition.notify_all (); + _empty_condition.notify_all (); + _full_condition.notify_all (); lock.unlock (); - _thread->join (); - if (thrown ()) { + _thread->join (); + if (can_throw) { rethrow (); } delete _thread; _thread = 0; +} - _picture_asset_writer->finalize (); - _sound_asset_writer->finalize (); +void +Writer::finish () +{ + if (!_thread) { + return; + } - int const frames = _last_written_frame + 1; - - _picture_asset->set_duration (frames); + terminate_thread (true); + _picture_mxf_writer->finalize (); + _sound_mxf_writer->finalize (); + /* Hard-link the video MXF into the DCP */ - - boost::filesystem::path from; - from /= _film->internal_video_mxf_dir(); - from /= _film->internal_video_mxf_filename(); + boost::filesystem::path video_from; + video_from /= _film->internal_video_mxf_dir(); + video_from /= _film->internal_video_mxf_filename(); - boost::filesystem::path to; - to /= _film->dir (_film->dcp_name()); - to /= _film->video_mxf_filename (); + boost::filesystem::path video_to; + video_to /= _film->dir (_film->dcp_name()); + video_to /= _film->video_mxf_filename (); boost::system::error_code ec; - boost::filesystem::create_hard_link (from, to, ec); + boost::filesystem::create_hard_link (video_from, video_to, ec); if (ec) { /* hard link failed; copy instead */ - boost::filesystem::copy_file (from, to); + boost::filesystem::copy_file (video_from, video_to); _film->log()->log ("Hard-link failed; fell back to copying"); } - /* And update the asset */ + /* Move the audio MXF into the DCP */ - _picture_asset->set_directory (_film->dir (_film->dcp_name ())); - _picture_asset->set_file_name (_film->video_mxf_filename ()); - _sound_asset->set_duration (frames); + boost::filesystem::path audio_to; + audio_to /= _film->dir (_film->dcp_name ()); + audio_to /= _film->audio_mxf_filename (); - libdcp::DCP dcp (_film->dir (_film->dcp_name())); + 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 ()) + ); + } - shared_ptr cpl ( - new libdcp::CPL ( - _film->dir (_film->dcp_name()), + dcp::DCP dcp (_film->dir (_film->dcp_name())); + + shared_ptr cpl ( + new dcp::CPL ( _film->dcp_name(), - _film->dcp_content_type()->libdcp_kind (), - frames, - _film->video_frame_rate () + _film->dcp_content_type()->libdcp_kind () ) ); - dcp.add_cpl (cpl); + dcp.add (cpl); + + shared_ptr reel (new dcp::Reel ()); - cpl->add_reel (shared_ptr (new libdcp::Reel ( - _picture_asset, - _sound_asset, - shared_ptr () - ) - )); + shared_ptr mono = dynamic_pointer_cast (_picture_mxf); + if (mono) { + reel->add (shared_ptr (new dcp::ReelMonoPictureAsset (mono, 0))); + } + + shared_ptr stereo = dynamic_pointer_cast (_picture_mxf); + if (stereo) { + reel->add (shared_ptr (new dcp::ReelStereoPictureAsset (stereo, 0))); + } + + reel->add (shared_ptr (new dcp::ReelSoundAsset (_sound_mxf, 0))); + + cpl->add (reel); shared_ptr job = _job.lock (); assert (job); job->sub (_("Computing image digest")); - _picture_asset->compute_digest (boost::bind (&Job::set_progress, job.get(), _1, false)); + _picture_mxf->hash (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)); + _sound_mxf->hash (boost::bind (&Job::set_progress, job.get(), _1, false)); - libdcp::XMLMetadata meta = Config::instance()->dcp_metadata (); + dcp::XMLMetadata meta = Config::instance()->dcp_metadata (); meta.set_issue_date_now (); - dcp.write_xml (_film->interop (), meta, make_signer ()); + dcp.write_xml (_film->interop () ? dcp::INTEROP : dcp::SMPTE, 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)); + _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) + ); } /** Tell the writer that frame `f' should be a repeat of the frame before it */ @@ -410,6 +464,10 @@ Writer::repeat (int f, Eyes e) { boost::mutex::scoped_lock lock (_mutex); + while (_queued_full_in_memory > _maximum_frames_in_memory) { + _full_condition.wait (lock); + } + QueueItem qi; qi.type = QueueItem::REPEAT; qi.frame = f; @@ -423,26 +481,28 @@ Writer::repeat (int f, Eyes e) _queue.push_back (qi); } - _condition.notify_all (); + _empty_condition.notify_all (); } bool Writer::check_existing_picture_mxf_frame (FILE* mxf, int f, Eyes eyes) { /* Read the frame info as written */ - ifstream ifi (_film->info_path (f, eyes).string().c_str()); - libdcp::FrameInfo info (ifi); + 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)); + return false; + } + + dcp::FrameInfo info (ifi); + fclose (ifi); if (info.size == 0) { _film->log()->log (String::compose ("Existing frame %1 has no info file", f)); return false; } /* Read the data from the MXF and hash it */ -#ifdef DCPOMATIC_WINDOWS - _fseeki64 (mxf, info.offset, SEEK_SET); -#else - fseek (mxf, info.offset, SEEK_SET); -#endif + dcpomatic_fseek (mxf, info.offset, SEEK_SET); EncodedData data (info.size); size_t const read = fread (data.data(), 1, data.size(), mxf); if (read != static_cast (data.size ())) { @@ -466,7 +526,7 @@ Writer::check_existing_picture_mxf () boost::filesystem::path p; p /= _film->internal_video_mxf_dir (); p /= _film->internal_video_mxf_filename (); - FILE* mxf = fopen (p.string().c_str(), "rb"); + 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)); return; @@ -482,7 +542,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)) {