X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=2a9b6d6d7414a5752dab0cd78f38fa8c6ff6e090;hb=6c19b21e12f73ce63edd406ea617ff25bcc9bfea;hp=3f856737b2e00b7fbc13ce342a068e8b66bfc485;hpb=295b80852c986f6e3739822551821fa9231b4715;p=dcpomatic.git diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 3f856737b..2a9b6d6d7 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -30,24 +30,11 @@ #include "cross.h" #include "audio_buffers.h" #include "md5_digester.h" -#include "data.h" #include "version.h" #include "font.h" #include "util.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "reel_writer.h" #include -#include -#include -#include #include #include #include @@ -55,13 +42,13 @@ #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_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 @@ -74,18 +61,14 @@ using std::cout; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; - -int const Writer::_info_size = 48; +using dcp::Data; 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) @@ -98,53 +81,15 @@ 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. - */ - - 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))); + BOOST_FOREACH (DCPTimePeriod p, _film->reels ()) { + _reels.push_back (ReelWriter (film, p, job)); } - _picture_asset->set_size (_film->frame_size ()); - - if (_film->encrypted ()) { - _picture_asset->set_key (_film->key ()); - } - - _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_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 ()); - } - - /* 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 - ); - } + /* 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 ()) { @@ -165,8 +110,14 @@ 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 (Data encoded, int frame, Eyes eyes) +Writer::write (Data encoded, Frame frame, Eyes eyes) { boost::mutex::scoped_lock lock (_state_mutex); @@ -178,7 +129,8 @@ Writer::write (Data 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 */ @@ -198,8 +150,18 @@ Writer::write (Data 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::repeat (int frame, Eyes eyes) +Writer::repeat (Frame frame, Eyes eyes) { boost::mutex::scoped_lock lock (_state_mutex); @@ -210,7 +172,8 @@ Writer::repeat (int frame, Eyes eyes) QueueItem qi; qi.type = QueueItem::REPEAT; - qi.frame = frame; + 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); @@ -226,7 +189,7 @@ Writer::repeat (int frame, Eyes eyes) } void -Writer::fake_write (int frame, Eyes eyes) +Writer::fake_write (Frame frame, Eyes eyes) { boost::mutex::scoped_lock lock (_state_mutex); @@ -235,17 +198,21 @@ Writer::fake_write (int frame, Eyes eyes) _full_condition.wait (lock); } - FILE* file = fopen_boost (_film->info_file (), "rb"); + 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); @@ -260,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_asset_writer) { - _sound_asset_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; } } @@ -279,45 +257,29 @@ 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; } 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 @@ -359,10 +321,10 @@ try 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 ()) { QueueItem qi = _queue.front (); @@ -372,40 +334,31 @@ try } lock.unlock (); + + ReelWriter& reel = _reels[qi.reel]; + switch (qi.type) { case QueueItem::FULL: - { LOG_DEBUG_ENCODE (N_("Writer FULL-writes %1 (%2)"), qi.frame, qi.eyes); if (!qi.encoded) { - qi.encoded = Data (_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_asset_writer->write (qi.encoded->data().get (), qi.encoded->size()); - write_frame_info (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_DEBUG_ENCODE (N_("Writer FAKE-writes %1"), qi.frame); - _picture_asset_writer->fake_write (qi.size); - _last_written[qi.eyes].reset (); + 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); - 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); + reel.repeat_write (qi.frame, qi.eyes); ++_repeat_written; break; } - lock.lock (); - _last_written_frame = qi.frame; - _last_written_eyes = qi.eyes; + lock.lock (); shared_ptr job = _job.lock (); DCPOMATIC_ASSERT (job); @@ -442,13 +395,12 @@ try 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 - ); + LOG_GENERAL ("Writer full; pushes %1 to disk", i->frame); - i->encoded->write_via_temp (_film->j2c_path (i->frame, i->eyes, true), _film->j2c_path (i->frame, i->eyes, false)); + 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) + ); lock.lock (); i->encoded.reset (); @@ -477,8 +429,10 @@ Writer::terminate_thread (bool can_throw) _full_condition.notify_all (); lock.unlock (); - DCPOMATIC_ASSERT (_thread->joinable ()); - _thread->join (); + if (_thread->joinable ()) { + _thread->join (); + } + if (can_throw) { rethrow (); } @@ -496,54 +450,8 @@ Writer::finish () terminate_thread (true); - if (!_picture_asset_writer->finalize ()) { - /* Nothing was written to the picture asset */ - _picture_asset.reset (); - } - - if (_sound_asset_writer) { - if (!_sound_asset_writer->finalize ()) { - /* Nothing was written to the sound asset */ - _sound_asset.reset (); - } - } - - /* Hard-link any video asset file into the DCP */ - if (_picture_asset) { - boost::filesystem::path video_from = _picture_asset->file (); - boost::filesystem::path video_to; - video_to /= _film->dir (_film->dcp_name()); - video_to /= video_asset_filename (_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); - } - } - - _picture_asset->set_file (video_to); - } - - /* Move the audio asset into the DCP */ - if (_sound_asset) { - boost::filesystem::path audio_to; - audio_to /= _film->dir (_film->dcp_name ()); - audio_to /= audio_asset_filename (_sound_asset); - - boost::system::error_code ec; - 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) - ); - } - - _sound_asset->set_file (audio_to); + BOOST_FOREACH (ReelWriter& i, _reels) { + i.finish (); } dcp::DCP dcp (_film->dir (_film->dcp_name())); @@ -557,109 +465,13 @@ Writer::finish () dcp.add (cpl); - shared_ptr reel (new dcp::Reel ()); - - shared_ptr reel_picture_asset; - - if (_picture_asset) { - /* We have made a picture asset of our own. Put it into the reel */ - shared_ptr mono = dynamic_pointer_cast (_picture_asset); - if (mono) { - reel_picture_asset.reset (new dcp::ReelMonoPictureAsset (mono, 0)); - } - - shared_ptr stereo = dynamic_pointer_cast (_picture_asset); - if (stereo && boost::filesystem::exists (stereo->file ())) { - 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 i, _reel_assets) { - shared_ptr j = dynamic_pointer_cast (i); - if (j) { - reel_picture_asset = j; - } - } - } - - reel->add (reel_picture_asset); - - if (_sound_asset) { - /* We have made a sound asset of our own. Put it into the reel */ - reel->add (shared_ptr (new dcp::ReelSoundAsset (_sound_asset, 0))); - } else { - /* 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 i, _reel_assets) { - if (dynamic_pointer_cast (i)) { - reel->add (i); - } - } - } - - 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 */ - BOOST_FOREACH (shared_ptr i, _fonts) { - _subtitle_asset->add_font (i->id(), i->file().get_value_or (liberation)); - } - - 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 { - /* 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 () - ); - - _subtitle_asset->write ( - _film->dir (_film->dcp_name ()) / ("sub_" + _subtitle_asset->id() + ".mxf") - ); - } - - reel->add (shared_ptr ( - new dcp::ReelSubtitleAsset ( - _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 i, _reel_assets) { - if (dynamic_pointer_cast (i)) { - reel->add (i); - } - } - } - - cpl->add (reel); - - shared_ptr job = _job.lock (); - DCPOMATIC_ASSERT (job); + BOOST_FOREACH (ReelWriter& i, _reels) { - job->sub (_("Computing image digest")); - if (_picture_asset) { - _picture_asset->hash (boost::bind (&Job::set_progress, job.get(), _1, false)); - } + cpl->add (i.create_reel (_reel_assets, _fonts)); - if (_sound_asset) { - job->sub (_("Computing audio digest")); - _sound_asset->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; @@ -691,85 +503,21 @@ Writer::finish () ); } -void -Writer::check_existing_picture_asset () -{ - /* 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; - } - - /* Offset of the last dcp::FrameInfo in the info file */ - int const n = (boost::filesystem::file_size (_film->info_file ()) / _info_size) - 1; - - 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; - } - - if (_film->three_d ()) { - /* Start looking at the last left frame */ - _first_nonexistant_frame = n / 2; - } else { - _first_nonexistant_frame = n; - } - - bool ok = false; - - 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); - - 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 { - 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; - } - } - - 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 (asset_file); - fclose (info_file); -} - -/** @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 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 @@ -779,32 +527,11 @@ Writer::write (PlayerSubtitles subs) return; } - if (!_subtitle_asset) { - string lang = _film->subtitle_language (); - if (lang.empty ()) { - lang = "Unknown"; - } - 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; - } + if (_subtitle_reel->period().to <= subs.from) { + ++_subtitle_reel; } - for (list::const_iterator i = subs.text.begin(); i != subs.text.end(); ++i) { - _subtitle_asset->add (*i); - } + _subtitle_reel->write (subs); } void @@ -817,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; } @@ -827,7 +558,7 @@ 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; } void @@ -836,41 +567,21 @@ Writer::set_encoder_threads (int threads) _maximum_frames_in_memory = lrint (threads * 1.1); } -long -Writer::frame_info_position (int frame, Eyes eyes) const +void +Writer::write (ReferencedReelAsset asset) { - 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); + _reel_assets.push_back (asset); } -dcp::FrameInfo -Writer::read_frame_info (FILE* file, int frame, Eyes eyes) const +size_t +Writer::video_reel (int frame) 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; -} + DCPTime t = DCPTime::from_frames (frame, _film->video_frame_rate ()); + size_t i = 0; + while (i < _reels.size() && !_reels[i].period().contains (t)) { + ++i; + } -void -Writer::write (shared_ptr asset) -{ - _reel_assets.push_back (asset); + DCPOMATIC_ASSERT (i < _reels.size ()); + return i; }