X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Flib%2Fwriter.cc;h=1a11a482bf0b0155d948848474e5cc18333b0296;hb=ef4b082c5d7452a34ce45f6d3bead46a7e846faf;hp=4c8a36597e56667bbbd0ff55c84211b4cf000e57;hpb=290daefb79ec399cf7ba54968fc7e92e375e98d6;p=dcpomatic.git diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 4c8a36597..1a11a482b 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,39 +17,63 @@ */ -#include -#include -#include -#include -#include -#include -#include -#include #include "writer.h" #include "compose.hpp" #include "film.h" #include "ratio.h" #include "log.h" -#include "dcp_video_frame.h" +#include "dcp_video.h" #include "dcp_content_type.h" -#include "player.h" #include "audio_mapping.h" #include "config.h" #include "job.h" +#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 +#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); + +/* OS X strikes again */ +#undef set_key + 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; +using boost::dynamic_pointer_cast; -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) @@ -60,56 +84,66 @@ Writer::Writer (shared_ptr f, shared_ptr j) , _last_written_eyes (EYES_RIGHT) , _full_written (0) , _fake_written (0) - , _repeat_written (0) , _pushed_to_disk (0) { /* Remove any old DCP */ boost::filesystem::remove_all (_film->dir (_film->dcp_name ())); - - check_existing_picture_mxf (); - + + 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 (f->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 ()) - ) - ); - + if (_film->three_d ()) { + _picture_mxf.reset (new dcp::StereoPictureMXF (dcp::Fraction (_film->video_frame_rate (), 1))); } 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_mxf.reset (new dcp::MonoPictureMXF (dcp::Fraction (_film->video_frame_rate (), 1))); } - _picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0); + 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 ()); + } - _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 () - ) + _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 ()); + } - _sound_asset_writer = _sound_asset->start_write (); + /* 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); + } + + /* Check that the signer is OK if we need one */ + if (_film->is_signed() && !Config::instance()->signer()->valid ()) { + throw InvalidSignerError (); + } _thread = new boost::thread (boost::bind (&Writer::thread, this)); + + job->sub (_("Encoding image data")); +} + +Writer::~Writer () +{ + terminate_thread (false); } void @@ -117,6 +151,11 @@ Writer::write (shared_ptr encoded, int frame, Eyes eyes) { boost::mutex::scoped_lock lock (_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::FULL; qi.encoded = encoded; @@ -135,8 +174,9 @@ Writer::write (shared_ptr encoded, int frame, Eyes eyes) _queue.push_back (qi); ++_queued_full_in_memory; } - - _condition.notify_all (); + + /* Now there's something to do: wake anything wait()ing on _empty_condition */ + _empty_condition.notify_all (); } void @@ -144,36 +184,55 @@ Writer::fake_write (int frame, Eyes eyes) { boost::mutex::scoped_lock lock (_mutex); - ifstream ifi (_film->info_path (frame, eyes).c_str()); - libdcp::FrameInfo info (ifi); + 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; 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 (); + /* Now there's something to do: wake anything wait()ing on _empty_condition */ + _empty_condition.notify_all (); } /** This method is not thread safe */ void Writer::write (shared_ptr audio) { - _sound_asset_writer->write (audio->data(), audio->frames()); + if (_sound_mxf_writer) { + _sound_mxf_writer->write (audio->data(), audio->frames()); + } } -/** This must be called from Writer::thread() with an appropriate lock held, - * and with _queue sorted. - */ +/** This must be called from Writer::thread() with an appropriate lock held */ bool -Writer::have_sequenced_image_at_queue_head () const +Writer::have_sequenced_image_at_queue_head () { if (_queue.empty ()) { return false; } + _queue.sort (); + /* The queue should contain only EYES_LEFT/EYES_RIGHT pairs or EYES_BOTH */ if (_queue.front().eyes == EYES_BOTH) { @@ -198,29 +257,54 @@ void Writer::thread () try { - while (1) + while (true) { boost::mutex::scoped_lock lock (_mutex); - while (1) { - - _queue.sort (); + /* This is for debugging only */ + bool done_something = false; + + 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; } - TIMING (N_("writer sleeps with a queue of %1"), _queue.size()); - _condition.wait (lock); - TIMING (N_("writer wakes with a queue of %1"), _queue.size()); + /* 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()); + _empty_condition.wait (lock); + LOG_TIMING (N_("writer wakes with a queue of %1"), _queue.size()); } if (_finish && _queue.empty()) { return; } - /* Write any frames that we can write; i.e. those that are in sequence */ + /* We stop here if we have been asked to finish, and if either the queue + is empty or we do not have a sequenced image at its head (if this is the + case we will never terminate as no new frames will be sent once + _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()); + for (list::const_iterator i = _queue.begin(); i != _queue.end(); ++i) { + if (i->type == QueueItem::FULL) { + 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) { @@ -231,78 +315,88 @@ try switch (qi.type) { case QueueItem::FULL: { - _film->log()->log (String::compose (N_("Writer FULL-writes %1 to MXF"), qi.frame)); + LOG_GENERAL (N_("Writer FULL-writes %1 to MXF"), qi.frame); if (!qi.encoded) { qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, qi.eyes, false))); } - libdcp::FrameInfo fin = _picture_asset_writer->write (qi.encoded->data(), qi.encoded->size()); + 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; ++_full_written; break; } case QueueItem::FAKE: - _film->log()->log (String::compose (N_("Writer FAKE-writes %1 to MXF"), qi.frame)); - _picture_asset_writer->fake_write (qi.size); + LOG_GENERAL (N_("Writer FAKE-writes %1 to MXF"), qi.frame); + _picture_mxf_writer->fake_write (qi.size); _last_written[qi.eyes].reset (); ++_fake_written; break; - case QueueItem::REPEAT: - { - _film->log()->log (String::compose (N_("Writer REPEAT-writes %1 to MXF"), qi.frame)); - 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; - } } lock.lock (); _last_written_frame = qi.frame; _last_written_eyes = qi.eyes; - if (_film->length()) { - _job->set_progress ( - float (_full_written + _fake_written + _repeat_written) / _film->time_to_video_frames (_film->length()) - ); + shared_ptr job = _job.lock (); + DCPOMATIC_ASSERT (job); + int64_t total = _film->length().frames (_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. + */ + total *= 2; + } + if (total) { + job->set_progress (float (_full_written + _fake_written) / total); } } - while (_queued_full_in_memory > _maximum_frames_in_memory) { + while (_queued_full_in_memory > maximum_frames_in_memory ()) { + done_something = true; /* Too many frames in memory which can't yet be written to the stream. Write some FULL frames to disk. */ - /* Find one */ + /* Find one from the back of the queue */ + _queue.sort (); list::reverse_iterator i = _queue.rbegin (); while (i != _queue.rend() && (i->type != QueueItem::FULL || !i->encoded)) { ++i; } - assert (i != _queue.rend()); - QueueItem qi = *i; - + DCPOMATIC_ASSERT (i != _queue.rend()); ++_pushed_to_disk; - lock.unlock (); - _film->log()->log ( - String::compose ( - "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 (awaiting %1 [last eye was %2]); pushes %3 to disk", + _last_written_frame + 1, + _last_written_eyes, i->frame ); - qi.encoded->write (_film, qi.frame, qi.eyes); + i->encoded->write (_film, i->frame, i->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 (); } } catch (...) @@ -311,123 +405,210 @@ catch (...) } void -Writer::finish () +Writer::terminate_thread (bool can_throw) { - if (!_thread) { + boost::mutex::scoped_lock lock (_mutex); + if (_thread == 0) { return; } - boost::mutex::scoped_lock lock (_mutex); _finish = true; - _condition.notify_all (); + _empty_condition.notify_all (); + _full_condition.notify_all (); lock.unlock (); - _thread->join (); - if (thrown ()) { + _thread->join (); + if (can_throw) { rethrow (); } delete _thread; _thread = 0; +} - _picture_asset_writer->finalize (); - _sound_asset_writer->finalize (); +void +Writer::finish () +{ + if (!_thread) { + return; + } - int const frames = _last_written_frame + 1; - - _picture_asset->set_duration (frames); + 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 from; - from /= _film->internal_video_mxf_dir(); - from /= _film->internal_video_mxf_filename(); + boost::filesystem::path video_from = _picture_mxf->file (); - boost::filesystem::path to; - to /= _film->dir (_film->dcp_name()); - to /= _film->video_mxf_filename (); + 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 (from, to, ec); + boost::filesystem::create_hard_link (video_from, video_to, ec); if (ec) { - /* hard link failed; copy instead */ - boost::filesystem::copy_file (from, to); - _film->log()->log ("Hard-link failed; fell back to copying"); + 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); + } } - /* And update the asset */ + _picture_mxf->set_file (video_to); - _picture_asset->set_directory (_film->dir (_film->dcp_name ())); - _picture_asset->set_file_name (_film->video_mxf_filename ()); - _sound_asset->set_duration (frames); - - libdcp::DCP dcp (_film->dir (_film->dcp_name())); + /* Move the audio MXF into the DCP */ - shared_ptr cpl ( - new libdcp::CPL ( - _film->dir (_film->dcp_name()), + 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 ()) + ); + } + + _sound_mxf->set_file (audio_to); + } + + dcp::DCP dcp (_film->dir (_film->dcp_name())); + + shared_ptr cpl ( + new dcp::CPL ( _film->dcp_name(), - _film->dcp_content_type()->libdcp_kind (), - frames, - _film->video_frame_rate () + _film->dcp_content_type()->libdcp_kind () ) ); - dcp.add_cpl (cpl); + dcp.add (cpl); - cpl->add_reel (shared_ptr (new libdcp::Reel ( - _picture_asset, - _sound_asset, - shared_ptr () - ) - )); + shared_ptr reel (new dcp::Reel ()); - libdcp::XMLMetadata meta = Config::instance()->dcp_metadata (); - meta.set_issue_date_now (); - dcp.write_xml (meta); + shared_ptr mono = dynamic_pointer_cast (_picture_mxf); + if (mono) { + reel->add (shared_ptr (new dcp::ReelMonoPictureAsset (mono, 0))); + dcp.add (mono); + } - _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)); -} + shared_ptr stereo = dynamic_pointer_cast (_picture_mxf); + if (stereo) { + reel->add (shared_ptr (new dcp::ReelStereoPictureAsset (stereo, 0))); + dcp.add (stereo); + } -/** Tell the writer that frame `f' should be a repeat of the frame before it */ -void -Writer::repeat (int f, Eyes e) -{ - boost::mutex::scoped_lock lock (_mutex); + if (_sound_mxf) { + reel->add (shared_ptr (new dcp::ReelSoundAsset (_sound_mxf, 0))); + dcp.add (_sound_mxf); + } - QueueItem qi; - qi.type = QueueItem::REPEAT; - qi.frame = f; - qi.eyes = e; + if (_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 ()) / _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); + } + + dcp.add (shared_ptr (new dcp::Font (to))); + } + + _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, + dcp::Fraction (_film->video_frame_rate(), 1), + _picture_mxf->intrinsic_duration (), + 0 + ) + )); + + dcp.add (_subtitle_content); + } - _queue.push_back (qi); + cpl->add (reel); + + shared_ptr job = _job.lock (); + DCPOMATIC_ASSERT (job); - _condition.notify_all (); + job->sub (_("Computing image digest")); + _picture_mxf->hash (boost::bind (&Job::set_progress, job.get(), _1, false)); + + if (_sound_mxf) { + job->sub (_("Computing audio digest")); + _sound_mxf->hash (boost::bind (&Job::set_progress, job.get(), _1, false)); + } + + dcp::XMLMetadata meta; + meta.issuer = Config::instance()->dcp_issuer (); + meta.creator = String::compose ("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit); + meta.set_issue_date_now (); + + shared_ptr signer; + if (_film->is_signed ()) { + signer = Config::instance()->signer (); + /* We did check earlier, but check again here to be on the safe side */ + if (!signer->valid ()) { + throw InvalidSignerError (); + } + } + + 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 + ); } 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()); - libdcp::FrameInfo info (ifi); + 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) { - _film->log()->log (String::compose ("Existing frame %1 has no info file", f)); + LOG_GENERAL ("Existing frame %1 has no info file", f); return false; } /* Read the data from the MXF and hash it */ - fseek (mxf, info.offset, SEEK_SET); + 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 ())) { - _film->log()->log (String::compose ("Existing frame %1 is incomplete", f)); + LOG_GENERAL ("Existing frame %1 is incomplete", f); return false; } - - string const existing_hash = md5_digest (data.data(), data.size()); - if (existing_hash != info.hash) { - _film->log()->log (String::compose ("Existing frame %1 failed hash check", f)); + + MD5Digester digester; + digester.add (data.data(), data.size()); + if (digester.get() != info.hash) { + LOG_GENERAL ("Existing frame %1 failed hash check", f); return false; } @@ -438,16 +619,18 @@ void Writer::check_existing_picture_mxf () { /* Try to open the existing MXF */ - boost::filesystem::path p; - p /= _film->internal_video_mxf_dir (); - p /= _film->internal_video_mxf_filename (); - FILE* mxf = fopen (p.string().c_str(), "rb"); + FILE* mxf = fopen_boost (_picture_mxf->file(), "rb"); if (!mxf) { - _film->log()->log (String::compose ("Could not open existing MXF at %1 (errno=%2)", p.string(), errno)); + LOG_GENERAL ("Could not open existing MXF at %1 (errno=%2)", _picture_mxf->file().string(), errno); return; } - while (1) { + 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)) { @@ -462,7 +645,7 @@ Writer::check_existing_picture_mxf () } } - _film->log()->log (String::compose ("Have existing frame %1", _first_nonexistant_frame)); + LOG_GENERAL ("Have existing frame %1", _first_nonexistant_frame); ++_first_nonexistant_frame; } @@ -481,14 +664,41 @@ Writer::can_fake_write (int frame) const return (frame != 0 && frame < _first_nonexistant_frame); } +void +Writer::write (PlayerSubtitles subs) +{ + if (subs.text.empty ()) { + return; + } + + if (!_subtitle_content) { + string lang = _film->subtitle_language (); + if (lang.empty ()) { + lang = "Unknown"; + } + _subtitle_content.reset (new dcp::InteropSubtitleContent (_film->name(), lang)); + } + + for (list::const_iterator i = subs.text.begin(); i != subs.text.end(); ++i) { + _subtitle_content->add (*i); + } +} + +void +Writer::write (list > fonts) +{ + /* Just keep a list of fonts and we'll deal with them in ::finish */ + copy (fonts.begin (), fonts.end (), back_inserter (_fonts)); +} + bool 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 @@ -496,3 +706,9 @@ operator== (QueueItem const & a, QueueItem const & b) { return a.frame == b.frame && a.eyes == b.eyes; } + +int +Writer::maximum_frames_in_memory () const +{ + return Config::instance()->num_local_encoding_threads() + 4; +}