#include "audio_mapping.h"
#include "config.h"
#include "job.h"
+#include "cross.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;
+using boost::weak_ptr;
-int const Writer::_maximum_frames_in_memory = 8;
+int const Writer::_maximum_frames_in_memory = Config::instance()->num_local_encoding_threads() + 4;
-Writer::Writer (shared_ptr<const Film> f, shared_ptr<Job> j)
+Writer::Writer (shared_ptr<const Film> f, weak_ptr<Job> j)
: _film (f)
, _job (j)
, _first_nonexistant_frame (0)
/* Remove any old DCP */
boost::filesystem::remove_all (_film->dir (_film->dcp_name ()));
- _job->sub (_("Checking existing image data"));
+ shared_ptr<Job> job = _job.lock ();
+ assert (job);
+
+ job->sub (_("Checking existing image data"));
check_existing_picture_mxf ();
/* Create our picture asset in a subdirectory, named according to those
}
_picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
-
- _sound_asset.reset (new libdcp::SoundAsset (_film->dir (_film->dcp_name()), _film->audio_mxf_filename ()));
+
+ /* Write the sound asset into the film directory so that we leave the creation
+ of the DCP directory until the last minute. Some versions of windows inexplicably
+ don't like overwriting existing files here, so try to remove it using boost.
+ */
+ boost::system::error_code ec;
+ boost::filesystem::remove (_film->file (_film->audio_mxf_filename ()), ec);
+ if (ec) {
+ _film->log()->log (String::compose ("Could not remove existing audio MXF file (%1)", ec.value ()));
+ }
+
+ _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 ());
_thread = new boost::thread (boost::bind (&Writer::thread, this));
- _job->sub (_("Encoding image data"));
+ job->sub (_("Encoding image data"));
}
void
{
boost::mutex::scoped_lock lock (_mutex);
- ifstream ifi (_film->info_path (frame, eyes).string().c_str());
+ FILE* ifi = fopen_boost (_film->info_path (frame, eyes), "r");
libdcp::FrameInfo info (ifi);
+ fclose (ifi);
QueueItem qi;
qi.type = QueueItem::FAKE;
_sound_asset_writer->write (audio->data(), audio->frames());
}
-/** This must be called from Writer::thread() with an appropriate lock held,
- * and with _queue sorted.
- */
+/** This must be called from Writer::thread() with an appropriate lock held */
bool
-Writer::have_sequenced_image_at_queue_head () const
+Writer::have_sequenced_image_at_queue_head ()
{
if (_queue.empty ()) {
return false;
}
+ _queue.sort ();
+
/* The queue should contain only EYES_LEFT/EYES_RIGHT pairs or EYES_BOTH */
if (_queue.front().eyes == EYES_BOTH) {
while (1) {
- _queue.sort ();
-
if (_finish || _queued_full_in_memory > _maximum_frames_in_memory || have_sequenced_image_at_queue_head ()) {
break;
}
return;
}
- /* Write any frames that we can write; i.e. those that are in sequence */
+ /* 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 ();
_queue.pop_front ();
_last_written_eyes = qi.eyes;
if (_film->length()) {
- _job->set_progress (
- float (_full_written + _fake_written + _repeat_written) / _film->time_to_video_frames (_film->length())
- );
+ shared_ptr<Job> job = _job.lock ();
+ assert (job);
+ int total = _film->time_to_video_frames (_film->length ());
+ 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.
+ */
+ total *= 2;
+ }
+ job->set_progress (float (_full_written + _fake_written + _repeat_written) / total);
}
}
Write some FULL frames to disk.
*/
- /* Find one */
+ /* Find one from the back of the queue */
+ _queue.sort ();
list<QueueItem>::reverse_iterator i = _queue.rbegin ();
while (i != _queue.rend() && (i->type != QueueItem::FULL || !i->encoded)) {
++i;
lock.unlock ();
_thread->join ();
- if (thrown ()) {
- rethrow ();
- }
+ rethrow ();
delete _thread;
_thread = 0;
_picture_asset->set_duration (frames);
/* Hard-link the video MXF into the DCP */
-
- boost::filesystem::path from;
- from /= _film->internal_video_mxf_dir();
- from /= _film->internal_video_mxf_filename();
+ boost::filesystem::path video_from;
+ video_from /= _film->internal_video_mxf_dir();
+ video_from /= _film->internal_video_mxf_filename();
- boost::filesystem::path to;
- to /= _film->dir (_film->dcp_name());
- to /= _film->video_mxf_filename ();
+ boost::filesystem::path video_to;
+ video_to /= _film->dir (_film->dcp_name());
+ video_to /= _film->video_mxf_filename ();
boost::system::error_code ec;
- boost::filesystem::create_hard_link (from, to, ec);
+ boost::filesystem::create_hard_link (video_from, video_to, ec);
if (ec) {
/* hard link failed; copy instead */
- boost::filesystem::copy_file (from, to);
+ boost::filesystem::copy_file (video_from, video_to);
_film->log()->log ("Hard-link failed; fell back to copying");
}
_picture_asset->set_directory (_film->dir (_film->dcp_name ()));
_picture_asset->set_file_name (_film->video_mxf_filename ());
+
+ /* Move the audio MXF into the DCP */
+
+ boost::filesystem::path audio_to;
+ audio_to /= _film->dir (_film->dcp_name ());
+ audio_to /= _film->audio_mxf_filename ();
+
+ boost::filesystem::rename (_film->file (_film->audio_mxf_filename ()), audio_to, ec);
+ if (ec) {
+ throw FileError (
+ String::compose (_("could not move audio MXF into the DCP (%1)"), ec.value ()), _film->file (_film->audio_mxf_filename ())
+ );
+ }
+
+ _sound_asset->set_directory (_film->dir (_film->dcp_name ()));
_sound_asset->set_duration (frames);
libdcp::DCP dcp (_film->dir (_film->dcp_name()));
)
));
- _job->sub (_("Computing image digest"));
- _picture_asset->compute_digest (boost::bind (&Job::set_progress, _job.get(), _1));
+ shared_ptr<Job> job = _job.lock ();
+ assert (job);
+
+ job->sub (_("Computing image digest"));
+ _picture_asset->compute_digest (boost::bind (&Job::set_progress, job.get(), _1, false));
- _job->sub (_("Computing audio digest"));
- _sound_asset->compute_digest (boost::bind (&Job::set_progress, _job.get(), _1));
+ job->sub (_("Computing audio digest"));
+ _sound_asset->compute_digest (boost::bind (&Job::set_progress, job.get(), _1, false));
libdcp::XMLMetadata meta = Config::instance()->dcp_metadata ();
meta.set_issue_date_now ();
- dcp.write_xml (_film->interop (), meta, make_signer ());
+ 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));
}
Writer::check_existing_picture_mxf_frame (FILE* mxf, int f, Eyes eyes)
{
/* Read the frame info as written */
- ifstream ifi (_film->info_path (f, eyes).string().c_str());
+ FILE* ifi = fopen_boost (_film->info_path (f, eyes), "r");
+ if (!ifi) {
+ _film->log()->log (String::compose ("Existing frame %1 has no info file", f));
+ return false;
+ }
+
libdcp::FrameInfo info (ifi);
+ fclose (ifi);
if (info.size == 0) {
_film->log()->log (String::compose ("Existing frame %1 has no info file", f));
return false;
}
/* Read the data from the MXF and hash it */
-#ifdef DCPOMATIC_WINDOWS
- _fseeki64 (mxf, info.offset, SEEK_SET);
-#else
- fseek (mxf, info.offset, SEEK_SET);
-#endif
+ dcpomatic_fseek (mxf, info.offset, SEEK_SET);
EncodedData data (info.size);
size_t const read = fread (data.data(), 1, data.size(), mxf);
if (read != static_cast<size_t> (data.size ())) {
boost::filesystem::path p;
p /= _film->internal_video_mxf_dir ();
p /= _film->internal_video_mxf_filename ();
- FILE* mxf = fopen (p.string().c_str(), "rb");
+ FILE* mxf = fopen_boost (p, "rb");
if (!mxf) {
_film->log()->log (String::compose ("Could not open existing MXF at %1 (errno=%2)", p.string(), errno));
return;
while (1) {
- _job->set_progress (float (_first_nonexistant_frame) / N);
+ shared_ptr<Job> job = _job.lock ();
+ assert (job);
+
+ job->set_progress (float (_first_nonexistant_frame) / N);
if (_film->three_d ()) {
if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_LEFT)) {
projects / dcpomatic.git / blobdiff