/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
-#include <fstream>
-#include <cerrno>
-#include <dcp/mono_picture_mxf.h>
-#include <dcp/stereo_picture_mxf.h>
-#include <dcp/sound_mxf.h>
-#include <dcp/sound_mxf_writer.h>
-#include <dcp/reel.h>
-#include <dcp/reel_mono_picture_asset.h>
-#include <dcp/reel_stereo_picture_asset.h>
-#include <dcp/reel_sound_asset.h>
-#include <dcp/reel_subtitle_asset.h>
-#include <dcp/dcp.h>
-#include <dcp/cpl.h>
-#include <dcp/signer.h>
#include "writer.h"
#include "compose.hpp"
#include "film.h"
#include "md5_digester.h"
#include "encoded_data.h"
#include "version.h"
+#include "font.h"
+#include "util.h"
+#include <dcp/mono_picture_asset.h>
+#include <dcp/stereo_picture_asset.h>
+#include <dcp/sound_asset.h>
+#include <dcp/sound_asset_writer.h>
+#include <dcp/reel.h>
+#include <dcp/reel_mono_picture_asset.h>
+#include <dcp/reel_stereo_picture_asset.h>
+#include <dcp/reel_sound_asset.h>
+#include <dcp/reel_subtitle_asset.h>
+#include <dcp/dcp.h>
+#include <dcp/cpl.h>
+#include <dcp/signer.h>
+#include <dcp/interop_subtitle_asset.h>
+#include <dcp/smpte_subtitle_asset.h>
+#include <dcp/font.h>
+#include <boost/foreach.hpp>
+#include <fstream>
+#include <cerrno>
#include "i18n.h"
#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
#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
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
-int const Writer::_maximum_frames_in_memory = Config::instance()->num_local_encoding_threads() + 4;
-
Writer::Writer (shared_ptr<const Film> f, weak_ptr<Job> j)
: _film (f)
, _job (j)
, _queued_full_in_memory (0)
, _last_written_frame (-1)
, _last_written_eyes (EYES_RIGHT)
+ , _maximum_frames_in_memory (0)
, _full_written (0)
, _fake_written (0)
, _pushed_to_disk (0)
boost::filesystem::remove_all (_film->dir (_film->dcp_name ()));
shared_ptr<Job> job = _job.lock ();
- assert (job);
-
- job->sub (_("Checking existing image data"));
- check_existing_picture_mxf ();
+ DCPOMATIC_ASSERT (job);
/* Create our picture asset in a subdirectory, named according to those
film's parameters which affect the video output. We will hard-link
*/
if (_film->three_d ()) {
- _picture_mxf.reset (new dcp::StereoPictureMXF (dcp::Fraction (_film->video_frame_rate (), 1)));
+ _picture_asset.reset (new dcp::StereoPictureAsset (dcp::Fraction (_film->video_frame_rate (), 1)));
} else {
- _picture_mxf.reset (new dcp::MonoPictureMXF (dcp::Fraction (_film->video_frame_rate (), 1)));
+ _picture_asset.reset (new dcp::MonoPictureAsset (dcp::Fraction (_film->video_frame_rate (), 1)));
}
- _picture_mxf->set_size (_film->frame_size ());
+ _picture_asset->set_size (_film->frame_size ());
if (_film->encrypted ()) {
- _picture_mxf->set_key (_film->key ());
+ _picture_asset->set_key (_film->key ());
}
+
+ _picture_asset->set_file (
+ _film->internal_video_asset_dir() / _film->internal_video_asset_filename()
+ );
+
+ job->sub (_("Checking existing image data"));
+ check_existing_picture_asset ();
- _picture_mxf_writer = _picture_mxf->start_write (
- _film->internal_video_mxf_dir() / _film->internal_video_mxf_filename(),
+ _picture_asset_writer = _picture_asset->start_write (
+ _film->internal_video_asset_dir() / _film->internal_video_asset_filename(),
_film->interop() ? dcp::INTEROP : dcp::SMPTE,
_first_nonexistant_frame > 0
);
if (_film->audio_channels ()) {
- _sound_mxf.reset (new dcp::SoundMXF (dcp::Fraction (_film->video_frame_rate(), 1), _film->audio_frame_rate (), _film->audio_channels ()));
+ _sound_asset.reset (
+ new dcp::SoundAsset (dcp::Fraction (_film->video_frame_rate(), 1), _film->audio_frame_rate (), _film->audio_channels ())
+ );
if (_film->encrypted ()) {
- _sound_mxf->set_key (_film->key ());
+ _sound_asset->set_key (_film->key ());
}
- /* Write the sound MXF into the film directory so that we leave the creation
+ /* Write the sound asset into the film directory so that we leave the creation
of the DCP directory until the last minute.
*/
- _sound_mxf_writer = _sound_mxf->start_write (_film->directory() / _film->audio_mxf_filename(), _film->interop() ? dcp::INTEROP : dcp::SMPTE);
+ _sound_asset_writer = _sound_asset->start_write (
+ _film->directory() / audio_asset_filename (_sound_asset),
+ _film->interop() ? dcp::INTEROP : dcp::SMPTE
+ );
}
/* Check that the signer is OK if we need one */
_full_condition.wait (lock);
}
- FILE* ifi = fopen_boost (_film->info_path (frame, eyes), "r");
- dcp::FrameInfo info (ifi);
- fclose (ifi);
+ 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;
void
Writer::write (shared_ptr<const AudioBuffers> audio)
{
- if (_sound_mxf_writer) {
- _sound_mxf_writer->write (audio->data(), audio->frames());
+ if (_sound_asset_writer) {
+ _sound_asset_writer->write (audio->data(), audio->frames());
}
}
{
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 ()) {
return;
}
+ /* We stop here if we have been asked to finish, and if either the queue
+ is empty or we do not have a sequenced image at its head (if this is the
+ case we will never terminate as no new frames will be sent once
+ _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());
+ for (list<QueueItem>::const_iterator i = _queue.begin(); i != _queue.end(); ++i) {
+ if (i->type == QueueItem::FULL) {
+ 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);
+ }
+ return;
+ }
/* 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) {
switch (qi.type) {
case QueueItem::FULL:
{
- LOG_GENERAL (N_("Writer FULL-writes %1 to MXF"), qi.frame);
+ LOG_GENERAL (N_("Writer FULL-writes %1 (%2)"), qi.frame, qi.eyes);
if (!qi.encoded) {
qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, qi.eyes, false)));
}
- dcp::FrameInfo fin = _picture_mxf_writer->write (qi.encoded->data(), qi.encoded->size());
+ dcp::FrameInfo fin = _picture_asset_writer->write (qi.encoded->data(), qi.encoded->size());
qi.encoded->write_info (_film, qi.frame, qi.eyes, fin);
_last_written[qi.eyes] = qi.encoded;
++_full_written;
break;
}
case QueueItem::FAKE:
- LOG_GENERAL (N_("Writer FAKE-writes %1 to MXF"), qi.frame);
- _picture_mxf_writer->fake_write (qi.size);
+ LOG_GENERAL (N_("Writer FAKE-writes %1"), qi.frame);
+ _picture_asset_writer->fake_write (qi.size);
_last_written[qi.eyes].reset ();
++_fake_written;
break;
_last_written_eyes = qi.eyes;
shared_ptr<Job> job = _job.lock ();
- assert (job);
+ DCPOMATIC_ASSERT (job);
int64_t total = _film->length().frames (_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
}
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.
*/
++i;
}
- assert (i != _queue.rend());
- QueueItem qi = *i;
-
+ DCPOMATIC_ASSERT (i != _queue.rend());
++_pushed_to_disk;
-
lock.unlock ();
+ /* i is valid here, even though we don't hold a lock on the mutex,
+ since list iterators are unaffected by insertion and only this
+ thread could erase the last item in the list.
+ */
+
LOG_GENERAL (
"Writer full (awaiting %1 [last eye was %2]); pushes %3 to disk",
_last_written_frame + 1,
- _last_written_eyes, qi.frame
+ _last_written_eyes, i->frame
);
- qi.encoded->write (_film, qi.frame, qi.eyes);
+ i->encoded->write (_film, i->frame, i->eyes);
+
lock.lock ();
- qi.encoded.reset ();
+ 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 ();
}
terminate_thread (true);
- _picture_mxf_writer->finalize ();
- if (_sound_mxf_writer) {
- _sound_mxf_writer->finalize ();
+ _picture_asset_writer->finalize ();
+ if (_sound_asset_writer) {
+ _sound_asset_writer->finalize ();
}
- /* Hard-link the video MXF into the DCP */
- boost::filesystem::path video_from;
- video_from /= _film->internal_video_mxf_dir();
- video_from /= _film->internal_video_mxf_filename();
+ /* 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 /= _film->video_mxf_filename ();
+ video_to /= video_asset_filename (_picture_asset);
boost::system::error_code ec;
boost::filesystem::create_hard_link (video_from, video_to, ec);
if (ec) {
- /* hard link failed; copy instead */
- boost::filesystem::copy_file (video_from, video_to);
- LOG_WARNING_NC ("Hard-link failed; fell back to copying");
+ LOG_WARNING_NC ("Hard-link failed; copying instead");
+ boost::filesystem::copy_file (video_from, video_to, ec);
+ if (ec) {
+ LOG_ERROR ("Failed to copy video file from %1 to %2 (%3)", video_from.string(), video_to.string(), ec.message ());
+ throw FileError (ec.message(), video_from);
+ }
}
- _picture_mxf->set_file (video_to);
+ _picture_asset->set_file (video_to);
- /* Move the audio MXF into the DCP */
+ /* Move the audio asset into the DCP */
- if (_sound_mxf) {
+ if (_sound_asset) {
boost::filesystem::path audio_to;
audio_to /= _film->dir (_film->dcp_name ());
- audio_to /= _film->audio_mxf_filename ();
+ audio_to /= audio_asset_filename (_sound_asset);
- boost::filesystem::rename (_film->file (_film->audio_mxf_filename ()), audio_to, ec);
+ boost::filesystem::rename (_film->file (audio_asset_filename (_sound_asset)), 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 ())
+ String::compose (_("could not move audio asset into the DCP (%1)"), ec.value ()), audio_asset_filename (_sound_asset)
);
}
- _sound_mxf->set_file (audio_to);
+ _sound_asset->set_file (audio_to);
}
dcp::DCP dcp (_film->dir (_film->dcp_name()));
shared_ptr<dcp::Reel> reel (new dcp::Reel ());
- shared_ptr<dcp::MonoPictureMXF> mono = dynamic_pointer_cast<dcp::MonoPictureMXF> (_picture_mxf);
+ shared_ptr<dcp::MonoPictureAsset> mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (_picture_asset);
if (mono) {
reel->add (shared_ptr<dcp::ReelPictureAsset> (new dcp::ReelMonoPictureAsset (mono, 0)));
- dcp.add (mono);
}
- shared_ptr<dcp::StereoPictureMXF> stereo = dynamic_pointer_cast<dcp::StereoPictureMXF> (_picture_mxf);
+ shared_ptr<dcp::StereoPictureAsset> stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (_picture_asset);
if (stereo) {
reel->add (shared_ptr<dcp::ReelPictureAsset> (new dcp::ReelStereoPictureAsset (stereo, 0)));
- dcp.add (stereo);
}
- if (_sound_mxf) {
- reel->add (shared_ptr<dcp::ReelSoundAsset> (new dcp::ReelSoundAsset (_sound_mxf, 0)));
- dcp.add (_sound_mxf);
+ if (_sound_asset) {
+ reel->add (shared_ptr<dcp::ReelSoundAsset> (new dcp::ReelSoundAsset (_sound_asset, 0)));
}
- if (_subtitle_content) {
- _subtitle_content->write_xml (_film->dir (_film->dcp_name ()) / _film->subtitle_xml_filename ());
+ if (_subtitle_asset) {
+ boost::filesystem::path const liberation = shared_path () / "LiberationSans-Regular.ttf";
+
+ /* Add all the fonts to the subtitle content */
+ BOOST_FOREACH (shared_ptr<Font> i, _fonts) {
+ _subtitle_asset->add_font (i->id, i->file.get_value_or (liberation));
+ }
+
+ _subtitle_asset->write (
+ _film->dir (_film->dcp_name ()) / _subtitle_asset->id () / subtitle_content_filename (_subtitle_asset)
+ );
+
reel->add (shared_ptr<dcp::ReelSubtitleAsset> (
new dcp::ReelSubtitleAsset (
- _subtitle_content,
+ _subtitle_asset,
dcp::Fraction (_film->video_frame_rate(), 1),
- _picture_mxf->intrinsic_duration (),
+ _picture_asset->intrinsic_duration (),
0
)
));
-
- dcp.add (_subtitle_content);
}
cpl->add (reel);
shared_ptr<Job> job = _job.lock ();
- assert (job);
+ DCPOMATIC_ASSERT (job);
job->sub (_("Computing image digest"));
- _picture_mxf->hash (boost::bind (&Job::set_progress, job.get(), _1, false));
+ _picture_asset->hash (boost::bind (&Job::set_progress, job.get(), _1, false));
- if (_sound_mxf) {
+ if (_sound_asset) {
job->sub (_("Computing audio digest"));
- _sound_mxf->hash (boost::bind (&Job::set_progress, job.get(), _1, false));
+ _sound_asset->hash (boost::bind (&Job::set_progress, job.get(), _1, false));
}
dcp::XMLMetadata meta;
}
bool
-Writer::check_existing_picture_mxf_frame (FILE* mxf, int f, Eyes eyes)
+Writer::check_existing_picture_asset_frame (FILE* asset, int f, Eyes eyes)
{
/* Read the frame info as written */
- FILE* ifi = fopen_boost (_film->info_path (f, eyes), "r");
- if (!ifi) {
+ FILE* file = fopen_boost (_film->info_file (), "rb");
+ if (!file) {
LOG_GENERAL ("Existing frame %1 has no info file", f);
return false;
}
- dcp::FrameInfo info (ifi);
- fclose (ifi);
+ 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 MXF and hash it */
- dcpomatic_fseek (mxf, info.offset, SEEK_SET);
+ /* Read the data from the asset and hash it */
+ dcpomatic_fseek (asset, info.offset, SEEK_SET);
EncodedData data (info.size);
- size_t const read = fread (data.data(), 1, data.size(), mxf);
+ size_t const read = fread (data.data(), 1, data.size(), asset);
if (read != static_cast<size_t> (data.size ())) {
LOG_GENERAL ("Existing frame %1 is incomplete", f);
return false;
}
void
-Writer::check_existing_picture_mxf ()
+Writer::check_existing_picture_asset ()
{
- /* Try to open the existing MXF */
- boost::filesystem::path p;
- p /= _film->internal_video_mxf_dir ();
- p /= _film->internal_video_mxf_filename ();
- FILE* mxf = fopen_boost (p, "rb");
- if (!mxf) {
- LOG_GENERAL ("Could not open existing MXF at %1 (errno=%2)", p.string(), errno);
+ /* Try to open the existing asset */
+ FILE* asset = fopen_boost (_picture_asset->file(), "rb");
+ if (!asset) {
+ LOG_GENERAL ("Could not open existing asset at %1 (errno=%2)", _picture_asset->file().string(), errno);
return;
}
- int N = 0;
- for (boost::filesystem::directory_iterator i (_film->info_dir ()); i != boost::filesystem::directory_iterator (); ++i) {
- ++N;
- }
-
while (true) {
shared_ptr<Job> job = _job.lock ();
- assert (job);
+ DCPOMATIC_ASSERT (job);
- if (N > 0) {
- job->set_progress (float (_first_nonexistant_frame) / N);
- }
+ job->set_progress_unknown ();
if (_film->three_d ()) {
- if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_LEFT)) {
+ if (!check_existing_picture_asset_frame (asset, _first_nonexistant_frame, EYES_LEFT)) {
break;
}
- if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_RIGHT)) {
+ if (!check_existing_picture_asset_frame (asset, _first_nonexistant_frame, EYES_RIGHT)) {
break;
}
} else {
- if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_BOTH)) {
+ if (!check_existing_picture_asset_frame (asset, _first_nonexistant_frame, EYES_BOTH)) {
break;
}
}
++_first_nonexistant_frame;
}
- fclose (mxf);
+ fclose (asset);
}
/** @param frame Frame index.
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.
+ parameters in the asset writer.
*/
return (frame != 0 && frame < _first_nonexistant_frame);
}
if (subs.text.empty ()) {
return;
}
-
- if (!_subtitle_content) {
- _subtitle_content.reset (
- new dcp::SubtitleContent (_film->name(), _film->isdcf_metadata().subtitle_language)
- );
+
+ if (!_subtitle_asset) {
+ string lang = _film->subtitle_language ();
+ if (lang.empty ()) {
+ lang = "Unknown";
+ }
+ if (_film->interop ()) {
+ shared_ptr<dcp::InteropSubtitleAsset> s (new dcp::InteropSubtitleAsset ());
+ s->set_movie_title (_film->name ());
+ s->set_language (lang);
+ s->set_reel_number ("1");
+ _subtitle_asset = s;
+ } else {
+ shared_ptr<dcp::SMPTESubtitleAsset> s (new dcp::SMPTESubtitleAsset ());
+ s->set_content_title_text (_film->name ());
+ s->set_language (lang);
+ 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<dcp::SubtitleString>::const_iterator i = subs.text.begin(); i != subs.text.end(); ++i) {
- _subtitle_content->add (*i);
+ _subtitle_asset->add (*i);
}
}
+void
+Writer::write (list<shared_ptr<Font> > fonts)
+{
+ /* Just keep a list of fonts and we'll deal with them in ::finish */
+ copy (fonts.begin (), fonts.end (), back_inserter (_fonts));
+}
+
bool
operator< (QueueItem const & a, QueueItem const & b)
{
{
return a.frame == b.frame && a.eyes == b.eyes;
}
+
+void
+Writer::set_encoder_threads (int threads)
+{
+ _maximum_frames_in_memory = rint (threads * 1.1);
+}
projects / dcpomatic.git / blobdiff