X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=7b2cfa3d215fdf528f19224125dc700db43a8cf0;hb=0242efb9802d7bcbde0701a7267972d4dbe5abb8;hp=a0a57e0bbd84a66a506ba547757f9c6edc9e8e27;hpb=5c0a67869dbddb924c9f5ccb4126aa06d85b9b8b;p=dcpomatic.git diff --git a/src/lib/writer.cc b/src/lib/writer.cc index a0a57e0bb..7b2cfa3d2 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include @@ -55,12 +55,11 @@ #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_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 @@ -74,8 +73,8 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; -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) @@ -86,6 +85,7 @@ Writer::Writer (shared_ptr f, weak_ptr j) , _maximum_frames_in_memory (0) , _full_written (0) , _fake_written (0) + , _repeat_written (0) , _pushed_to_disk (0) { /* Remove any old DCP */ @@ -117,7 +117,7 @@ Writer::Writer (shared_ptr f, weak_ptr j) 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, @@ -132,7 +132,7 @@ Writer::Writer (shared_ptr f, weak_ptr j) 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. */ @@ -158,7 +158,7 @@ Writer::~Writer () } void -Writer::write (shared_ptr encoded, int frame, Eyes eyes) +Writer::write (Data encoded, int frame, Eyes eyes) { boost::mutex::scoped_lock lock (_mutex); @@ -190,6 +190,33 @@ Writer::write (shared_ptr encoded, int frame, Eyes eyes) _empty_condition.notify_all (); } +void +Writer::repeat (int frame, Eyes eyes) +{ + boost::mutex::scoped_lock lock (_mutex); + + while (_queued_full_in_memory > _maximum_frames_in_memory) { + /* The queue is too big; wait until that is sorted out */ + _full_condition.wait (lock); + } + + QueueItem qi; + qi.type = QueueItem::REPEAT; + qi.frame = frame; + if (_film->three_d() && eyes == EYES_BOTH) { + qi.eyes = EYES_LEFT; + _queue.push_back (qi); + qi.eyes = EYES_RIGHT; + _queue.push_back (qi); + } else { + qi.eyes = eyes; + _queue.push_back (qi); + } + + /* Now there's something to do: wake anything wait()ing on _empty_condition */ + _empty_condition.notify_all (); +} + void Writer::fake_write (int frame, Eyes eyes) { @@ -199,14 +226,14 @@ Writer::fake_write (int frame, Eyes eyes) /* 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; @@ -264,6 +291,20 @@ Writer::have_sequenced_image_at_queue_head () return false; } +void +Writer::write_frame_info (int frame, Eyes eyes, dcp::FrameInfo info) const +{ + FILE* file = fopen_boost (_film->info_file(), "ab"); + 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 @@ -272,11 +313,8 @@ try { boost::mutex::scoped_lock lock (_mutex); - /* 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 ()) { /* We've got something to do: go and do it */ break; @@ -298,7 +336,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()); @@ -307,7 +344,7 @@ try LOG_WARNING (N_("- type FULL, frame %1, eyes %2"), i->frame, i->eyes); } else { LOG_WARNING (N_("- type FAKE, size %1, frame %2, eyes %3"), i->size, i->frame, i->eyes); - } + } } LOG_WARNING (N_("Last written frame %1, last written eyes %2"), _last_written_frame, _last_written_eyes); } @@ -315,7 +352,6 @@ try } /* Write any frames that we can write; i.e. those that are in sequence. */ while (have_sequenced_image_at_queue_head ()) { - done_something = true; QueueItem qi = _queue.front (); _queue.pop_front (); if (qi.type == QueueItem::FULL && qi.encoded) { @@ -326,37 +362,41 @@ try switch (qi.type) { case QueueItem::FULL: { - LOG_GENERAL (N_("Writer FULL-writes %1 (%2)"), qi.frame, qi.eyes); + LOG_DEBUG_ENCODE (N_("Writer FULL-writes %1 (%2)"), qi.frame, qi.eyes); if (!qi.encoded) { - qi.encoded.reset (new Data (_film->j2c_path (qi.frame, qi.eyes, false))); + 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()); - FILE* file = fopen_boost (_film->info_file(), "ab"); - if (!file) { - throw OpenFileError (_film->info_file ()); - } - write_frame_info (file, qi.frame, qi.eyes, fin); - fclose (file); + write_frame_info (qi.frame, qi.eyes, fin); _last_written[qi.eyes] = qi.encoded; ++_full_written; break; } case QueueItem::FAKE: - LOG_GENERAL (N_("Writer FAKE-writes %1"), qi.frame); + LOG_DEBUG_ENCODE (N_("Writer FAKE-writes %1"), qi.frame); _picture_asset_writer->fake_write (qi.size); _last_written[qi.eyes].reset (); ++_fake_written; break; + case QueueItem::REPEAT: + LOG_DEBUG_ENCODE (N_("Writer REPEAT-writes %1"), qi.frame); + dcp::FrameInfo fin = _picture_asset_writer->write ( + _last_written[qi.eyes]->data().get(), + _last_written[qi.eyes]->size() + ); + write_frame_info (qi.frame, qi.eyes, fin); + ++_repeat_written; + break; } lock.lock (); _last_written_frame = qi.frame; _last_written_eyes = qi.eyes; - + shared_ptr job = _job.lock (); DCPOMATIC_ASSERT (job); - int64_t total = _film->length().frames (_film->video_frame_rate ()); + int64_t total = _film->length().frames_round (_film->video_frame_rate ()); if (_film->three_d ()) { /* _full_written and so on are incremented for each eye, so we need to double the total frames to get the correct progress. @@ -364,12 +404,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; /* Too many frames in memory which can't yet be written to the stream. Write some FULL frames to disk. */ @@ -397,20 +436,12 @@ try ); i->encoded->write_via_temp (_film->j2c_path (i->frame, i->eyes, true), _film->j2c_path (i->frame, i->eyes, false)); - + lock.lock (); i->encoded.reset (); --_queued_full_in_memory; } - if (!done_something) { - LOG_DEBUG_NC ("Writer loop ran without doing anything"); - LOG_DEBUG ("_queued_full_in_memory=%1", _queued_full_in_memory); - LOG_DEBUG ("_queue_size=%1", _queue.size ()); - LOG_DEBUG ("_finish=%1", _finish); - LOG_DEBUG ("_last_written_frame=%1", _last_written_frame); - } - /* The queue has probably just gone down a bit; notify anything wait()ing on _full_condition */ _full_condition.notify_all (); } @@ -427,7 +458,7 @@ Writer::terminate_thread (bool can_throw) if (_thread == 0) { return; } - + _finish = true; _empty_condition.notify_all (); _full_condition.notify_all (); @@ -437,10 +468,10 @@ Writer::terminate_thread (bool can_throw) if (can_throw) { rethrow (); } - + delete _thread; _thread = 0; -} +} void Writer::finish () @@ -448,17 +479,17 @@ Writer::finish () if (!_thread) { return; } - + 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::filesystem::path video_to; video_to /= _film->dir (_film->dcp_name()); video_to /= video_asset_filename (_picture_asset); @@ -482,7 +513,7 @@ Writer::finish () boost::filesystem::path audio_to; audio_to /= _film->dir (_film->dcp_name ()); audio_to /= audio_asset_filename (_sound_asset); - + boost::filesystem::rename (_film->file (audio_asset_filename (_sound_asset)), audio_to, ec); if (ec) { throw FileError ( @@ -501,7 +532,7 @@ Writer::finish () _film->dcp_content_type()->libdcp_kind () ) ); - + dcp.add (cpl); shared_ptr reel (new dcp::Reel ()); @@ -537,7 +568,7 @@ Writer::finish () _film->dir (_film->dcp_name ()) / ("sub_" + _subtitle_asset->id() + ".mxf") ); } - + reel->add (shared_ptr ( new dcp::ReelSubtitleAsset ( _subtitle_asset, @@ -547,7 +578,7 @@ Writer::finish () ) )); } - + cpl->add (reel); shared_ptr job = _job.lock (); @@ -566,7 +597,7 @@ Writer::finish () meta.creator = String::compose ("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit); meta.set_issue_date_now (); - shared_ptr signer; + 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 */ @@ -578,7 +609,7 @@ 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 ); } @@ -591,14 +622,14 @@ Writer::check_existing_picture_asset_frame (FILE* asset, int f, Eyes eyes) 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 asset and hash it */ dcpomatic_fseek (asset, info.offset, SEEK_SET); Data data (info.size); @@ -648,7 +679,7 @@ Writer::check_existing_picture_asset () } } - LOG_GENERAL ("Have existing frame %1", _first_nonexistant_frame); + LOG_DEBUG_ENCODE ("Have existing frame %1", _first_nonexistant_frame); ++_first_nonexistant_frame; } @@ -692,9 +723,9 @@ Writer::write (PlayerSubtitles subs) s->set_edit_rate (dcp::Fraction (_film->video_frame_rate (), 1)); s->set_time_code_rate (_film->video_frame_rate ()); _subtitle_asset = s; - } + } } - + for (list::const_iterator i = subs.text.begin(); i != subs.text.end(); ++i) { _subtitle_asset->add (*i); } @@ -728,3 +759,39 @@ Writer::set_encoder_threads (int threads) { _maximum_frames_in_memory = rint (threads * 1.1); } + +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; + case EYES_LEFT: + return frame * info_size * 2; + case EYES_RIGHT: + return frame * info_size * 2 + info_size; + default: + DCPOMATIC_ASSERT (false); + } + + + DCPOMATIC_ASSERT (false); +} + +dcp::FrameInfo +Writer::read_frame_info (FILE* file, int frame, Eyes eyes) const +{ + dcp::FrameInfo info; + dcpomatic_fseek (file, frame_info_position (frame, eyes), SEEK_SET); + fread (&info.offset, sizeof (info.offset), 1, file); + fread (&info.size, sizeof (info.size), 1, file); + + char hash_buffer[33]; + fread (hash_buffer, 1, 32, file); + hash_buffer[32] = '\0'; + info.hash = hash_buffer; + + return info; +}