#include "encoded_data.h"
#include "version.h"
#include "font.h"
+#include "util.h"
#include <dcp/mono_picture_mxf.h>
#include <dcp/stereo_picture_mxf.h>
#include <dcp/sound_mxf.h>
#include <dcp/cpl.h>
#include <dcp/signer.h>
#include <dcp/interop_subtitle_content.h>
+#include <dcp/font.h>
+#include <boost/foreach.hpp>
#include <fstream>
#include <cerrno>
, _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)
_picture_mxf.reset (new dcp::MonoPictureMXF (dcp::Fraction (_film->video_frame_rate (), 1)));
}
- job->sub (_("Checking existing image data"));
- check_existing_picture_mxf ();
-
_picture_mxf->set_size (_film->frame_size ());
if (_film->encrypted ()) {
/* Write the sound MXF 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_mxf_writer = _sound_mxf->start_write (_film->directory() / audio_mxf_filename (_sound_mxf), _film->interop() ? dcp::INTEROP : dcp::SMPTE);
}
/* Check that the signer is OK if we need one */
throw InvalidSignerError ();
}
+ job->sub (_("Checking existing image data"));
+ check_existing_picture_mxf ();
+
_thread = new boost::thread (boost::bind (&Writer::thread, this));
job->sub (_("Encoding image data"));
{
boost::mutex::scoped_lock lock (_mutex);
- while (_queued_full_in_memory > maximum_frames_in_memory ()) {
+ while (_queued_full_in_memory > _maximum_frames_in_memory) {
/* The queue is too big; wait until that is sorted out */
_full_condition.wait (lock);
}
{
boost::mutex::scoped_lock lock (_mutex);
- while (_queued_full_in_memory > maximum_frames_in_memory ()) {
+ while (_queued_full_in_memory > _maximum_frames_in_memory) {
/* The queue is too big; wait until that is sorted out */
_full_condition.wait (lock);
}
while (true) {
- if (_finish || _queued_full_in_memory > maximum_frames_in_memory () || have_sequenced_image_at_queue_head ()) {
+ if (_finish || _queued_full_in_memory > _maximum_frames_in_memory || have_sequenced_image_at_queue_head ()) {
/* We've got something to do: go and do it */
break;
}
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) to MXF"), qi.frame, qi.eyes);
if (!qi.encoded) {
qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, qi.eyes, false)));
}
}
}
- while (_queued_full_in_memory > maximum_frames_in_memory ()) {
+ 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.
}
DCPOMATIC_ASSERT (i != _queue.rend());
- QueueItem qi = *i;
-
++_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;
}
boost::filesystem::path video_to;
video_to /= _film->dir (_film->dcp_name());
- video_to /= _film->video_mxf_filename ();
+ video_to /= video_mxf_filename (_picture_mxf);
boost::system::error_code ec;
boost::filesystem::create_hard_link (video_from, video_to, ec);
if (_sound_mxf) {
boost::filesystem::path audio_to;
audio_to /= _film->dir (_film->dcp_name ());
- audio_to /= _film->audio_mxf_filename ();
+ audio_to /= audio_mxf_filename (_sound_mxf);
- boost::filesystem::rename (_film->file (_film->audio_mxf_filename ()), audio_to, ec);
+ boost::filesystem::rename (_film->file (audio_mxf_filename (_sound_mxf)), 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 MXF into the DCP (%1)"), ec.value ()), audio_mxf_filename (_sound_mxf)
);
}
}
if (_subtitle_content) {
- _subtitle_content->write_xml (_film->dir (_film->dcp_name ()) / _film->subtitle_xml_filename ());
+ boost::filesystem::path const liberation = shared_path () / "LiberationSans-Regular.ttf";
+
+ /* Add all the fonts to the subtitle content and as assets to the DCP */
+ BOOST_FOREACH (shared_ptr<Font> i, _fonts) {
+ boost::filesystem::path const from = i->file.get_value_or (liberation);
+ _subtitle_content->add_font (i->id, from.leaf().string ());
+
+ boost::filesystem::path to = _film->dir (_film->dcp_name ()) / _subtitle_content->id ();
+ boost::filesystem::create_directories (to, ec);
+ if (ec) {
+ throw FileError (_("Could not create directory"), to);
+ }
+
+ to /= from.leaf();
+
+ boost::system::error_code ec;
+ boost::filesystem::copy_file (from, to, ec);
+ if (ec) {
+ throw FileError ("Could not copy font to DCP", from);
+ }
+
+ dcp.add (shared_ptr<dcp::Font> (new dcp::Font (to)));
+ }
+
+ _subtitle_content->write_xml (_film->dir (_film->dcp_name ()) / _subtitle_content->id () / subtitle_content_filename (_subtitle_content));
reel->add (shared_ptr<dcp::ReelSubtitleAsset> (
new dcp::ReelSubtitleAsset (
_subtitle_content,
}
if (!_subtitle_content) {
- _subtitle_content.reset (new dcp::InteropSubtitleContent (_film->name(), _film->subtitle_language ()));
+ string lang = _film->subtitle_language ();
+ if (lang.empty ()) {
+ lang = "Unknown";
+ }
+ _subtitle_content.reset (new dcp::InteropSubtitleContent (_film->name(), lang));
}
for (list<dcp::SubtitleString>::const_iterator i = subs.text.begin(); i != subs.text.end(); ++i) {
void
Writer::write (list<shared_ptr<Font> > fonts)
{
- if (fonts.empty ()) {
- return;
- }
-
- if (!_subtitle_content) {
- _subtitle_content.reset (new dcp::InteropSubtitleContent (_film->name(), _film->subtitle_language ()));
- }
-
- for (list<shared_ptr<Font> >::const_iterator i = fonts.begin(); i != fonts.end(); ++i) {
- /* XXX: this LiberationSans-Regular needs to be a path to a DCP-o-matic-distributed copy */
- _subtitle_content->add_font ((*i)->id, (*i)->file.get_value_or ("LiberationSans-Regular.ttf").leaf().string ());
- }
+ /* Just keep a list of fonts and we'll deal with them in ::finish */
+ copy (fonts.begin (), fonts.end (), back_inserter (_fonts));
}
bool
return a.frame == b.frame && a.eyes == b.eyes;
}
-int
-Writer::maximum_frames_in_memory () const
+void
+Writer::set_encoder_threads (int threads)
{
- return Config::instance()->num_local_encoding_threads() + 4;
+ _maximum_frames_in_memory = rint (threads * 1.1);
}
projects / dcpomatic.git / blobdiff