X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fwriter.cc;h=40f6ed9714baacd1a2bc9bb93b813d651a48225e;hb=29a3d5d116da0626f71bf488b0408bd461327184;hp=939a2906dada778f82c8f10a7c14b1896e342d8e;hpb=63e3af4dfc0ca6492fed6e63b1253f02e9aa4621;p=dcpomatic.git diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 939a2906d..40f6ed971 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 @@ -65,51 +65,44 @@ Writer::Writer (shared_ptr f, shared_ptr j) { /* Remove any old DCP */ boost::filesystem::remove_all (_film->dir (_film->dcp_name ())); - + + _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 ()) { - _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 ()) - ) - ); - + 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 (), - _film->dcp_video_frame_rate (), - _film->container()->size (_film->full_frame ()) - ) - ); - + _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 (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->dcp_audio_mxf_filename (), - _film->dcp_video_frame_rate (), - _film->dcp_audio_channels (), - _film->dcp_audio_frame_rate () - ) - ); + _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 @@ -122,7 +115,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); @@ -144,15 +137,22 @@ Writer::fake_write (int frame, Eyes eyes) { boost::mutex::scoped_lock lock (_mutex); - ifstream ifi (_film->info_path (frame, eyes).c_str()); + ifstream ifi (_film->info_path (frame, eyes).string().c_str()); libdcp::FrameInfo info (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 (); } @@ -345,7 +345,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); @@ -358,7 +358,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())); @@ -369,7 +369,7 @@ Writer::finish () _film->dcp_name(), _film->dcp_content_type()->libdcp_kind (), frames, - _film->dcp_video_frame_rate () + _film->video_frame_rate () ) ); @@ -382,9 +382,15 @@ 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)); + 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)); } @@ -398,9 +404,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 (); } @@ -409,11 +421,19 @@ 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()); + ifstream ifi (_film->info_path (f, eyes).string().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 */ +#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 ())) { @@ -443,9 +463,16 @@ 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 ()) { + _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; } @@ -483,8 +510,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