X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=2a9b6d6d7414a5752dab0cd78f38fa8c6ff6e090;hb=6c19b21e12f73ce63edd406ea617ff25bcc9bfea;hp=9f6886a2103e4709a0883f315bdb81266c606d92;hpb=a5e87b6f0f496f4ed71d9129d40a5baebb68495f;p=dcpomatic.git diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 9f6886a21..2a9b6d6d7 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -30,36 +30,25 @@ #include "cross.h" #include "audio_buffers.h" #include "md5_digester.h" -#include "encoded_data.h" #include "version.h" #include "font.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "util.h" +#include "reel_writer.h" #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_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); +#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); +#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL); +#define LOG_DEBUG_ENCODE(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_DEBUG_ENCODE); +#define LOG_TIMING(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_TIMING); +#define LOG_WARNING_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_WARNING); +#define LOG_WARNING(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_WARNING); +#define LOG_ERROR(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_ERROR); /* OS X strikes again */ #undef set_key @@ -72,18 +61,18 @@ using std::cout; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; +using dcp::Data; -Writer::Writer (shared_ptr f, weak_ptr j) - : _film (f) +Writer::Writer (shared_ptr film, weak_ptr j) + : _film (film) , _job (j) - , _first_nonexistant_frame (0) , _thread (0) , _finish (false) , _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 */ @@ -92,66 +81,47 @@ Writer::Writer (shared_ptr f, weak_ptr j) shared_ptr job = _job.lock (); DCPOMATIC_ASSERT (job); - /* 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_mxf.reset (new dcp::StereoPictureMXF (dcp::Fraction (_film->video_frame_rate (), 1))); - } else { - _picture_mxf.reset (new dcp::MonoPictureMXF (dcp::Fraction (_film->video_frame_rate (), 1))); + BOOST_FOREACH (DCPTimePeriod p, _film->reels ()) { + _reels.push_back (ReelWriter (film, p, job)); } - job->sub (_("Checking existing image data")); - check_existing_picture_mxf (); - - _picture_mxf->set_size (_film->frame_size ()); - - if (_film->encrypted ()) { - _picture_mxf->set_key (_film->key ()); - } - - _picture_mxf_writer = _picture_mxf->start_write ( - _film->internal_video_mxf_dir() / _film->internal_video_mxf_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 ())); - - if (_film->encrypted ()) { - _sound_mxf->set_key (_film->key ()); - } - - /* Write the sound MXF 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); - } + /* We can keep track of the current audio and subtitle reels easily because audio + and subs arrive to the Writer in sequence. This is not so for video. + */ + _audio_reel = _reels.begin (); + _subtitle_reel = _reels.begin (); /* 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); } +/** Pass a video frame to the writer for writing to disk at some point. + * This method can be called with frames out of order. + * @param encoded JPEG2000-encoded data. + * @param frame Frame index within the DCP. + * @param eyes Eyes that this frame image is for. + */ void -Writer::write (shared_ptr encoded, int frame, Eyes eyes) +Writer::write (Data encoded, Frame 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); } @@ -159,7 +129,8 @@ Writer::write (shared_ptr encoded, int frame, Eyes eyes) QueueItem qi; qi.type = QueueItem::FULL; qi.encoded = encoded; - qi.frame = frame; + qi.reel = video_reel (frame); + qi.frame = frame - _reels[qi.reel].start (); if (_film->three_d() && eyes == EYES_BOTH) { /* 2D material in a 3D DCP; fake the 3D */ @@ -179,27 +150,69 @@ Writer::write (shared_ptr encoded, int frame, Eyes eyes) _empty_condition.notify_all (); } +bool +Writer::can_repeat (Frame frame) const +{ + return frame > _reels[video_reel(frame)].start(); +} + +/** Repeat the last frame that was written to a reel as a new frame. + * @param frame Frame index within the DCP of the new (repeated) frame. + * @param eyes Eyes that this repeated frame image is for. + */ void -Writer::fake_write (int frame, Eyes eyes) +Writer::repeat (Frame 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"); + + QueueItem qi; + qi.type = QueueItem::REPEAT; + qi.reel = video_reel (frame); + qi.frame = frame - _reels[qi.reel].start (); + 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 (Frame 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); + } + + size_t const reel = video_reel (frame); + Frame const reel_frame = frame - _reels[reel].start (); + + FILE* file = fopen_boost (_film->info_file(_reels[reel].period()), "rb"); if (!file) { - throw ReadFileError (_film->info_file ()); + throw ReadFileError (_film->info_file(_reels[reel].period())); } - dcp::FrameInfo info = read_frame_info (file, frame, eyes); + dcp::FrameInfo info = _reels[reel].read_frame_info (file, reel_frame, eyes); fclose (file); - + QueueItem qi; qi.type = QueueItem::FAKE; qi.size = info.size; - qi.frame = frame; + qi.reel = reel; + qi.frame = reel_frame; if (_film->three_d() && eyes == EYES_BOTH) { qi.eyes = EYES_LEFT; _queue.push_back (qi); @@ -214,12 +227,23 @@ Writer::fake_write (int frame, Eyes eyes) _empty_condition.notify_all (); } -/** This method is not thread safe */ +/** Write one video frame's worth of audio frames to the DCP. + * @param audio Audio data or 0 if there is no audio to be written here (i.e. it is referenced). + * This method is not thread safe. + */ void Writer::write (shared_ptr audio) { - if (_sound_mxf_writer) { - _sound_mxf_writer->write (audio->data(), audio->frames()); + if (_audio_reel == _reels.end ()) { + /* This audio is off the end of the last reel; ignore it */ + return; + } + + _audio_reel->write (audio); + + /* written is in video frames, not audio frames */ + if (_audio_reel->total_written_audio_frames() >= _audio_reel->period().duration().frames_floor (_film->video_frame_rate())) { + ++_audio_reel; } } @@ -233,20 +257,23 @@ Writer::have_sequenced_image_at_queue_head () _queue.sort (); + QueueItem const & f = _queue.front(); + ReelWriter const & reel = _reels[f.reel]; + /* The queue should contain only EYES_LEFT/EYES_RIGHT pairs or EYES_BOTH */ - if (_queue.front().eyes == EYES_BOTH) { + if (f.eyes == EYES_BOTH) { /* 2D */ - return _queue.front().frame == (_last_written_frame + 1); + return f.frame == (reel.last_written_video_frame() + 1); } /* 3D */ - if (_last_written_eyes == EYES_LEFT && _queue.front().frame == _last_written_frame && _queue.front().eyes == EYES_RIGHT) { + if (reel.last_written_eyes() == EYES_LEFT && f.frame == reel.last_written_video_frame() && f.eyes == EYES_RIGHT) { return true; } - if (_last_written_eyes == EYES_RIGHT && _queue.front().frame == (_last_written_frame + 1) && _queue.front().eyes == EYES_LEFT) { + if (reel.last_written_eyes() == EYES_RIGHT && f.frame == (reel.last_written_video_frame() + 1) && f.eyes == EYES_LEFT) { return true; } @@ -259,22 +286,19 @@ 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 +311,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,15 +319,14 @@ 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); } return; } + /* 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) { @@ -312,35 +334,35 @@ try } lock.unlock (); + + ReelWriter& reel = _reels[qi.reel]; + 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.reel, 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); - _last_written[qi.eyes] = qi.encoded; + reel.write (qi.encoded, qi.frame, qi.eyes); ++_full_written; break; - } case QueueItem::FAKE: - LOG_GENERAL (N_("Writer FAKE-writes %1 to MXF"), qi.frame); - _picture_mxf_writer->fake_write (qi.size); - _last_written[qi.eyes].reset (); + LOG_DEBUG_ENCODE (N_("Writer FAKE-writes %1"), qi.frame); + reel.fake_write (qi.frame, qi.eyes, qi.size); ++_fake_written; break; + case QueueItem::REPEAT: + LOG_DEBUG_ENCODE (N_("Writer REPEAT-writes %1"), qi.frame); + reel.repeat_write (qi.frame, qi.eyes); + ++_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 +370,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. */ @@ -366,32 +387,26 @@ try } DCPOMATIC_ASSERT (i != _queue.rend()); - QueueItem qi = *i; - ++_pushed_to_disk; - lock.unlock (); - LOG_GENERAL ( - "Writer full (awaiting %1 [last eye was %2]); pushes %3 to disk", - _last_written_frame + 1, - _last_written_eyes, qi.frame + /* i is valid here, even though we don't hold a lock on the mutex, + since list iterators are unaffected by insertion and only this + thread could erase the last item in the list. + */ + + LOG_GENERAL ("Writer full; pushes %1 to disk", i->frame); + + i->encoded->write_via_temp ( + _film->j2c_path (i->reel, i->frame, i->eyes, true), + _film->j2c_path (i->reel, i->frame, i->eyes, false) ); - - qi.encoded->write (_film, qi.frame, qi.eyes); + lock.lock (); - qi.encoded.reset (); + 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 (); } @@ -404,24 +419,27 @@ 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 (); lock.unlock (); - _thread->join (); + if (_thread->joinable ()) { + _thread->join (); + } + if (can_throw) { rethrow (); } - + delete _thread; _thread = 0; -} +} void Writer::finish () @@ -429,49 +447,11 @@ Writer::finish () if (!_thread) { return; } - - terminate_thread (true); - _picture_mxf_writer->finalize (); - if (_sound_mxf_writer) { - _sound_mxf_writer->finalize (); - } - - /* Hard-link the video MXF into the DCP */ - boost::filesystem::path video_from = _picture_mxf->file (); - - boost::filesystem::path video_to; - video_to /= _film->dir (_film->dcp_name()); - video_to /= _film->video_mxf_filename (); - - boost::system::error_code ec; - boost::filesystem::create_hard_link (video_from, video_to, ec); - if (ec) { - LOG_WARNING_NC ("Hard-link failed; copying instead"); - boost::filesystem::copy_file (video_from, video_to, ec); - if (ec) { - LOG_ERROR ("Failed to copy video file from %1 to %2 (%3)", video_from.string(), video_to.string(), ec.message ()); - throw FileError (ec.message(), video_from); - } - } - - _picture_mxf->set_file (video_to); - - /* Move the audio MXF into the DCP */ - - if (_sound_mxf) { - 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); - if (ec) { - throw FileError ( - String::compose (_("could not move audio MXF into the DCP (%1)"), ec.value ()), _film->file (_film->audio_mxf_filename ()) - ); - } + terminate_thread (true); - _sound_mxf->set_file (audio_to); + BOOST_FOREACH (ReelWriter& i, _reels) { + i.finish (); } dcp::DCP dcp (_film->dir (_film->dcp_name())); @@ -482,81 +462,34 @@ 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); - if (mono) { - reel->add (shared_ptr (new dcp::ReelMonoPictureAsset (mono, 0))); - dcp.add (mono); - } - - shared_ptr stereo = dynamic_pointer_cast (_picture_mxf); - 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 (_subtitle_content) { - _subtitle_content->write_xml (_film->dir (_film->dcp_name ()) / _film->subtitle_xml_filename ()); - reel->add (shared_ptr ( - new dcp::ReelSubtitleAsset ( - _subtitle_content, - dcp::Fraction (_film->video_frame_rate(), 1), - _picture_mxf->intrinsic_duration (), - 0 - ) - )); - - dcp.add (_subtitle_content); - - boost::filesystem::path const liberation = shared_path () / "LiberationSans-Regular.ttf"; - - /* Add all the fonts to the subtitle content and as assets to the DCP */ - 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 ()) / from.leaf(); - - boost::system::error_code ec; - boost::filesystem::copy_file (from, to, ec); - if (!ec) { - dcp.add (shared_ptr (new dcp::Font (to))); - } else { - LOG_WARNING_NC (String::compose ("Could not copy font %1 to DCP", from.string ())); - } - } - } - - cpl->add (reel); + dcp.add (cpl); - shared_ptr job = _job.lock (); - DCPOMATIC_ASSERT (job); + BOOST_FOREACH (ReelWriter& i, _reels) { - job->sub (_("Computing image digest")); - _picture_mxf->hash (boost::bind (&Job::set_progress, job.get(), _1, false)); + cpl->add (i.create_reel (_reel_assets, _fonts)); - if (_sound_mxf) { - job->sub (_("Computing audio digest")); - _sound_mxf->hash (boost::bind (&Job::set_progress, job.get(), _1, false)); + shared_ptr job = _job.lock (); + DCPOMATIC_ASSERT (job); + i.calculate_digests (job); } 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 (); @@ -566,93 +499,25 @@ 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) -{ - /* 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; - } - - return true; -} - -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); - return; - } - - while (true) { - - shared_ptr job = _job.lock (); - DCPOMATIC_ASSERT (job); - - job->set_progress_unknown (); - - 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; - } - } - - LOG_GENERAL ("Have existing frame %1", _first_nonexistant_frame); - ++_first_nonexistant_frame; - } - - fclose (mxf); -} - -/** @param frame Frame index. +/** @param frame Frame index within the whole DCP. * @return true if we can fake-write this frame. */ bool -Writer::can_fake_write (int frame) const +Writer::can_fake_write (Frame 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); + + ReelWriter const & reel = _reels[video_reel(frame)]; + + /* Make frame relative to the start of the reel */ + frame -= reel.start (); + return (frame != 0 && frame < reel.first_nonexistant_frame()); } void @@ -662,13 +527,11 @@ Writer::write (PlayerSubtitles subs) return; } - if (!_subtitle_content) { - _subtitle_content.reset (new dcp::InteropSubtitleContent (_film->name(), _film->subtitle_language ())); - } - - for (list::const_iterator i = subs.text.begin(); i != subs.text.end(); ++i) { - _subtitle_content->add (*i); + if (_subtitle_reel->period().to <= subs.from) { + ++_subtitle_reel; } + + _subtitle_reel->write (subs); } void @@ -681,6 +544,10 @@ Writer::write (list > fonts) bool operator< (QueueItem const & a, QueueItem const & b) { + if (a.reel != b.reel) { + return a.reel < b.reel; + } + if (a.frame != b.frame) { return a.frame < b.frame; } @@ -691,11 +558,30 @@ operator< (QueueItem const & a, QueueItem const & b) bool operator== (QueueItem const & a, QueueItem const & b) { - return a.frame == b.frame && a.eyes == b.eyes; + return a.reel == b.reel && a.frame == b.frame && a.eyes == b.eyes; } -int -Writer::maximum_frames_in_memory () const +void +Writer::set_encoder_threads (int threads) +{ + _maximum_frames_in_memory = lrint (threads * 1.1); +} + +void +Writer::write (ReferencedReelAsset asset) { - return Config::instance()->num_local_encoding_threads() + 4; + _reel_assets.push_back (asset); +} + +size_t +Writer::video_reel (int frame) const +{ + DCPTime t = DCPTime::from_frames (frame, _film->video_frame_rate ()); + size_t i = 0; + while (i < _reels.size() && !_reels[i].period().contains (t)) { + ++i; + } + + DCPOMATIC_ASSERT (i < _reels.size ()); + return i; }