X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=60b2a47ab13b265fe1f5ca288ef576912db0ea12;hb=2d5b8cdde08044d323aa7193dfac6c9f8bca7131;hp=b9c1ce2e1c7762b10ddccf20904c530237b31e3c;hpb=4eb77be6999a3758998bfe37b28d4bb1cd55d51e;p=dcpomatic.git diff --git a/src/lib/writer.cc b/src/lib/writer.cc index b9c1ce2e1..60b2a47ab 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -19,9 +19,9 @@ #include #include -#include +#include +#include #include -#include #include #include #include @@ -36,20 +36,21 @@ #include "audio_mapping.h" #include "config.h" #include "job.h" +#include "cross.h" #include "i18n.h" using std::make_pair; using std::pair; using std::string; -using std::ifstream; using std::list; using std::cout; using boost::shared_ptr; +using boost::weak_ptr; int const Writer::_maximum_frames_in_memory = 8; -Writer::Writer (shared_ptr f, shared_ptr j) +Writer::Writer (shared_ptr f, weak_ptr j) : _film (f) , _job (j) , _first_nonexistant_frame (0) @@ -65,58 +66,47 @@ Writer::Writer (shared_ptr f, shared_ptr j) { /* Remove any old DCP */ boost::filesystem::remove_all (_film->dir (_film->dcp_name ())); - + + shared_ptr job = _job.lock (); + assert (job); + + job->sub (_("Checking existing image data")); check_existing_picture_mxf (); - + /* Create our picture asset in a subdirectory, named according to those film's parameters which affect the video output. We will hard-link it into the DCP later. */ - if (f->dcp_3d ()) { - _stereo_picture_asset.reset ( - new libdcp::StereoPictureAsset ( - _film->internal_video_mxf_dir (), - _film->internal_video_mxf_filename (), - _film->dcp_video_frame_rate (), - _film->container()->size (_film->full_frame ()) - ) - ); - - _stereo_picture_asset_writer = _stereo_picture_asset->start_write (_first_nonexistant_frame > 0); - - _picture_asset = _stereo_picture_asset; - _picture_asset_writer = _stereo_picture_asset_writer; - + if (_film->three_d ()) { + _picture_asset.reset (new libdcp::StereoPictureAsset (_film->internal_video_mxf_dir (), _film->internal_video_mxf_filename ())); } else { - _mono_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 ()) - ) - ); - - _mono_picture_asset_writer = _mono_picture_asset->start_write (_first_nonexistant_frame > 0); - - _picture_asset = _mono_picture_asset; - _picture_asset_writer = _mono_picture_asset_writer; + _picture_asset.reset (new libdcp::MonoPictureAsset (_film->internal_video_mxf_dir (), _film->internal_video_mxf_filename ())); } - _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 () - ) - ); + _picture_asset->set_edit_rate (_film->video_frame_rate ()); + _picture_asset->set_size (fit_ratio_within (_film->container()->ratio(), _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 ()); + + 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->sub (_("Encoding image data")); } void @@ -129,7 +119,7 @@ Writer::write (shared_ptr encoded, int frame, Eyes eyes) qi.encoded = encoded; qi.frame = frame; - if (_film->dcp_3d() && eyes == EYES_BOTH) { + if (_film->three_d() && eyes == EYES_BOTH) { /* 2D material in a 3D DCP; fake the 3D */ qi.eyes = EYES_LEFT; _queue.push_back (qi); @@ -151,15 +141,23 @@ Writer::fake_write (int frame, Eyes eyes) { boost::mutex::scoped_lock lock (_mutex); - ifstream ifi (_film->info_path (frame, eyes).c_str()); + FILE* ifi = fopen_boost (_film->info_path (frame, eyes), "r"); libdcp::FrameInfo info (ifi); + fclose (ifi); QueueItem qi; qi.type = QueueItem::FAKE; qi.size = info.size; qi.frame = frame; - qi.eyes = eyes; - _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 (); } @@ -243,17 +241,8 @@ try qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, qi.eyes, false))); } - if (_mono_picture_asset_writer) { - libdcp::FrameInfo fin = _mono_picture_asset_writer->write (qi.encoded->data(), qi.encoded->size()); - qi.encoded->write_info (_film, qi.frame, qi.eyes, fin); - } else { - libdcp::FrameInfo fin = _stereo_picture_asset_writer->write ( - qi.encoded->data(), - qi.encoded->size(), - qi.eyes == EYES_LEFT ? libdcp::EYE_LEFT : libdcp::EYE_RIGHT - ); - qi.encoded->write_info (_film, qi.frame, qi.eyes, fin); - } + 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; @@ -267,26 +256,12 @@ try case QueueItem::REPEAT: { _film->log()->log (String::compose (N_("Writer REPEAT-writes %1 to MXF"), qi.frame)); - if (_mono_picture_asset_writer) { - - libdcp::FrameInfo fin = _mono_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); - - } else { - - libdcp::FrameInfo fin = _stereo_picture_asset_writer->write ( - _last_written[qi.eyes]->data(), - _last_written[qi.eyes]->size(), - qi.eyes == EYES_LEFT ? libdcp::EYE_LEFT : libdcp::EYE_RIGHT - ); - - _last_written[qi.eyes]->write_info (_film, qi.frame, qi.eyes, 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; } @@ -297,7 +272,9 @@ try _last_written_eyes = qi.eyes; if (_film->length()) { - _job->set_progress ( + shared_ptr job = _job.lock (); + assert (job); + job->set_progress ( float (_full_written + _fake_written + _repeat_written) / _film->time_to_video_frames (_film->length()) ); } @@ -375,7 +352,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); @@ -388,7 +365,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())); @@ -399,7 +376,7 @@ Writer::finish () _film->dcp_name(), _film->dcp_content_type()->libdcp_kind (), frames, - _film->dcp_video_frame_rate () + _film->video_frame_rate () ) ); @@ -412,9 +389,18 @@ Writer::finish () ) )); + 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)); + + 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 (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)); } @@ -428,9 +414,15 @@ Writer::repeat (int f, Eyes e) QueueItem qi; qi.type = QueueItem::REPEAT; qi.frame = f; - qi.eyes = e; - - _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 (); } @@ -439,11 +431,25 @@ 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()); + 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; + } + libdcp::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 EncodedData data (info.size); size_t const read = fread (data.data(), 1, data.size(), mxf); if (read != static_cast (data.size ())) { @@ -473,9 +479,19 @@ Writer::check_existing_picture_mxf () return; } + int N = 0; + for (boost::filesystem::directory_iterator i (_film->info_dir ()); i != boost::filesystem::directory_iterator (); ++i) { + ++N; + } + while (1) { - if (_film->dcp_3d ()) { + shared_ptr job = _job.lock (); + assert (job); + + job->set_progress (float (_first_nonexistant_frame) / N); + + if (_film->three_d ()) { if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_LEFT)) { break; } @@ -513,8 +529,8 @@ operator< (QueueItem const & a, QueueItem const & b) if (a.frame != b.frame) { return a.frame < b.frame; } - - return a.eyes == EYES_LEFT && b.eyes == EYES_RIGHT; + + return static_cast (a.eyes) < static_cast (b.eyes); } bool