X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=5e8fb5b7a020bdf4be553d8bb65a005e80b5ac8f;hb=5d398836a9b6acc2bbb536dabbd7bbc42a098659;hp=e9f7ab582a8ed95b489859288e46f7cb11d63478;hpb=a183c1776cfd020a37d028ebb0f641352f49697b;p=dcpomatic.git diff --git a/src/lib/writer.cc b/src/lib/writer.cc index e9f7ab582..5e8fb5b7a 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -18,9 +18,10 @@ */ #include -#include +#include +#include +#include #include -#include #include #include #include @@ -48,7 +49,7 @@ using boost::shared_ptr; int const Writer::_maximum_frames_in_memory = 8; -Writer::Writer (shared_ptr f, shared_ptr j) +Writer::Writer (shared_ptr f, shared_ptr j) : _film (f) , _job (j) , _first_nonexistant_frame (0) @@ -56,6 +57,7 @@ Writer::Writer (shared_ptr f, shared_ptr j) , _finish (false) , _queued_full_in_memory (0) , _last_written_frame (-1) + , _last_written_eyes (EYES_RIGHT) , _full_written (0) , _fake_written (0) , _repeat_written (0) @@ -70,35 +72,40 @@ Writer::Writer (shared_ptr f, shared_ptr j) film's parameters which affect the video output. We will hard-link it into the DCP later. */ - - _picture_asset.reset ( - new libdcp::MonoPictureAsset ( - _film->internal_video_mxf_dir (), - _film->internal_video_mxf_filename (), - _film->dcp_video_frame_rate (), - _film->container()->size (_film->full_frame ()) - ) - ); + if (_film->three_d ()) { + _picture_asset.reset (new libdcp::StereoPictureAsset (_film->internal_video_mxf_dir (), _film->internal_video_mxf_filename ())); + } else { + _picture_asset.reset (new libdcp::MonoPictureAsset (_film->internal_video_mxf_dir (), _film->internal_video_mxf_filename ())); + } + + _picture_asset->set_edit_rate (_film->video_frame_rate ()); + _picture_asset->set_size (_film->container()->size (_film->full_frame ())); + + if (_film->encrypted ()) { + _picture_asset->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 ()); - _sound_asset.reset ( - new libdcp::SoundAsset ( - _film->dir (_film->dcp_name()), - _film->dcp_audio_mxf_filename (), - _film->dcp_video_frame_rate (), - _film->dcp_audio_channels (), - _film->dcp_audio_frame_rate() - ) - ); + if (_film->encrypted ()) { + _sound_asset->set_key (_film->key ()); + } _sound_asset_writer = _sound_asset->start_write (); _thread = new boost::thread (boost::bind (&Writer::thread, this)); + + _job->descend (0.9); } void -Writer::write (shared_ptr encoded, int frame) +Writer::write (shared_ptr encoded, int frame, Eyes eyes) { boost::mutex::scoped_lock lock (_mutex); @@ -106,25 +113,45 @@ Writer::write (shared_ptr encoded, int frame) qi.type = QueueItem::FULL; qi.encoded = encoded; qi.frame = frame; - _queue.push_back (qi); - ++_queued_full_in_memory; + 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; + } + _condition.notify_all (); } void -Writer::fake_write (int frame) +Writer::fake_write (int frame, Eyes eyes) { boost::mutex::scoped_lock lock (_mutex); - ifstream ifi (_film->info_path (frame).c_str()); + ifstream ifi (_film->info_path (frame, eyes).c_str()); libdcp::FrameInfo info (ifi); QueueItem qi; qi.type = QueueItem::FAKE; qi.size = info.size; qi.frame = frame; - _queue.push_back (qi); + 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); + } _condition.notify_all (); } @@ -133,10 +160,39 @@ Writer::fake_write (int frame) void Writer::write (shared_ptr audio) { - cout << "W: audio " << audio->frames() << "\n"; _sound_asset_writer->write (audio->data(), audio->frames()); } +/** This must be called from Writer::thread() with an appropriate lock held, + * and with _queue sorted. + */ +bool +Writer::have_sequenced_image_at_queue_head () const +{ + if (_queue.empty ()) { + return false; + } + + /* The queue should contain only EYES_LEFT/EYES_RIGHT pairs or EYES_BOTH */ + + if (_queue.front().eyes == EYES_BOTH) { + /* 2D */ + return _queue.front().frame == (_last_written_frame + 1); + } + + /* 3D */ + + if (_last_written_eyes == EYES_LEFT && _queue.front().frame == _last_written_frame && _queue.front().eyes == EYES_RIGHT) { + return true; + } + + if (_last_written_eyes == EYES_RIGHT && _queue.front().frame == (_last_written_frame + 1) && _queue.front().eyes == EYES_LEFT) { + return true; + } + + return false; +} + void Writer::thread () try @@ -149,13 +205,10 @@ try _queue.sort (); - if (_finish || - _queued_full_in_memory > _maximum_frames_in_memory || - (!_queue.empty() && _queue.front().frame == (_last_written_frame + 1))) { - + 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); TIMING (N_("writer wakes with a queue of %1"), _queue.size()); @@ -166,7 +219,7 @@ try } /* Write any frames that we can write; i.e. those that are in sequence */ - while (!_queue.empty() && _queue.front().frame == (_last_written_frame + 1)) { + while (have_sequenced_image_at_queue_head ()) { QueueItem qi = _queue.front (); _queue.pop_front (); if (qi.type == QueueItem::FULL && qi.encoded) { @@ -179,36 +232,44 @@ try { _film->log()->log (String::compose (N_("Writer FULL-writes %1 to MXF"), qi.frame)); if (!qi.encoded) { - qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, false))); + qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, qi.eyes, false))); } - libdcp::FrameInfo const fin = _picture_asset_writer->write (qi.encoded->data(), qi.encoded->size()); - qi.encoded->write_info (_film, qi.frame, fin); - _last_written = qi.encoded; + + libdcp::FrameInfo fin = _picture_asset_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; break; } case QueueItem::FAKE: _film->log()->log (String::compose (N_("Writer FAKE-writes %1 to MXF"), qi.frame)); _picture_asset_writer->fake_write (qi.size); - _last_written.reset (); + _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 const fin = _picture_asset_writer->write (_last_written->data(), _last_written->size()); - _last_written->write_info (_film, qi.frame, fin); + libdcp::FrameInfo fin = _picture_asset_writer->write ( + _last_written[qi.eyes]->data(), + _last_written[qi.eyes]->size() + ); + + _last_written[qi.eyes]->write_info (_film, qi.frame, qi.eyes, fin); ++_repeat_written; break; } } lock.lock (); + + _last_written_frame = qi.frame; + _last_written_eyes = qi.eyes; - if (_film->length ()) { - _job->set_progress (float(_full_written + _fake_written + _repeat_written) / _film->time_to_video_frames (_film->length())); + if (_film->length()) { + _job->set_progress ( + float (_full_written + _fake_written + _repeat_written) / _film->time_to_video_frames (_film->length()) + ); } - - ++_last_written_frame; } while (_queued_full_in_memory > _maximum_frames_in_memory) { @@ -228,8 +289,15 @@ try ++_pushed_to_disk; lock.unlock (); - _film->log()->log (String::compose (N_("Writer full (awaiting %1); pushes %2 to disk"), _last_written_frame + 1, qi.frame)); - qi.encoded->write (_film, qi.frame); + + _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) + ); + + qi.encoded->write (_film, qi.frame, qi.eyes); lock.lock (); qi.encoded.reset (); --_queued_full_in_memory; @@ -265,7 +333,7 @@ Writer::finish () _sound_asset_writer->finalize (); int const frames = _last_written_frame + 1; - + _picture_asset->set_duration (frames); /* Hard-link the video MXF into the DCP */ @@ -276,7 +344,7 @@ Writer::finish () boost::filesystem::path to; to /= _film->dir (_film->dcp_name()); - to /= _film->dcp_video_mxf_filename (); + to /= _film->video_mxf_filename (); boost::system::error_code ec; boost::filesystem::create_hard_link (from, to, ec); @@ -289,7 +357,7 @@ Writer::finish () /* And update the asset */ _picture_asset->set_directory (_film->dir (_film->dcp_name ())); - _picture_asset->set_file_name (_film->dcp_video_mxf_filename ()); + _picture_asset->set_file_name (_film->video_mxf_filename ()); _sound_asset->set_duration (frames); libdcp::DCP dcp (_film->dir (_film->dcp_name())); @@ -300,7 +368,7 @@ Writer::finish () _film->dcp_name(), _film->dcp_content_type()->libdcp_kind (), frames, - _film->dcp_video_frame_rate () + _film->video_frame_rate () ) ); @@ -313,28 +381,75 @@ Writer::finish () ) )); + /* Compute the digests for the assets now so that we can keep track of progress. + We did _job->descend (0.9) in our constructor */ + _job->ascend (); + + _job->descend (0.1); + _picture_asset->compute_digest (boost::bind (&Job::set_progress, _job.get(), _1)); + _job->ascend (); + + _job->descend (0.1); + _sound_asset->compute_digest (boost::bind (&Job::set_progress, _job.get(), _1)); + _job->ascend (); + libdcp::XMLMetadata meta = Config::instance()->dcp_metadata (); meta.set_issue_date_now (); - dcp.write_xml (meta); + dcp.write_xml (_film->interop (), meta, make_signer ()); _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 */ void -Writer::repeat (int f) +Writer::repeat (int f, Eyes e) { boost::mutex::scoped_lock lock (_mutex); QueueItem qi; qi.type = QueueItem::REPEAT; qi.frame = f; - - _queue.push_back (qi); + if (_film->three_d() && e == EYES_BOTH) { + qi.eyes = EYES_LEFT; + _queue.push_back (qi); + qi.eyes = EYES_RIGHT; + _queue.push_back (qi); + } else { + qi.eyes = e; + _queue.push_back (qi); + } _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).c_str()); + libdcp::FrameInfo info (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 */ + 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 ())) { + _film->log()->log (String::compose ("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)); + return false; + } + + return true; +} void Writer::check_existing_picture_mxf () @@ -343,29 +458,28 @@ 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(), N_("rb")); + FILE* mxf = fopen (p.string().c_str(), "rb"); if (!mxf) { + _film->log()->log (String::compose ("Could not open existing MXF at %1 (errno=%2)", p.string(), errno)); return; } while (1) { - /* Read the frame info as written */ - ifstream ifi (_film->info_path (_first_nonexistant_frame).c_str()); - libdcp::FrameInfo info (ifi); - - /* Read the data from the MXF and hash it */ - fseek (mxf, info.offset, SEEK_SET); - EncodedData data (info.size); - fread (data.data(), 1, data.size(), mxf); - string const existing_hash = md5_digest (data.data(), data.size()); - - if (existing_hash != info.hash) { - _film->log()->log (String::compose (N_("Existing frame %1 failed hash check"), _first_nonexistant_frame)); - break; + if (_film->three_d ()) { + if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_LEFT)) { + break; + } + if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_RIGHT)) { + break; + } + } else { + if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_BOTH)) { + break; + } } - _film->log()->log (String::compose (N_("Have existing frame %1"), _first_nonexistant_frame)); + _film->log()->log (String::compose ("Have existing frame %1", _first_nonexistant_frame)); ++_first_nonexistant_frame; } @@ -387,11 +501,15 @@ Writer::can_fake_write (int frame) const bool operator< (QueueItem const & a, QueueItem const & b) { - return a.frame < b.frame; + if (a.frame != b.frame) { + return a.frame < b.frame; + } + + return static_cast (a.eyes) < static_cast (b.eyes); } bool operator== (QueueItem const & a, QueueItem const & b) { - return a.frame == b.frame; + return a.frame == b.frame && a.eyes == b.eyes; }