X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=60b2a47ab13b265fe1f5ca288ef576912db0ea12;hb=2d5b8cdde08044d323aa7193dfac6c9f8bca7131;hp=37376ca2309d20c5dd6b5ad1bf1e53d507b25f5e;hpb=089b90439e745a218494e76b45e7df6215af01df;p=dcpomatic.git diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 37376ca23..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,61 +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 (_film->three_d ()) { - _picture_asset.reset ( - new libdcp::StereoPictureAsset ( - _film->internal_video_mxf_dir (), - _film->internal_video_mxf_filename (), - _film->video_frame_rate (), - _film->container()->size (_film->full_frame ()) - ) - ); - + _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->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, _film->interop ()); + _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 (), - _film->video_frame_rate (), - _film->audio_channels (), - _film->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 (_film->interop ()); + _sound_asset_writer = _sound_asset->start_write (); _thread = new boost::thread (boost::bind (&Writer::thread, this)); - _job->descend (0.9); + job->sub (_("Encoding image data")); } void @@ -154,8 +141,9 @@ 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; @@ -284,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()) ); } @@ -399,21 +389,18 @@ 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 (); + shared_ptr job = _job.lock (); + assert (job); - _job->descend (0.1); - _picture_asset->compute_digest (boost::bind (&Job::set_progress, _job.get(), _1)); - _job->ascend (); + job->sub (_("Computing image digest")); + _picture_asset->compute_digest (boost::bind (&Job::set_progress, job.get(), _1, false)); - _job->descend (0.1); - _sound_asset->compute_digest (boost::bind (&Job::set_progress, _job.get(), _1)); - _job->ascend (); + 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); + 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)); } @@ -444,15 +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 ())) { @@ -482,8 +479,18 @@ 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) { + 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;