using std::string;
using std::list;
using std::cout;
+using std::stringstream;
using boost::shared_ptr;
using boost::weak_ptr;
_picture_asset->set_edit_rate (_film->video_frame_rate ());
_picture_asset->set_size (fit_ratio_within (_film->container()->ratio(), _film->full_frame ()));
+ _picture_asset->set_interop (_film->interop ());
if (_film->encrypted ()) {
_picture_asset->set_key (_film->key ());
_picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
- /* Write the sound asset into the film directory so that we leave the creation
- of the DCP directory until the last minute.
- */
_sound_asset.reset (new libdcp::SoundAsset (_film->directory (), _film->audio_mxf_filename ()));
_sound_asset->set_edit_rate (_film->video_frame_rate ());
_sound_asset->set_channels (_film->audio_channels ());
_sound_asset->set_sampling_rate (_film->audio_frame_rate ());
+ _sound_asset->set_interop (_film->interop ());
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 ();
-#ifdef DCPOMATIC_WINDOWS
- _film->log()->log (String::compose ("DEBUG: %1", GetLastError ()));
-#endif
_thread = new boost::thread (boost::bind (&Writer::thread, this));
job->sub (_("Encoding image data"));
}
+Writer::~Writer ()
+{
+ terminate_thread (false);
+}
+
void
Writer::write (shared_ptr<const EncodedData> encoded, int frame, Eyes eyes)
{
boost::mutex::scoped_lock lock (_mutex);
+ while (_queued_full_in_memory > _maximum_frames_in_memory) {
+ _full_condition.wait (lock);
+ }
+
QueueItem qi;
qi.type = QueueItem::FULL;
qi.encoded = encoded;
++_queued_full_in_memory;
}
- _condition.notify_all ();
+ _empty_condition.notify_all ();
}
void
{
boost::mutex::scoped_lock lock (_mutex);
+ while (_queued_full_in_memory > _maximum_frames_in_memory) {
+ _full_condition.wait (lock);
+ }
+
FILE* ifi = fopen_boost (_film->info_path (frame, eyes), "r");
libdcp::FrameInfo info (ifi);
fclose (ifi);
_queue.push_back (qi);
}
- _condition.notify_all ();
+ _empty_condition.notify_all ();
}
/** This method is not thread safe */
}
TIMING (N_("writer sleeps with a queue of %1"), _queue.size());
- _condition.wait (lock);
+ _empty_condition.wait (lock);
TIMING (N_("writer wakes with a queue of %1"), _queue.size());
}
qi.encoded.reset ();
--_queued_full_in_memory;
}
+
+ _full_condition.notify_all ();
}
}
catch (...)
}
void
-Writer::finish ()
+Writer::terminate_thread (bool can_throw)
{
- if (!_thread) {
+ boost::mutex::scoped_lock lock (_mutex);
+ if (_thread == 0) {
return;
}
- boost::mutex::scoped_lock lock (_mutex);
_finish = true;
- _condition.notify_all ();
+ _empty_condition.notify_all ();
+ _full_condition.notify_all ();
lock.unlock ();
- _thread->join ();
- rethrow ();
+ _thread->join ();
+ if (can_throw) {
+ rethrow ();
+ }
delete _thread;
_thread = 0;
+}
+
+void
+Writer::finish ()
+{
+ if (!_thread) {
+ return;
+ }
+
+ terminate_thread (true);
_picture_asset_writer->finalize ();
_sound_asset_writer->finalize ();
meta.set_issue_date_now ();
dcp.write_xml (_film->interop (), meta, _film->is_signed() ? make_signer () : shared_ptr<const libdcp::Signer> ());
- _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));
+ _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 */
{
boost::mutex::scoped_lock lock (_mutex);
+ while (_queued_full_in_memory > _maximum_frames_in_memory) {
+ _full_condition.wait (lock);
+ }
+
QueueItem qi;
qi.type = QueueItem::REPEAT;
qi.frame = f;
_queue.push_back (qi);
}
- _condition.notify_all ();
+ _empty_condition.notify_all ();
}
bool
shared_ptr<Job> job = _job.lock ();
assert (job);
- job->set_progress (float (_first_nonexistant_frame) / N);
+ if (N > 0) {
+ job->set_progress (float (_first_nonexistant_frame) / N);
+ }
if (_film->three_d ()) {
if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_LEFT)) {