X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=3ab1cc5b9e014aa08ce9519acd0f9d983c32dc05;hp=ae00c0122478f6d721ffa23d51dd128d8d37e603;hb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;hpb=f679e8ab99d25bcf725732e0c79b658f38a39a27 diff --git a/src/lib/writer.cc b/src/lib/writer.cc index ae00c0122..3ab1cc5b9 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -74,7 +74,9 @@ Writer::Writer (shared_ptr film, weak_ptr j) , _thread (0) , _finish (false) , _queued_full_in_memory (0) - , _maximum_frames_in_memory (0) + /* These will be reset to sensible values when J2KEncoder is created */ + , _maximum_frames_in_memory (8) + , _maximum_queue_size (8) , _full_written (0) , _fake_written (0) , _repeat_written (0) @@ -89,11 +91,13 @@ Writer::Writer (shared_ptr film, weak_ptr j) _reels.push_back (ReelWriter (film, p, job, reel_index++, reels.size(), _film->content_summary(p))); } - /* 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. + /* We can keep track of the current audio, subtitle and closed caption reels easily because audio + and captions arrive to the Writer in sequence. This is not so for video. */ _audio_reel = _reels.begin (); - _subtitle_reel = _reels.begin (); + for (int i = 0; i < CAPTION_COUNT; ++i) { + _caption_reel[i] = _reels.begin (); + } /* Check that the signer is OK if we need one */ string reason; @@ -106,6 +110,9 @@ void Writer::start () { _thread = new boost::thread (boost::bind (&Writer::thread, this)); +#ifdef DCPOMATIC_LINUX + pthread_setname_np (_thread->native_handle(), "writer"); +#endif } Writer::~Writer () @@ -125,7 +132,9 @@ Writer::write (Data encoded, Frame frame, Eyes eyes) 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 */ + /* There are too many full frames in memory; wake the main writer thread and + wait until it sorts everything out */ + _empty_condition.notify_all (); _full_condition.wait (lock); } @@ -168,8 +177,11 @@ Writer::repeat (Frame frame, Eyes eyes) { 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 */ + while (_queue.size() > _maximum_queue_size && have_sequenced_image_at_queue_head()) { + /* The queue is too big, and the main writer thread can run and fix it, so + wake it and wait until it has done. + */ + _empty_condition.notify_all (); _full_condition.wait (lock); } @@ -196,8 +208,11 @@ Writer::fake_write (Frame frame, Eyes eyes) { 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 */ + while (_queue.size() > _maximum_queue_size && have_sequenced_image_at_queue_head()) { + /* The queue is too big, and the main writer thread can run and fix it, so + wake it and wait until it has done. + */ + _empty_condition.notify_all (); _full_condition.wait (lock); } @@ -231,39 +246,62 @@ Writer::fake_write (Frame frame, Eyes eyes) } /** Write some 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). + * @param audio Audio data. + * @param time Time of this data within the DCP. * This method is not thread safe. */ void -Writer::write (shared_ptr audio) +Writer::write (shared_ptr audio, DCPTime const time) { + DCPOMATIC_ASSERT (audio); + + int const afr = _film->audio_frame_rate(); + + DCPTime const end = time + DCPTime::from_frames(audio->frames(), afr); + /* The audio we get might span a reel boundary, and if so we have to write it in bits */ - int32_t offset = 0; - while (offset < audio->frames ()) { + DCPTime t = time; + while (t < end) { if (_audio_reel == _reels.end ()) { /* This audio is off the end of the last reel; ignore it */ return; } - int32_t const this_time = min ( - audio->frames() - offset, - (int32_t) (_audio_reel->period().duration().frames_floor(_film->audio_frame_rate()) - _audio_reel->total_written_audio_frames()) - ); - - if (this_time == audio->frames()) { + if (end <= _audio_reel->period().to) { /* Easy case: we can write all the audio to this reel */ _audio_reel->write (audio); + t = end; } else { - /* Write the part we can */ - shared_ptr part (new AudioBuffers (audio->channels(), this_time)); - part->copy_from (audio.get(), this_time, offset, 0); - _audio_reel->write (part); + /* Split the audio into two and write the first part */ + DCPTime part_lengths[2] = { + _audio_reel->period().to - t, + end - _audio_reel->period().to + }; + + Frame part_frames[2] = { + part_lengths[0].frames_ceil(afr), + part_lengths[1].frames_ceil(afr) + }; + + if (part_frames[0]) { + shared_ptr part (new AudioBuffers (audio->channels(), part_frames[0])); + part->copy_from (audio.get(), part_frames[0], 0, 0); + _audio_reel->write (part); + } + + if (part_frames[1]) { + shared_ptr part (new AudioBuffers (audio->channels(), part_frames[1])); + part->copy_from (audio.get(), part_frames[1], part_frames[0], 0); + audio = part; + } else { + audio.reset (); + } + ++_audio_reel; + t += part_lengths[0]; } - - offset += this_time; } } @@ -379,6 +417,7 @@ try } lock.lock (); + _full_condition.notify_all (); } while (_queued_full_in_memory > _maximum_frames_in_memory) { @@ -414,10 +453,8 @@ try lock.lock (); i->encoded.reset (); --_queued_full_in_memory; + _full_condition.notify_all (); } - - /* The queue has probably just gone down a bit; notify anything wait()ing on _full_condition */ - _full_condition.notify_all (); } } catch (...) @@ -556,7 +593,7 @@ Writer::write_cover_sheet () string text = Config::instance()->cover_sheet (); boost::algorithm::replace_all (text, "$CPL_NAME", _film->name()); boost::algorithm::replace_all (text, "$TYPE", _film->dcp_content_type()->pretty_name()); - boost::algorithm::replace_all (text, "$CONTAINER", _film->container()->nickname()); + boost::algorithm::replace_all (text, "$CONTAINER", _film->container()->container_nickname()); boost::algorithm::replace_all (text, "$AUDIO_LANGUAGE", _film->isdcf_metadata().audio_language); boost::algorithm::replace_all (text, "$SUBTITLE_LANGUAGE", _film->isdcf_metadata().subtitle_language); @@ -565,7 +602,9 @@ Writer::write_cover_sheet () boost::filesystem::recursive_directory_iterator i = boost::filesystem::recursive_directory_iterator(_film->dir(_film->dcp_name())); i != boost::filesystem::recursive_directory_iterator(); ++i) { - size += boost::filesystem::file_size (i->path ()); + if (boost::filesystem::is_regular_file (i->path ())) { + size += boost::filesystem::file_size (i->path ()); + } } if (size > (1000000000L)) { @@ -609,6 +648,11 @@ Writer::write_cover_sheet () bool Writer::can_fake_write (Frame frame) const { + if (_film->encrypted()) { + /* We need to re-write the frame because the asset ID is embedded in the HMAC... I think... */ + return false; + } + /* We have to do a proper write of the first frame so that we can set up the JPEG2000 parameters in the asset writer. */ @@ -621,17 +665,16 @@ Writer::can_fake_write (Frame frame) const } void -Writer::write (PlayerSubtitles subs, DCPTimePeriod period) +Writer::write (PlayerText text, TextType type, DCPTimePeriod period) { - if (subs.text.empty ()) { - return; + while (_caption_reel[type]->period().to <= period.from) { + ++_caption_reel[type]; + DCPOMATIC_ASSERT (_caption_reel[type] != _reels.end()); } - if (_subtitle_reel->period().to <= period.from) { - ++_subtitle_reel; - } + DCPOMATIC_ASSERT (_caption_reel[type] != _reels.end()); - _subtitle_reel->write (subs); + _caption_reel[type]->write (text, type, period); } void @@ -676,16 +719,9 @@ operator== (QueueItem const & a, QueueItem const & b) void Writer::set_encoder_threads (int threads) { - /* I think the scaling factor here should be the ratio of the longest frame - encode time to the shortest; if the thread count is T, longest time is L - and the shortest time S we could encode L/S frames per thread whilst waiting - for the L frame to encode so we might have to store LT/S frames. - - However we don't want to use too much memory, so keep it a bit lower than we'd - perhaps like. A J2K frame is typically about 1Mb so 3 here will mean we could - use about 240Mb with 72 encoding threads. - */ - _maximum_frames_in_memory = lrint (threads * 3); + boost::mutex::scoped_lock lm (_state_mutex); + _maximum_frames_in_memory = lrint (threads * Config::instance()->frames_in_memory_multiplier()); + _maximum_queue_size = threads * 16; } void