/*
- 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 <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>
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)
shared_ptr<Job> job = _job.lock ();
DCPOMATIC_ASSERT (job);
- job->sub (_("Checking existing image data"));
- check_existing_picture_mxf ();
-
/* Create our picture asset in a subdirectory, named according to those
film's parameters which affect the video output. We will hard-link
it into the DCP later.
_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 ()) {
{
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);
}
- 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;
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;
}
}
}
- 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;
}
}
/* 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();
+ boost::filesystem::path video_from = _picture_mxf->file ();
boost::filesystem::path video_to;
video_to /= _film->dir (_film->dcp_name());
}
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 () / _film->subtitle_xml_filename ());
reel->add (shared_ptr<dcp::ReelSubtitleAsset> (
new dcp::ReelSubtitleAsset (
_subtitle_content,
Writer::check_existing_picture_mxf_frame (FILE* mxf, 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;
Writer::check_existing_picture_mxf ()
{
/* 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");
+ FILE* mxf = fopen_boost (_picture_mxf->file(), "rb");
if (!mxf) {
- LOG_GENERAL ("Could not open existing MXF at %1 (errno=%2)", p.string(), errno);
+ LOG_GENERAL ("Could not open existing MXF at %1 (errno=%2)", _picture_mxf->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 ();
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 (!_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
+{
+ return Config::instance()->num_local_encoding_threads() + 4;
+}