X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=1cc8ad3ccc87ac857940e9880d1f14af68bd2731;hb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;hp=1a11a482bf0b0155d948848474e5cc18333b0296;hpb=6f0a590bc3266f21ba577116219bd019e891d480;p=dcpomatic.git diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 1a11a482b..1cc8ad3cc 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -30,13 +30,14 @@ #include "cross.h" #include "audio_buffers.h" #include "md5_digester.h" -#include "encoded_data.h" +#include "data.h" #include "version.h" #include "font.h" -#include -#include -#include -#include +#include "util.h" +#include +#include +#include +#include #include #include #include @@ -44,22 +45,23 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include +#include #include "i18n.h" #define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); +#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_GENERAL); +#define LOG_DEBUG_ENCODE(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_DEBUG_ENCODE); #define LOG_TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TYPE_TIMING); #define LOG_WARNING_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_WARNING); #define LOG_WARNING(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_WARNING); #define LOG_ERROR(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_ERROR); -#define LOG_DEBUG(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_DEBUG); -#define LOG_DEBUG_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_DEBUG); /* OS X strikes again */ #undef set_key @@ -73,8 +75,10 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; -Writer::Writer (shared_ptr f, weak_ptr j) - : _film (f) +int const Writer::_info_size = 48; + +Writer::Writer (shared_ptr film, weak_ptr j) + : _film (film) , _job (j) , _first_nonexistant_frame (0) , _thread (0) @@ -82,8 +86,10 @@ Writer::Writer (shared_ptr f, weak_ptr j) , _queued_full_in_memory (0) , _last_written_frame (-1) , _last_written_eyes (EYES_RIGHT) + , _maximum_frames_in_memory (0) , _full_written (0) , _fake_written (0) + , _repeat_written (0) , _pushed_to_disk (0) { /* Remove any old DCP */ @@ -98,60 +104,73 @@ Writer::Writer (shared_ptr f, weak_ptr j) */ if (_film->three_d ()) { - _picture_mxf.reset (new dcp::StereoPictureMXF (dcp::Fraction (_film->video_frame_rate (), 1))); + _picture_asset.reset (new dcp::StereoPictureAsset (dcp::Fraction (_film->video_frame_rate (), 1))); } else { - _picture_mxf.reset (new dcp::MonoPictureMXF (dcp::Fraction (_film->video_frame_rate (), 1))); + _picture_asset.reset (new dcp::MonoPictureAsset (dcp::Fraction (_film->video_frame_rate (), 1))); } - job->sub (_("Checking existing image data")); - check_existing_picture_mxf (); - - _picture_mxf->set_size (_film->frame_size ()); + _picture_asset->set_size (_film->frame_size ()); if (_film->encrypted ()) { - _picture_mxf->set_key (_film->key ()); + _picture_asset->set_key (_film->key ()); } - - _picture_mxf_writer = _picture_mxf->start_write ( - _film->internal_video_mxf_dir() / _film->internal_video_mxf_filename(), + + _picture_asset->set_file ( + _film->internal_video_asset_dir() / _film->internal_video_asset_filename() + ); + + job->sub (_("Checking existing image data")); + check_existing_picture_asset (); + + _picture_asset_writer = _picture_asset->start_write ( + _film->internal_video_asset_dir() / _film->internal_video_asset_filename(), _film->interop() ? dcp::INTEROP : dcp::SMPTE, _first_nonexistant_frame > 0 ); if (_film->audio_channels ()) { - _sound_mxf.reset (new dcp::SoundMXF (dcp::Fraction (_film->video_frame_rate(), 1), _film->audio_frame_rate (), _film->audio_channels ())); + _sound_asset.reset ( + new dcp::SoundAsset (dcp::Fraction (_film->video_frame_rate(), 1), _film->audio_frame_rate (), _film->audio_channels ()) + ); if (_film->encrypted ()) { - _sound_mxf->set_key (_film->key ()); + _sound_asset->set_key (_film->key ()); } - - /* Write the sound MXF into the film directory so that we leave the creation + + /* Write the sound asset 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); + _sound_asset_writer = _sound_asset->start_write ( + _film->directory() / audio_asset_filename (_sound_asset), + _film->interop() ? dcp::INTEROP : dcp::SMPTE + ); } /* Check that the signer is OK if we need one */ - if (_film->is_signed() && !Config::instance()->signer()->valid ()) { + if (_film->is_signed() && !Config::instance()->signer_chain()->valid ()) { throw InvalidSignerError (); } - _thread = new boost::thread (boost::bind (&Writer::thread, this)); - job->sub (_("Encoding image data")); } +void +Writer::start () +{ + _thread = new boost::thread (boost::bind (&Writer::thread, this)); +} + Writer::~Writer () { terminate_thread (false); } void -Writer::write (shared_ptr encoded, int frame, Eyes eyes) +Writer::write (Data encoded, int frame, Eyes eyes) { - boost::mutex::scoped_lock lock (_mutex); + boost::mutex::scoped_lock lock (_state_mutex); - while (_queued_full_in_memory > maximum_frames_in_memory ()) { + while (_queued_full_in_memory > _maximum_frames_in_memory) { /* The queue is too big; wait until that is sorted out */ _full_condition.wait (lock); } @@ -179,23 +198,50 @@ Writer::write (shared_ptr encoded, int frame, Eyes eyes) _empty_condition.notify_all (); } +void +Writer::repeat (int frame, Eyes eyes) +{ + boost::mutex::scoped_lock lock (_state_mutex); + + while (_queued_full_in_memory > _maximum_frames_in_memory) { + /* The queue is too big; wait until that is sorted out */ + _full_condition.wait (lock); + } + + QueueItem qi; + qi.type = QueueItem::REPEAT; + qi.frame = frame; + 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); + } + + /* Now there's something to do: wake anything wait()ing on _empty_condition */ + _empty_condition.notify_all (); +} + void Writer::fake_write (int frame, Eyes eyes) { - boost::mutex::scoped_lock lock (_mutex); + boost::mutex::scoped_lock lock (_state_mutex); - while (_queued_full_in_memory > maximum_frames_in_memory ()) { + while (_queued_full_in_memory > _maximum_frames_in_memory) { /* The queue is too big; wait until that is sorted out */ _full_condition.wait (lock); } - + FILE* file = fopen_boost (_film->info_file (), "rb"); if (!file) { throw ReadFileError (_film->info_file ()); } dcp::FrameInfo info = read_frame_info (file, frame, eyes); fclose (file); - + QueueItem qi; qi.type = QueueItem::FAKE; qi.size = info.size; @@ -218,8 +264,8 @@ Writer::fake_write (int frame, Eyes eyes) void Writer::write (shared_ptr audio) { - if (_sound_mxf_writer) { - _sound_mxf_writer->write (audio->data(), audio->frames()); + if (_sound_asset_writer) { + _sound_asset_writer->write (audio->data(), audio->frames()); } } @@ -253,28 +299,44 @@ Writer::have_sequenced_image_at_queue_head () return false; } +void +Writer::write_frame_info (int frame, Eyes eyes, dcp::FrameInfo info) const +{ + FILE* file = 0; + if (boost::filesystem::exists (_film->info_file ())) { + file = fopen_boost (_film->info_file(), "r+b"); + } else { + file = fopen_boost (_film->info_file(), "wb"); + } + if (!file) { + throw OpenFileError (_film->info_file ()); + } + dcpomatic_fseek (file, frame_info_position (frame, eyes), SEEK_SET); + fwrite (&info.offset, sizeof (info.offset), 1, file); + fwrite (&info.size, sizeof (info.size), 1, file); + fwrite (info.hash.c_str(), 1, info.hash.size(), file); + fclose (file); +} + void Writer::thread () try { while (true) { - boost::mutex::scoped_lock lock (_mutex); - - /* This is for debugging only */ - bool done_something = false; + boost::mutex::scoped_lock lock (_state_mutex); while (true) { - - if (_finish || _queued_full_in_memory > maximum_frames_in_memory () || have_sequenced_image_at_queue_head ()) { + + if (_finish || _queued_full_in_memory > _maximum_frames_in_memory || have_sequenced_image_at_queue_head ()) { /* We've got something to do: go and do it */ break; } /* Nothing to do: wait until something happens which may indicate that we do */ - LOG_TIMING (N_("writer sleeps with a queue of %1"), _queue.size()); + LOG_TIMING (N_("writer-sleep queue=%1"), _queue.size()); _empty_condition.wait (lock); - LOG_TIMING (N_("writer wakes with a queue of %1"), _queue.size()); + LOG_TIMING (N_("writer-wake queue=%1"), _queue.size()); } if (_finish && _queue.empty()) { @@ -287,7 +349,6 @@ try _finish is true). */ if (_finish && (!have_sequenced_image_at_queue_head() || _queue.empty())) { - done_something = true; /* (Hopefully temporarily) log anything that was not written */ if (!_queue.empty() && !have_sequenced_image_at_queue_head()) { LOG_WARNING (N_("Finishing writer with a left-over queue of %1:"), _queue.size()); @@ -296,7 +357,7 @@ try LOG_WARNING (N_("- type FULL, frame %1, eyes %2"), i->frame, i->eyes); } else { LOG_WARNING (N_("- type FAKE, size %1, frame %2, eyes %3"), i->size, i->frame, i->eyes); - } + } } LOG_WARNING (N_("Last written frame %1, last written eyes %2"), _last_written_frame, _last_written_eyes); } @@ -304,7 +365,6 @@ try } /* Write any frames that we can write; i.e. those that are in sequence. */ while (have_sequenced_image_at_queue_head ()) { - done_something = true; QueueItem qi = _queue.front (); _queue.pop_front (); if (qi.type == QueueItem::FULL && qi.encoded) { @@ -315,32 +375,41 @@ try switch (qi.type) { case QueueItem::FULL: { - LOG_GENERAL (N_("Writer FULL-writes %1 to MXF"), qi.frame); + LOG_DEBUG_ENCODE (N_("Writer FULL-writes %1 (%2)"), qi.frame, qi.eyes); if (!qi.encoded) { - qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, qi.eyes, false))); + qi.encoded = Data (_film->j2c_path (qi.frame, qi.eyes, false)); } - dcp::FrameInfo fin = _picture_mxf_writer->write (qi.encoded->data(), qi.encoded->size()); - qi.encoded->write_info (_film, qi.frame, qi.eyes, fin); + dcp::FrameInfo fin = _picture_asset_writer->write (qi.encoded->data().get (), qi.encoded->size()); + write_frame_info (qi.frame, qi.eyes, fin); _last_written[qi.eyes] = qi.encoded; ++_full_written; break; } case QueueItem::FAKE: - LOG_GENERAL (N_("Writer FAKE-writes %1 to MXF"), qi.frame); - _picture_mxf_writer->fake_write (qi.size); + LOG_DEBUG_ENCODE (N_("Writer FAKE-writes %1"), qi.frame); + _picture_asset_writer->fake_write (qi.size); _last_written[qi.eyes].reset (); ++_fake_written; break; + case QueueItem::REPEAT: + LOG_DEBUG_ENCODE (N_("Writer REPEAT-writes %1"), qi.frame); + dcp::FrameInfo fin = _picture_asset_writer->write ( + _last_written[qi.eyes]->data().get(), + _last_written[qi.eyes]->size() + ); + write_frame_info (qi.frame, qi.eyes, fin); + ++_repeat_written; + break; } lock.lock (); _last_written_frame = qi.frame; _last_written_eyes = qi.eyes; - + shared_ptr job = _job.lock (); DCPOMATIC_ASSERT (job); - int64_t total = _film->length().frames (_film->video_frame_rate ()); + int64_t total = _film->length().frames_round (_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. @@ -348,12 +417,11 @@ try total *= 2; } if (total) { - job->set_progress (float (_full_written + _fake_written) / total); + job->set_progress (float (_full_written + _fake_written + _repeat_written) / total); } } - while (_queued_full_in_memory > maximum_frames_in_memory ()) { - done_something = true; + while (_queued_full_in_memory > _maximum_frames_in_memory) { /* Too many frames in memory which can't yet be written to the stream. Write some FULL frames to disk. */ @@ -379,22 +447,14 @@ try _last_written_frame + 1, _last_written_eyes, i->frame ); - - i->encoded->write (_film, i->frame, i->eyes); - + + i->encoded->write_via_temp (_film->j2c_path (i->frame, i->eyes, true), _film->j2c_path (i->frame, i->eyes, false)); + lock.lock (); i->encoded.reset (); --_queued_full_in_memory; } - if (!done_something) { - LOG_DEBUG_NC ("Writer loop ran without doing anything"); - LOG_DEBUG ("_queued_full_in_memory=%1", _queued_full_in_memory); - LOG_DEBUG ("_queue_size=%1", _queue.size ()); - LOG_DEBUG ("_finish=%1", _finish); - LOG_DEBUG ("_last_written_frame=%1", _last_written_frame); - } - /* The queue has probably just gone down a bit; notify anything wait()ing on _full_condition */ _full_condition.notify_all (); } @@ -407,11 +467,11 @@ catch (...) void Writer::terminate_thread (bool can_throw) { - boost::mutex::scoped_lock lock (_mutex); + boost::mutex::scoped_lock lock (_state_mutex); if (_thread == 0) { return; } - + _finish = true; _empty_condition.notify_all (); _full_condition.notify_all (); @@ -421,10 +481,10 @@ Writer::terminate_thread (bool can_throw) if (can_throw) { rethrow (); } - + delete _thread; _thread = 0; -} +} void Writer::finish () @@ -432,20 +492,20 @@ Writer::finish () if (!_thread) { return; } - + terminate_thread (true); - _picture_mxf_writer->finalize (); - if (_sound_mxf_writer) { - _sound_mxf_writer->finalize (); + _picture_asset_writer->finalize (); + if (_sound_asset_writer) { + _sound_asset_writer->finalize (); } - - /* Hard-link the video MXF into the DCP */ - boost::filesystem::path video_from = _picture_mxf->file (); - + + /* Hard-link the video asset into the DCP */ + boost::filesystem::path video_from = _picture_asset->file (); + boost::filesystem::path video_to; video_to /= _film->dir (_film->dcp_name()); - video_to /= _film->video_mxf_filename (); + video_to /= video_asset_filename (_picture_asset); boost::system::error_code ec; boost::filesystem::create_hard_link (video_from, video_to, ec); @@ -458,23 +518,23 @@ Writer::finish () } } - _picture_mxf->set_file (video_to); + _picture_asset->set_file (video_to); - /* Move the audio MXF into the DCP */ + /* Move the audio asset into the DCP */ - if (_sound_mxf) { + if (_sound_asset) { boost::filesystem::path audio_to; audio_to /= _film->dir (_film->dcp_name ()); - audio_to /= _film->audio_mxf_filename (); - - boost::filesystem::rename (_film->file (_film->audio_mxf_filename ()), audio_to, ec); + audio_to /= audio_asset_filename (_sound_asset); + + boost::filesystem::rename (_film->file (audio_asset_filename (_sound_asset)), 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 ()) + String::compose (_("could not move audio asset into the DCP (%1)"), ec.value ()), audio_asset_filename (_sound_asset) ); } - _sound_mxf->set_file (audio_to); + _sound_asset->set_file (audio_to); } dcp::DCP dcp (_film->dir (_film->dcp_name())); @@ -485,87 +545,88 @@ Writer::finish () _film->dcp_content_type()->libdcp_kind () ) ); - + dcp.add (cpl); shared_ptr reel (new dcp::Reel ()); - shared_ptr mono = dynamic_pointer_cast (_picture_mxf); + shared_ptr mono = dynamic_pointer_cast (_picture_asset); if (mono) { reel->add (shared_ptr (new dcp::ReelMonoPictureAsset (mono, 0))); - dcp.add (mono); } - shared_ptr stereo = dynamic_pointer_cast (_picture_mxf); + shared_ptr stereo = dynamic_pointer_cast (_picture_asset); if (stereo) { reel->add (shared_ptr (new dcp::ReelStereoPictureAsset (stereo, 0))); - dcp.add (stereo); } - if (_sound_mxf) { - reel->add (shared_ptr (new dcp::ReelSoundAsset (_sound_mxf, 0))); - dcp.add (_sound_mxf); + if (_sound_asset) { + reel->add (shared_ptr (new dcp::ReelSoundAsset (_sound_asset, 0))); } - if (_subtitle_content) { - boost::filesystem::path const liberation = shared_path () / "LiberationSans-Regular.ttf"; + if (_subtitle_asset) { + boost::filesystem::path liberation; + try { + liberation = shared_path () / "LiberationSans-Regular.ttf"; + } catch (boost::filesystem::filesystem_error& e) { + /* Hack: try the debian/ubuntu location if getting the shared path failed */ + liberation = "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf"; + } - /* Add all the fonts to the subtitle content and as assets to the DCP */ + /* Add all the fonts to the subtitle content */ BOOST_FOREACH (shared_ptr i, _fonts) { - boost::filesystem::path const from = i->file.get_value_or (liberation); - _subtitle_content->add_font (i->id, from.leaf().string ()); - - boost::filesystem::path to = _film->dir (_film->dcp_name ()) / _subtitle_content->id (); - boost::filesystem::create_directories (to, ec); - if (ec) { - throw FileError (_("Could not create directory"), to); - } - - to /= from.leaf(); - - boost::system::error_code ec; - boost::filesystem::copy_file (from, to, ec); - if (ec) { - throw FileError ("Could not copy font to DCP", from); - } + _subtitle_asset->add_font (i->id(), i->file().get_value_or (liberation)); + } - dcp.add (shared_ptr (new dcp::Font (to))); + if (dynamic_pointer_cast (_subtitle_asset)) { + boost::filesystem::path directory = _film->dir (_film->dcp_name ()) / _subtitle_asset->id (); + boost::filesystem::create_directories (directory); + _subtitle_asset->write (directory / ("sub_" + _subtitle_asset->id() + ".xml")); + } else { + _subtitle_asset->write ( + _film->dir (_film->dcp_name ()) / ("sub_" + _subtitle_asset->id() + ".mxf") + ); } - _subtitle_content->write_xml (_film->dir (_film->dcp_name ()) / _subtitle_content->id () / _film->subtitle_xml_filename ()); reel->add (shared_ptr ( new dcp::ReelSubtitleAsset ( - _subtitle_content, + _subtitle_asset, dcp::Fraction (_film->video_frame_rate(), 1), - _picture_mxf->intrinsic_duration (), + _picture_asset->intrinsic_duration (), 0 ) )); - - dcp.add (_subtitle_content); } - + cpl->add (reel); shared_ptr job = _job.lock (); DCPOMATIC_ASSERT (job); job->sub (_("Computing image digest")); - _picture_mxf->hash (boost::bind (&Job::set_progress, job.get(), _1, false)); + _picture_asset->hash (boost::bind (&Job::set_progress, job.get(), _1, false)); - if (_sound_mxf) { + if (_sound_asset) { job->sub (_("Computing audio digest")); - _sound_mxf->hash (boost::bind (&Job::set_progress, job.get(), _1, false)); + _sound_asset->hash (boost::bind (&Job::set_progress, job.get(), _1, false)); } dcp::XMLMetadata meta; + meta.creator = Config::instance()->dcp_creator (); + if (meta.creator.empty ()) { + meta.creator = String::compose ("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit); + } meta.issuer = Config::instance()->dcp_issuer (); - meta.creator = String::compose ("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit); + if (meta.issuer.empty ()) { + meta.issuer = String::compose ("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit); + } meta.set_issue_date_now (); - shared_ptr signer; + cpl->set_metadata (meta); + + shared_ptr signer; if (_film->is_signed ()) { - signer = Config::instance()->signer (); + signer = Config::instance()->signer_chain (); /* We did check earlier, but check again here to be on the safe side */ if (!signer->valid ()) { throw InvalidSignerError (); @@ -575,81 +636,77 @@ Writer::finish () dcp.write_xml (_film->interop () ? dcp::INTEROP : dcp::SMPTE, meta, signer); LOG_GENERAL ( - N_("Wrote %1 FULL, %2 FAKE, %3 pushed to disk"), _full_written, _fake_written, _pushed_to_disk + N_("Wrote %1 FULL, %2 FAKE, %3 REPEAT, %4 pushed to disk"), _full_written, _fake_written, _repeat_written, _pushed_to_disk ); } -bool -Writer::check_existing_picture_mxf_frame (FILE* mxf, int f, Eyes eyes) +void +Writer::check_existing_picture_asset () { - /* Read the frame info as written */ - FILE* file = fopen_boost (_film->info_file (), "rb"); - if (!file) { - LOG_GENERAL ("Existing frame %1 has no info file", f); - return false; - } - - dcp::FrameInfo info = read_frame_info (file, f, eyes); - fclose (file); - if (info.size == 0) { - LOG_GENERAL ("Existing frame %1 has no info file", f); - return false; - } - - /* Read the data from the MXF and hash it */ - 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 ())) { - LOG_GENERAL ("Existing frame %1 is incomplete", f); - return false; - } - - MD5Digester digester; - digester.add (data.data(), data.size()); - if (digester.get() != info.hash) { - LOG_GENERAL ("Existing frame %1 failed hash check", f); - return false; + /* Try to open the existing asset */ + FILE* asset_file = fopen_boost (_picture_asset->file(), "rb"); + if (!asset_file) { + LOG_GENERAL ("Could not open existing asset at %1 (errno=%2)", _picture_asset->file().string(), errno); + return; } - return true; -} + /* Offset of the last dcp::FrameInfo in the info file */ + int const n = (boost::filesystem::file_size (_film->info_file ()) / _info_size) - 1; -void -Writer::check_existing_picture_mxf () -{ - /* Try to open the existing MXF */ - FILE* mxf = fopen_boost (_picture_mxf->file(), "rb"); - if (!mxf) { - LOG_GENERAL ("Could not open existing MXF at %1 (errno=%2)", _picture_mxf->file().string(), errno); + FILE* info_file = fopen_boost (_film->info_file (), "rb"); + if (!info_file) { + LOG_GENERAL_NC ("Could not open film info file"); + fclose (asset_file); return; } - while (true) { + if (_film->three_d ()) { + /* Start looking at the last left frame */ + _first_nonexistant_frame = n / 2; + } else { + _first_nonexistant_frame = n; + } - shared_ptr job = _job.lock (); - DCPOMATIC_ASSERT (job); + bool ok = false; - job->set_progress_unknown (); + while (!ok) { + /* Read the data from the info file; for 3D we just check the left + frames until we find a good one. + */ + dcp::FrameInfo info = read_frame_info (info_file, _first_nonexistant_frame, _film->three_d () ? EYES_LEFT : EYES_BOTH); - 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; - } + ok = true; + + /* Read the data from the asset and hash it */ + dcpomatic_fseek (asset_file, info.offset, SEEK_SET); + Data data (info.size); + size_t const read = fread (data.data().get(), 1, data.size(), asset_file); + if (read != static_cast (data.size ())) { + LOG_GENERAL ("Existing frame %1 is incomplete", _first_nonexistant_frame); + ok = false; } else { - if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_BOTH)) { - break; + MD5Digester digester; + digester.add (data.data().get(), data.size()); + if (digester.get() != info.hash) { + LOG_GENERAL ("Existing frame %1 failed hash check", _first_nonexistant_frame); + ok = false; } } - LOG_GENERAL ("Have existing frame %1", _first_nonexistant_frame); + if (!ok) { + --_first_nonexistant_frame; + } + } + + if (!_film->three_d ()) { + /* If we are doing 3D we might have found a good L frame with no R, so only + do this if we're in 2D and we've just found a good B(oth) frame. + */ ++_first_nonexistant_frame; } - fclose (mxf); + fclose (asset_file); + fclose (info_file); } /** @param frame Frame index. @@ -659,7 +716,7 @@ bool Writer::can_fake_write (int frame) const { /* We have to do a proper write of the first frame so that we can set up the JPEG2000 - parameters in the MXF writer. + parameters in the asset writer. */ return (frame != 0 && frame < _first_nonexistant_frame); } @@ -671,16 +728,31 @@ Writer::write (PlayerSubtitles subs) return; } - if (!_subtitle_content) { + if (!_subtitle_asset) { string lang = _film->subtitle_language (); if (lang.empty ()) { lang = "Unknown"; } - _subtitle_content.reset (new dcp::InteropSubtitleContent (_film->name(), lang)); + if (_film->interop ()) { + shared_ptr s (new dcp::InteropSubtitleAsset ()); + s->set_movie_title (_film->name ()); + s->set_language (lang); + s->set_reel_number ("1"); + _subtitle_asset = s; + } else { + shared_ptr s (new dcp::SMPTESubtitleAsset ()); + s->set_content_title_text (_film->name ()); + s->set_language (lang); + s->set_edit_rate (dcp::Fraction (_film->video_frame_rate (), 1)); + s->set_reel_number (1); + s->set_time_code_rate (_film->video_frame_rate ()); + s->set_start_time (dcp::Time ()); + _subtitle_asset = s; + } } - + for (list::const_iterator i = subs.text.begin(); i != subs.text.end(); ++i) { - _subtitle_content->add (*i); + _subtitle_asset->add (*i); } } @@ -707,8 +779,41 @@ operator== (QueueItem const & a, QueueItem const & b) return a.frame == b.frame && a.eyes == b.eyes; } -int -Writer::maximum_frames_in_memory () const +void +Writer::set_encoder_threads (int threads) { - return Config::instance()->num_local_encoding_threads() + 4; + _maximum_frames_in_memory = lrint (threads * 1.1); +} + +long +Writer::frame_info_position (int frame, Eyes eyes) const +{ + switch (eyes) { + case EYES_BOTH: + return frame * _info_size; + case EYES_LEFT: + return frame * _info_size * 2; + case EYES_RIGHT: + return frame * _info_size * 2 + _info_size; + default: + DCPOMATIC_ASSERT (false); + } + + DCPOMATIC_ASSERT (false); +} + +dcp::FrameInfo +Writer::read_frame_info (FILE* file, int frame, Eyes eyes) const +{ + dcp::FrameInfo info; + dcpomatic_fseek (file, frame_info_position (frame, eyes), SEEK_SET); + fread (&info.offset, sizeof (info.offset), 1, file); + fread (&info.size, sizeof (info.size), 1, file); + + char hash_buffer[33]; + fread (hash_buffer, 1, 32, file); + hash_buffer[32] = '\0'; + info.hash = hash_buffer; + + return info; }