X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=12cb5f0bdb4aeaea69ba709fb84b507fdd77fb38;hb=dbfbdcba0f5f08a932ba199039f2ca1530e482ac;hp=2571ce3cbdc89eecf9ecc5acbb42b7e0f2fb60f4;hpb=093fe75629801ca667ab95496757ad5d7c6430e4;p=dcpomatic.git diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 2571ce3cb..12cb5f0bd 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -51,15 +51,17 @@ #include #include #include +#include #include "i18n.h" -#define LOG_GENERAL(...) _film->log()->log (String::compose (__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_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 @@ -73,10 +75,11 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; +int const Writer::_info_size = 48; + 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) @@ -94,64 +97,81 @@ Writer::Writer (shared_ptr film, 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. - */ + BOOST_FOREACH (DCPTimePeriod p, _film->reels ()) { + Reel reel; + reel.period = p; - if (_film->three_d ()) { - _picture_asset.reset (new dcp::StereoPictureAsset (dcp::Fraction (_film->video_frame_rate (), 1))); - } else { - _picture_asset.reset (new dcp::MonoPictureAsset (dcp::Fraction (_film->video_frame_rate (), 1))); - } + /* 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 ()) { + reel.picture_asset.reset (new dcp::StereoPictureAsset (dcp::Fraction (_film->video_frame_rate (), 1))); + } else { + reel.picture_asset.reset (new dcp::MonoPictureAsset (dcp::Fraction (_film->video_frame_rate (), 1))); + } - _picture_asset->set_size (_film->frame_size ()); + reel.picture_asset->set_size (_film->frame_size ()); - if (_film->encrypted ()) { - _picture_asset->set_key (_film->key ()); - } + if (_film->encrypted ()) { + reel.picture_asset->set_key (_film->key ()); + } - _picture_asset->set_file ( - _film->internal_video_asset_dir() / _film->internal_video_asset_filename() - ); + reel.picture_asset->set_file ( + _film->internal_video_asset_dir() / _film->internal_video_asset_filename(p) + ); - job->sub (_("Checking existing image data")); - check_existing_picture_asset (); + job->sub (_("Checking existing image data")); + check_existing_picture_asset (reel); - _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 - ); + reel.picture_asset_writer = reel.picture_asset->start_write ( + _film->internal_video_asset_dir() / _film->internal_video_asset_filename(p), + _film->interop() ? dcp::INTEROP : dcp::SMPTE, + reel.first_nonexistant_frame > 0 + ); - if (_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->audio_channels ()) { + reel.sound_asset.reset ( + new dcp::SoundAsset (dcp::Fraction (_film->video_frame_rate(), 1), _film->audio_frame_rate (), _film->audio_channels ()) ); - if (_film->encrypted ()) { - _sound_asset->set_key (_film->key ()); + if (_film->encrypted ()) { + reel.sound_asset->set_key (_film->key ()); + } + + /* Write the sound asset into the film directory so that we leave the creation + of the DCP directory until the last minute. + */ + reel.sound_asset_writer = reel.sound_asset->start_write ( + _film->directory() / audio_asset_filename (reel.sound_asset), + _film->interop() ? dcp::INTEROP : dcp::SMPTE + ); } - /* Write the sound asset into the film directory so that we leave the creation - of the DCP directory until the last minute. - */ - _sound_asset_writer = _sound_asset->start_write ( - _film->directory() / audio_asset_filename (_sound_asset), - _film->interop() ? dcp::INTEROP : dcp::SMPTE - ); + _reels.push_back (reel); } + /* 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_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); @@ -160,7 +180,7 @@ Writer::~Writer () void 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) { /* The queue is too big; wait until that is sorted out */ @@ -193,7 +213,7 @@ Writer::write (Data encoded, int frame, Eyes eyes) void Writer::repeat (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) { /* The queue is too big; wait until that is sorted out */ @@ -220,16 +240,18 @@ Writer::repeat (int frame, Eyes eyes) 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) { /* The queue is too big; wait until that is sorted out */ _full_condition.wait (lock); } - FILE* file = fopen_boost (_film->info_file (), "rb"); + Reel const & reel = video_reel (frame); + + FILE* file = fopen_boost (_film->info_file(reel.period), "rb"); if (!file) { - throw ReadFileError (_film->info_file ()); + throw ReadFileError (_film->info_file(reel.period)); } dcp::FrameInfo info = read_frame_info (file, frame, eyes); fclose (file); @@ -256,8 +278,15 @@ Writer::fake_write (int frame, Eyes eyes) void Writer::write (shared_ptr audio) { - if (_sound_asset_writer) { - _sound_asset_writer->write (audio->data(), audio->frames()); + if (!_audio_reel->sound_asset_writer) { + return; + } + + _audio_reel->sound_asset_writer->write (audio->data(), audio->frames()); + + /* SoundAsset's `frames' are video frames, not audio frames */ + if (_audio_reel->sound_asset_writer->frames_written() >= _audio_reel->period.duration().frames_round (_film->video_frame_rate())) { + ++_audio_reel; } } @@ -294,14 +323,16 @@ Writer::have_sequenced_image_at_queue_head () void Writer::write_frame_info (int frame, Eyes eyes, dcp::FrameInfo info) const { + Reel const & reel = video_reel (frame); FILE* file = 0; - if (boost::filesystem::exists (_film->info_file ())) { - file = fopen_boost (_film->info_file(), "r+b"); + boost::filesystem::path info_file = _film->info_file (reel.period); + if (boost::filesystem::exists (info_file)) { + file = fopen_boost (info_file, "r+b"); } else { - file = fopen_boost (_film->info_file(), "wb"); + file = fopen_boost (info_file, "wb"); } if (!file) { - throw OpenFileError (_film->info_file ()); + throw OpenFileError (info_file); } dcpomatic_fseek (file, frame_info_position (frame, eyes), SEEK_SET); fwrite (&info.offset, sizeof (info.offset), 1, file); @@ -316,7 +347,7 @@ try { while (true) { - boost::mutex::scoped_lock lock (_mutex); + boost::mutex::scoped_lock lock (_state_mutex); while (true) { @@ -364,6 +395,9 @@ try } lock.unlock (); + + Reel const & reel = video_reel (qi.frame); + switch (qi.type) { case QueueItem::FULL: { @@ -372,7 +406,7 @@ try qi.encoded = Data (_film->j2c_path (qi.frame, qi.eyes, false)); } - dcp::FrameInfo fin = _picture_asset_writer->write (qi.encoded->data().get (), qi.encoded->size()); + dcp::FrameInfo fin = reel.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; @@ -380,13 +414,13 @@ try } case QueueItem::FAKE: LOG_DEBUG_ENCODE (N_("Writer FAKE-writes %1"), qi.frame); - _picture_asset_writer->fake_write (qi.size); + reel.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 ( + dcp::FrameInfo fin = reel.picture_asset_writer->write ( _last_written[qi.eyes]->data().get(), _last_written[qi.eyes]->size() ); @@ -394,6 +428,7 @@ try ++_repeat_written; break; } + lock.lock (); _last_written_frame = qi.frame; @@ -459,7 +494,7 @@ 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; } @@ -469,6 +504,7 @@ Writer::terminate_thread (bool can_throw) _full_condition.notify_all (); lock.unlock (); + DCPOMATIC_ASSERT (_thread->joinable ()); _thread->join (); if (can_throw) { rethrow (); @@ -487,46 +523,55 @@ Writer::finish () terminate_thread (true); - _picture_asset_writer->finalize (); - if (_sound_asset_writer) { - _sound_asset_writer->finalize (); - } - - /* Hard-link the video asset into the DCP */ - boost::filesystem::path video_from = _picture_asset->file (); + BOOST_FOREACH (Reel& i, _reels) { - boost::filesystem::path video_to; - video_to /= _film->dir (_film->dcp_name()); - video_to /= video_asset_filename (_picture_asset); + if (!i.picture_asset_writer->finalize ()) { + /* Nothing was written to the picture asset */ + i.picture_asset.reset (); + } - 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); + if (i.sound_asset_writer && !i.sound_asset_writer->finalize ()) { + /* Nothing was written to the sound asset */ + i.sound_asset.reset (); } - } - _picture_asset->set_file (video_to); + /* Hard-link any video asset file into the DCP */ + if (i.picture_asset) { + boost::filesystem::path video_from = i.picture_asset->file (); + boost::filesystem::path video_to; + video_to /= _film->dir (_film->dcp_name()); + video_to /= video_asset_filename (i.picture_asset); + + 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); + } + } - /* Move the audio asset into the DCP */ + i.picture_asset->set_file (video_to); + } - if (_sound_asset) { - boost::filesystem::path audio_to; - audio_to /= _film->dir (_film->dcp_name ()); - audio_to /= audio_asset_filename (_sound_asset); + /* Move the audio asset into the DCP */ + if (i.sound_asset) { + boost::filesystem::path audio_to; + audio_to /= _film->dir (_film->dcp_name ()); + audio_to /= audio_asset_filename (i.sound_asset); + + boost::system::error_code ec; + boost::filesystem::rename (_film->file (audio_asset_filename (i.sound_asset)), audio_to, ec); + if (ec) { + throw FileError ( + String::compose (_("could not move audio asset into the DCP (%1)"), ec.value ()), audio_asset_filename (i.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 asset into the DCP (%1)"), ec.value ()), audio_asset_filename (_sound_asset) - ); + i.sound_asset->set_file (audio_to); } - - _sound_asset->set_file (audio_to); } dcp::DCP dcp (_film->dir (_film->dcp_name())); @@ -540,67 +585,112 @@ Writer::finish () dcp.add (cpl); - shared_ptr reel (new dcp::Reel ()); + BOOST_FOREACH (Reel& i, _reels) { + shared_ptr reel (new dcp::Reel ()); - shared_ptr mono = dynamic_pointer_cast (_picture_asset); - if (mono) { - reel->add (shared_ptr (new dcp::ReelMonoPictureAsset (mono, 0))); - } - - shared_ptr stereo = dynamic_pointer_cast (_picture_asset); - if (stereo) { - reel->add (shared_ptr (new dcp::ReelStereoPictureAsset (stereo, 0))); - } + shared_ptr reel_picture_asset; - if (_sound_asset) { - reel->add (shared_ptr (new dcp::ReelSoundAsset (_sound_asset, 0))); - } + if (i.picture_asset) { + /* We have made a picture asset of our own. Put it into the reel */ + shared_ptr mono = dynamic_pointer_cast (i.picture_asset); + if (mono) { + reel_picture_asset.reset (new dcp::ReelMonoPictureAsset (mono, 0)); + } - 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"; + shared_ptr stereo = dynamic_pointer_cast (i.picture_asset); + if (stereo) { + reel_picture_asset.reset (new dcp::ReelStereoPictureAsset (stereo, 0)); + } + } else { + /* We don't have a picture asset of our own; maybe we need to reference one */ + /* XXX: this is all a hack */ + BOOST_FOREACH (shared_ptr j, _reel_assets) { + shared_ptr k = dynamic_pointer_cast (j); + if (k) { + reel_picture_asset = k; + } + } } - /* Add all the fonts to the subtitle content */ - BOOST_FOREACH (shared_ptr i, _fonts) { - _subtitle_asset->add_font (i->id(), i->file().get_value_or (liberation)); - } + reel->add (reel_picture_asset); - 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")); + if (i.sound_asset) { + /* We have made a sound asset of our own. Put it into the reel */ + reel->add (shared_ptr (new dcp::ReelSoundAsset (i.sound_asset, 0))); } else { - _subtitle_asset->write ( - _film->dir (_film->dcp_name ()) / ("sub_" + _subtitle_asset->id() + ".mxf") - ); + /* We don't have a sound asset of our own; maybe we need to reference one */ + /* XXX: this is all a hack */ + BOOST_FOREACH (shared_ptr j, _reel_assets) { + if (dynamic_pointer_cast (j)) { + reel->add (j); + } + } } - reel->add (shared_ptr ( - new dcp::ReelSubtitleAsset ( - _subtitle_asset, - dcp::Fraction (_film->video_frame_rate(), 1), - _picture_asset->intrinsic_duration (), - 0 - ) - )); - } + if (i.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"; + } - cpl->add (reel); + /* Add all the fonts to the subtitle content */ + BOOST_FOREACH (shared_ptr j, _fonts) { + i.subtitle_asset->add_font (j->id(), j->file().get_value_or (liberation)); + } - shared_ptr job = _job.lock (); - DCPOMATIC_ASSERT (job); + if (dynamic_pointer_cast (i.subtitle_asset)) { + boost::filesystem::path directory = _film->dir (_film->dcp_name ()) / i.subtitle_asset->id (); + boost::filesystem::create_directories (directory); + i.subtitle_asset->write (directory / ("sub_" + i.subtitle_asset->id() + ".xml")); + } else { - job->sub (_("Computing image digest")); - _picture_asset->hash (boost::bind (&Job::set_progress, job.get(), _1, false)); + /* All our assets should be the same length; use the picture asset length here + as a reference to set the subtitle one. + */ + dynamic_pointer_cast(_subtitle_asset)->set_intrinsic_duration ( + reel_picture_asset->intrinsic_duration () + ); + + i.subtitle_asset->write ( + _film->dir (_film->dcp_name ()) / ("sub_" + i.subtitle_asset->id() + ".mxf") + ); + } + + reel->add (shared_ptr ( + new dcp::ReelSubtitleAsset ( + i.subtitle_asset, + dcp::Fraction (_film->video_frame_rate(), 1), + reel_picture_asset->intrinsic_duration (), + 0 + ) + )); + } else { + /* We don't have a subtitle asset of our own; maybe we need to reference one */ + /* XXX: this is all a hack */ + BOOST_FOREACH (shared_ptr j, _reel_assets) { + if (dynamic_pointer_cast (j)) { + reel->add (j); + } + } + } + + cpl->add (reel); + + shared_ptr job = _job.lock (); + DCPOMATIC_ASSERT (job); + + job->sub (_("Computing image digest")); + if (i.picture_asset) { + i.picture_asset->hash (boost::bind (&Job::set_progress, job.get(), _1, false)); + } - if (_sound_asset) { - job->sub (_("Computing audio digest")); - _sound_asset->hash (boost::bind (&Job::set_progress, job.get(), _1, false)); + if (i.sound_asset) { + job->sub (_("Computing audio digest")); + i.sound_asset->hash (boost::bind (&Job::set_progress, job.get(), _1, false)); + } } dcp::XMLMetadata meta; @@ -632,77 +722,73 @@ Writer::finish () ); } -bool -Writer::check_existing_picture_asset_frame (FILE* asset, int f, Eyes eyes) +void +Writer::check_existing_picture_asset (Reel& reel) { - /* 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; + /* Try to open the existing asset */ + FILE* asset_file = fopen_boost (reel.picture_asset->file(), "rb"); + if (!asset_file) { + LOG_GENERAL ("Could not open existing asset at %1 (errno=%2)", reel.picture_asset->file().string(), errno); + return; } - /* Read the data from the asset and hash it */ - dcpomatic_fseek (asset, info.offset, SEEK_SET); - Data data (info.size); - size_t const read = fread (data.data().get(), 1, data.size(), asset); - if (read != static_cast (data.size ())) { - LOG_GENERAL ("Existing frame %1 is incomplete", f); - return false; - } + /* Offset of the last dcp::FrameInfo in the info file */ + int const n = (boost::filesystem::file_size (_film->info_file(reel.period)) / _info_size) - 1; - MD5Digester digester; - digester.add (data.data().get(), data.size()); - if (digester.get() != info.hash) { - LOG_GENERAL ("Existing frame %1 failed hash check", f); - return false; + FILE* info_file = fopen_boost (_film->info_file(reel.period), "rb"); + if (!info_file) { + LOG_GENERAL_NC ("Could not open film info file"); + fclose (asset_file); + return; } - return true; -} - -void -Writer::check_existing_picture_asset () -{ - /* Try to open the existing asset */ - FILE* asset = fopen_boost (_picture_asset->file(), "rb"); - if (!asset) { - LOG_GENERAL ("Could not open existing asset at %1 (errno=%2)", _picture_asset->file().string(), errno); - return; + if (_film->three_d ()) { + /* Start looking at the last left frame */ + reel.first_nonexistant_frame = n / 2; + } else { + reel.first_nonexistant_frame = n; } - while (true) { + bool ok = false; - shared_ptr job = _job.lock (); - DCPOMATIC_ASSERT (job); + 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, reel.first_nonexistant_frame, _film->three_d () ? EYES_LEFT : EYES_BOTH); - job->set_progress_unknown (); + ok = true; - if (_film->three_d ()) { - if (!check_existing_picture_asset_frame (asset, _first_nonexistant_frame, EYES_LEFT)) { - break; - } - if (!check_existing_picture_asset_frame (asset, _first_nonexistant_frame, EYES_RIGHT)) { - break; - } + /* 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", reel.first_nonexistant_frame); + ok = false; } else { - if (!check_existing_picture_asset_frame (asset, _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", reel.first_nonexistant_frame); + ok = false; } } - LOG_DEBUG_ENCODE ("Have existing frame %1", _first_nonexistant_frame); - ++_first_nonexistant_frame; + if (!ok) { + --reel.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. + */ + ++reel.first_nonexistant_frame; } - fclose (asset); + fclose (asset_file); + fclose (info_file); } /** @param frame Frame index. @@ -714,7 +800,13 @@ 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 asset writer. */ - return (frame != 0 && frame < _first_nonexistant_frame); + + /* XXX: need to correct frame to be relative to the reel, perhaps? + and clarify whether first_nonexistant_frame is relative to the start + of the DCP or of the reel. + */ + + return (frame != 0 && frame < video_reel(frame).first_nonexistant_frame); } void @@ -724,7 +816,11 @@ Writer::write (PlayerSubtitles subs) return; } - if (!_subtitle_asset) { + if (_subtitle_reel->period.to < subs.from) { + ++_subtitle_reel; + } + + if (!_subtitle_reel->subtitle_asset) { string lang = _film->subtitle_language (); if (lang.empty ()) { lang = "Unknown"; @@ -734,19 +830,21 @@ Writer::write (PlayerSubtitles subs) s->set_movie_title (_film->name ()); s->set_language (lang); s->set_reel_number ("1"); - _subtitle_asset = s; + _subtitle_reel->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 ()); - _subtitle_asset = s; + s->set_start_time (dcp::Time ()); + _subtitle_reel->subtitle_asset = s; } } for (list::const_iterator i = subs.text.begin(); i != subs.text.end(); ++i) { - _subtitle_asset->add (*i); + _subtitle_reel->subtitle_asset->add (*i); } } @@ -782,15 +880,13 @@ Writer::set_encoder_threads (int threads) long Writer::frame_info_position (int frame, Eyes eyes) const { - static int const info_size = 48; - switch (eyes) { case EYES_BOTH: - return frame * info_size; + return frame * _info_size; case EYES_LEFT: - return frame * info_size * 2; + return frame * _info_size * 2; case EYES_RIGHT: - return frame * info_size * 2 + info_size; + return frame * _info_size * 2 + _info_size; default: DCPOMATIC_ASSERT (false); } @@ -813,3 +909,22 @@ Writer::read_frame_info (FILE* file, int frame, Eyes eyes) const return info; } + +void +Writer::write (shared_ptr asset) +{ + _reel_assets.push_back (asset); +} + +Writer::Reel const & +Writer::video_reel (int frame) const +{ + DCPTime t = DCPTime::from_frames (frame, _film->video_frame_rate ()); + list::const_iterator i = _reels.begin (); + while (i != _reels.end() && !i->period.contains (t)) { + ++i; + } + + DCPOMATIC_ASSERT (i != _reels.end ()); + return *i; +}