X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=b08b9caf18a0d7f3f7166f959662c0dd16fbffc9;hb=db468a15e50c8491d4b8462ad0676be905f49065;hp=7f338e2382ae308561a8e58c89797548c8ceb375;hpb=8e7d91ac8b945d66a65fc7b20249cd1c7796c7fa;p=dcpomatic.git diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 7f338e238..b08b9caf1 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -28,26 +28,38 @@ #include "format.h" #include "log.h" #include "dcp_video_frame.h" +#include "playlist.h" + +#include "i18n.h" using std::make_pair; using std::pair; using std::string; using std::ifstream; +using std::list; using std::cout; using boost::shared_ptr; -unsigned int const Writer::_maximum_frames_in_memory = 8; +int const Writer::_maximum_frames_in_memory = 8; Writer::Writer (shared_ptr f) : _film (f) , _first_nonexistant_frame (0) , _thread (0) , _finish (false) + , _queued_full_in_memory (0) , _last_written_frame (-1) + , _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 (); - /* Create our picture asset in a subdirectory, named according to the + /* 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. */ @@ -56,27 +68,29 @@ Writer::Writer (shared_ptr f) new libdcp::MonoPictureAsset ( _film->video_mxf_dir (), _film->video_mxf_filename (), - DCPFrameRate (_film->frames_per_second()).frames_per_second, - _film->format()->dcp_size() + _film->dcp_frame_rate (), + _film->format()->dcp_size () ) ); - - _picture_asset_writer = _picture_asset->start_write (); - if (_film->audio_channels() > 0) { + _picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0); + + AudioMapping m (_film->audio_channels ()); + + if (m.dcp_channels() > 0) { _sound_asset.reset ( new libdcp::SoundAsset ( _film->dir (_film->dcp_name()), - "audio.mxf", - DCPFrameRate (_film->frames_per_second()).frames_per_second, - _film->audio_channels(), - dcp_audio_sample_rate (_film->audio_stream()->sample_rate()) + N_("audio.mxf"), + _film->dcp_frame_rate (), + m.dcp_channels (), + dcp_audio_sample_rate (_film->audio_frame_rate()) ) ); _sound_asset_writer = _sound_asset->start_write (); } - + _thread = new boost::thread (boost::bind (&Writer::thread, this)); } @@ -84,7 +98,31 @@ void Writer::write (shared_ptr encoded, int frame) { boost::mutex::scoped_lock lock (_mutex); - _queue.push_back (make_pair (encoded, frame)); + + QueueItem qi; + qi.type = QueueItem::FULL; + qi.encoded = encoded; + qi.frame = frame; + _queue.push_back (qi); + ++_queued_full_in_memory; + + _condition.notify_all (); +} + +void +Writer::fake_write (int frame) +{ + boost::mutex::scoped_lock lock (_mutex); + + ifstream ifi (_film->info_path (frame).c_str()); + libdcp::FrameInfo info (ifi); + + QueueItem qi; + qi.type = QueueItem::FAKE; + qi.size = info.size; + qi.frame = frame; + _queue.push_back (qi); + _condition.notify_all (); } @@ -95,99 +133,104 @@ Writer::write (shared_ptr audio) _sound_asset_writer->write (audio->data(), audio->frames()); } -struct QueueSorter -{ - bool operator() (pair, int> const & a, pair, int> const & b) { - return a.second < b.second; - } -}; - void Writer::thread () +try { while (1) { boost::mutex::scoped_lock lock (_mutex); while (1) { + + _queue.sort (); + if (_finish || - _queue.size() > _maximum_frames_in_memory || - (!_queue.empty() && _queue.front().second == (_last_written_frame + 1))) { - - break; - } - - TIMING ("writer sleeps with a queue of %1; %2 pending", _queue.size(), _pending.size()); - _condition.wait (lock); - TIMING ("writer wakes with a queue of %1", _queue.size()); - - _queue.sort (QueueSorter ()); + _queued_full_in_memory > _maximum_frames_in_memory || + (!_queue.empty() && _queue.front().frame == (_last_written_frame + 1))) { + + 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()); } - if (_finish && _queue.empty() && _pending.empty()) { + if (_finish && _queue.empty()) { return; } /* Write any frames that we can write; i.e. those that are in sequence */ - while (!_queue.empty() && _queue.front().second == (_last_written_frame + 1)) { - pair, int> encoded = _queue.front (); + while (!_queue.empty() && _queue.front().frame == (_last_written_frame + 1)) { + QueueItem qi = _queue.front (); _queue.pop_front (); + if (qi.type == QueueItem::FULL && qi.encoded) { + --_queued_full_in_memory; + } lock.unlock (); - _film->log()->log (String::compose ("Writer writes %1 to MXF", encoded.second)); - if (encoded.first) { - libdcp::FrameInfo const fin = _picture_asset_writer->write (encoded.first->data(), encoded.first->size()); - encoded.first->write_info (_film, encoded.second, fin); - _last_written = encoded.first; - } else { + switch (qi.type) { + case QueueItem::FULL: + { + _film->log()->log (String::compose (N_("Writer FULL-writes %1 to MXF"), qi.frame)); + if (!qi.encoded) { + qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, false))); + } + libdcp::FrameInfo const fin = _picture_asset_writer->write (qi.encoded->data(), qi.encoded->size()); + qi.encoded->write_info (_film, qi.frame, fin); + _last_written = 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); + _last_written.reset (); + ++_fake_written; + break; + case QueueItem::REPEAT: + { + _film->log()->log (String::compose (N_("Writer REPEAT-writes %1 to MXF"), qi.frame)); libdcp::FrameInfo const fin = _picture_asset_writer->write (_last_written->data(), _last_written->size()); - _last_written->write_info (_film, encoded.second, fin); + _last_written->write_info (_film, qi.frame, fin); + ++_repeat_written; + break; + } } lock.lock (); ++_last_written_frame; } - while (_queue.size() > _maximum_frames_in_memory) { + while (_queued_full_in_memory > _maximum_frames_in_memory) { /* Too many frames in memory which can't yet be written to the stream. - Put some to disk. + Write some FULL frames to disk. */ - pair, int> encoded = _queue.back (); - _queue.pop_back (); - if (!encoded.first) { - /* This is a `repeat-last' frame, so no need to write it to disk */ - continue; + /* Find one */ + list::reverse_iterator i = _queue.rbegin (); + while (i != _queue.rend() && (i->type != QueueItem::FULL || !i->encoded)) { + ++i; } - lock.unlock (); - _film->log()->log (String::compose ("Writer full (awaiting %1); pushes %2 to disk", _last_written_frame + 1, encoded.second)); - encoded.first->write (_film, encoded.second); - lock.lock (); - - _pending.push_back (encoded.second); - } - - while (_queue.size() < _maximum_frames_in_memory && !_pending.empty()) { - /* We have some space in memory. Fetch some frames back off disk. */ - - _pending.sort (); - int const fetch = _pending.front (); + assert (i != _queue.rend()); + QueueItem qi = *i; + ++_pushed_to_disk; + lock.unlock (); - _film->log()->log (String::compose ("Writer pulls %1 back from disk", fetch)); - shared_ptr encoded; - if (boost::filesystem::exists (_film->j2c_path (fetch, false))) { - /* It's an actual frame (not a repeat-last); load it in */ - encoded.reset (new EncodedData (_film->j2c_path (fetch, false))); - } + _film->log()->log (String::compose (N_("Writer full (awaiting %1); pushes %2 to disk"), _last_written_frame + 1, qi.frame)); + qi.encoded->write (_film, qi.frame); lock.lock (); - - _queue.push_back (make_pair (encoded, fetch)); - _pending.remove (fetch); + qi.encoded.reset (); + --_queued_full_in_memory; } } - +} +catch (...) +{ + store_current (); } void @@ -203,6 +246,10 @@ Writer::finish () lock.unlock (); _thread->join (); + if (thrown ()) { + rethrow (); + } + delete _thread; _thread = 0; @@ -215,8 +262,6 @@ Writer::finish () int const frames = _last_written_frame + 1; int const duration = frames - _film->trim_start() - _film->trim_end(); - _film->set_dcp_intrinsic_duration (frames); - _picture_asset->set_entry_point (_film->trim_start ()); _picture_asset->set_duration (duration); @@ -228,14 +273,20 @@ Writer::finish () boost::filesystem::path to; to /= _film->dir (_film->dcp_name()); - to /= "video.mxf"; - - boost::filesystem::create_hard_link (from, to); + to /= N_("video.mxf"); + + boost::system::error_code ec; + boost::filesystem::create_hard_link (from, 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"); + } /* And update the asset */ _picture_asset->set_directory (_film->dir (_film->dcp_name ())); - _picture_asset->set_file_name ("video.mxf"); + _picture_asset->set_file_name (N_("video.mxf")); if (_sound_asset) { _sound_asset->set_entry_point (_film->trim_start ()); @@ -243,10 +294,15 @@ Writer::finish () } libdcp::DCP dcp (_film->dir (_film->dcp_name())); - DCPFrameRate dfr (_film->frames_per_second ()); shared_ptr cpl ( - new libdcp::CPL (_film->dir (_film->dcp_name()), _film->dcp_name(), _film->dcp_content_type()->libdcp_kind (), frames, dfr.frames_per_second) + new libdcp::CPL ( + _film->dir (_film->dcp_name()), + _film->dcp_name(), + _film->dcp_content_type()->libdcp_kind (), + frames, + _film->dcp_frame_rate () + ) ); dcp.add_cpl (cpl); @@ -259,6 +315,8 @@ Writer::finish () )); dcp.write_xml (); + + _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)); } /** Tell the writer that frame `f' should be a repeat of the frame before it */ @@ -266,26 +324,30 @@ void Writer::repeat (int f) { boost::mutex::scoped_lock lock (_mutex); - _queue.push_back (make_pair (shared_ptr (), f)); + + QueueItem qi; + qi.type = QueueItem::REPEAT; + qi.frame = f; + + _queue.push_back (qi); + + _condition.notify_all (); } + void Writer::check_existing_picture_mxf () { + /* Try to open the existing MXF */ boost::filesystem::path p; p /= _film->video_mxf_dir (); p /= _film->video_mxf_filename (); - if (!boost::filesystem::exists (p)) { - return; - } - - /* Try to open the picture MXF */ - FILE* mxf = fopen (p.string().c_str(), "rb"); + FILE* mxf = fopen (p.string().c_str(), N_("rb")); if (!mxf) { return; } - while (_first_nonexistant_frame < _film->dcp_intrinsic_duration ()) { + while (1) { /* Read the frame info as written */ ifstream ifi (_film->info_path (_first_nonexistant_frame).c_str()); @@ -293,20 +355,42 @@ Writer::check_existing_picture_mxf () /* Read the data from the MXF and hash it */ fseek (mxf, info.offset, SEEK_SET); - uint8_t* data = new uint8_t[info.length]; - fread (data, 1, info.length, mxf); - string const existing_hash = md5_digest (data, info.length); - delete[] data; + EncodedData data (info.size); + fread (data.data(), 1, data.size(), mxf); + string const existing_hash = md5_digest (data.data(), data.size()); if (existing_hash != info.hash) { - cout << "frame " << _first_nonexistant_frame << " failed hash check.\n"; + _film->log()->log (String::compose (N_("Existing frame %1 failed hash check"), _first_nonexistant_frame)); break; } - cout << "frame " << _first_nonexistant_frame << " ok.\n"; + _film->log()->log (String::compose (N_("Have existing frame %1"), _first_nonexistant_frame)); ++_first_nonexistant_frame; } fclose (mxf); } +/** @param frame Frame index. + * @return true if we can fake-write this frame. + */ +bool +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 MXF writer. + */ + return (frame != 0 && frame < _first_nonexistant_frame); +} + +bool +operator< (QueueItem const & a, QueueItem const & b) +{ + return a.frame < b.frame; +} + +bool +operator== (QueueItem const & a, QueueItem const & b) +{ + return a.frame == b.frame; +}