#include "i18n.h"
#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_GENERAL);
#define LOG_DEBUG_ENCODE(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_DEBUG_ENCODE);
#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);
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
+int const Writer::_info_size = 48;
+
Writer::Writer (shared_ptr<const Film> film, weak_ptr<Job> j)
: _film (film)
, _job (j)
throw InvalidSignerError ();
}
- _thread = new boost::thread (boost::bind (&Writer::thread, this));
-
job->sub (_("Encoding image data"));
}
+void
+Writer::start ()
+{
+ _thread = new boost::thread (boost::bind (&Writer::thread, this));
+}
+
Writer::~Writer ()
{
terminate_thread (false);
void
Writer::write (Data encoded, int frame, Eyes eyes)
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock lock (_state_mutex);
while (_queued_full_in_memory > _maximum_frames_in_memory) {
/* The queue is too big; wait until that is sorted out */
void
Writer::repeat (int frame, Eyes eyes)
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock lock (_state_mutex);
while (_queued_full_in_memory > _maximum_frames_in_memory) {
/* The queue is too big; wait until that is sorted out */
void
Writer::fake_write (int frame, Eyes eyes)
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock lock (_state_mutex);
while (_queued_full_in_memory > _maximum_frames_in_memory) {
/* The queue is too big; wait until that is sorted out */
void
Writer::write_frame_info (int frame, Eyes eyes, dcp::FrameInfo info) const
{
- FILE* file = fopen_boost (_film->info_file(), "ab");
+ FILE* file = 0;
+ if (boost::filesystem::exists (_film->info_file ())) {
+ file = fopen_boost (_film->info_file(), "r+b");
+ } else {
+ file = fopen_boost (_film->info_file(), "wb");
+ }
if (!file) {
throw OpenFileError (_film->info_file ());
}
{
while (true)
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock lock (_state_mutex);
while (true) {
}
/* Nothing to do: wait until something happens which may indicate that we do */
- LOG_TIMING (N_("writer sleeps with a queue of %1"), _queue.size());
+ LOG_TIMING (N_("writer-sleep queue=%1"), _queue.size());
_empty_condition.wait (lock);
- LOG_TIMING (N_("writer wakes with a queue of %1"), _queue.size());
+ LOG_TIMING (N_("writer-wake queue=%1"), _queue.size());
}
if (_finish && _queue.empty()) {
void
Writer::terminate_thread (bool can_throw)
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock lock (_state_mutex);
if (_thread == 0) {
return;
}
}
if (_subtitle_asset) {
- boost::filesystem::path const liberation = shared_path () / "LiberationSans-Regular.ttf";
+ boost::filesystem::path liberation;
+ try {
+ liberation = shared_path () / "LiberationSans-Regular.ttf";
+ } catch (boost::filesystem::filesystem_error& e) {
+ /* Hack: try the debian/ubuntu location if getting the shared path failed */
+ liberation = "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf";
+ }
/* Add all the fonts to the subtitle content */
BOOST_FOREACH (shared_ptr<Font> i, _fonts) {
}
dcp::XMLMetadata meta;
- meta.creator = String::compose ("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit);
+ meta.creator = Config::instance()->dcp_creator ();
+ if (meta.creator.empty ()) {
+ meta.creator = String::compose ("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit);
+ }
meta.issuer = Config::instance()->dcp_issuer ();
if (meta.issuer.empty ()) {
- meta.issuer = meta.creator;
+ meta.issuer = String::compose ("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit);
}
meta.set_issue_date_now ();
);
}
-bool
-Writer::check_existing_picture_asset_frame (FILE* asset, int f, Eyes eyes)
-{
- /* Read the frame info as written */
- 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 = 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 asset and hash it */
- dcpomatic_fseek (asset, info.offset, SEEK_SET);
- Data data (info.size);
- size_t const read = fread (data.data().get(), 1, data.size(), asset);
- if (read != static_cast<size_t> (data.size ())) {
- LOG_GENERAL ("Existing frame %1 is incomplete", f);
- return false;
- }
-
- MD5Digester digester;
- digester.add (data.data().get(), data.size());
- if (digester.get() != info.hash) {
- LOG_GENERAL ("Existing frame %1 failed hash check", f);
- return false;
- }
-
- return true;
-}
-
void
Writer::check_existing_picture_asset ()
{
/* Try to open the existing asset */
- FILE* asset = fopen_boost (_picture_asset->file(), "rb");
- if (!asset) {
+ FILE* asset_file = fopen_boost (_picture_asset->file(), "rb");
+ if (!asset_file) {
LOG_GENERAL ("Could not open existing asset at %1 (errno=%2)", _picture_asset->file().string(), errno);
return;
}
- while (true) {
+ /* Offset of the last dcp::FrameInfo in the info file */
+ int const n = (boost::filesystem::file_size (_film->info_file ()) / _info_size) - 1;
- shared_ptr<Job> job = _job.lock ();
- DCPOMATIC_ASSERT (job);
+ FILE* info_file = fopen_boost (_film->info_file (), "rb");
+ if (!info_file) {
+ LOG_GENERAL_NC ("Could not open film info file");
+ fclose (asset_file);
+ return;
+ }
- job->set_progress_unknown ();
+ if (_film->three_d ()) {
+ /* Start looking at the last left frame */
+ _first_nonexistant_frame = n / 2;
+ } else {
+ _first_nonexistant_frame = n;
+ }
- if (_film->three_d ()) {
- if (!check_existing_picture_asset_frame (asset, _first_nonexistant_frame, EYES_LEFT)) {
- break;
- }
- if (!check_existing_picture_asset_frame (asset, _first_nonexistant_frame, EYES_RIGHT)) {
- break;
- }
+ bool ok = false;
+
+ while (!ok) {
+ /* Read the data from the info file; for 3D we just check the left
+ frames until we find a good one.
+ */
+ dcp::FrameInfo info = read_frame_info (info_file, _first_nonexistant_frame, _film->three_d () ? EYES_LEFT : EYES_BOTH);
+
+ ok = true;
+
+ /* Read the data from the asset and hash it */
+ dcpomatic_fseek (asset_file, info.offset, SEEK_SET);
+ Data data (info.size);
+ size_t const read = fread (data.data().get(), 1, data.size(), asset_file);
+ if (read != static_cast<size_t> (data.size ())) {
+ LOG_GENERAL ("Existing frame %1 is incomplete", _first_nonexistant_frame);
+ ok = false;
} else {
- if (!check_existing_picture_asset_frame (asset, _first_nonexistant_frame, EYES_BOTH)) {
- break;
+ MD5Digester digester;
+ digester.add (data.data().get(), data.size());
+ if (digester.get() != info.hash) {
+ LOG_GENERAL ("Existing frame %1 failed hash check", _first_nonexistant_frame);
+ ok = false;
}
}
- LOG_DEBUG_ENCODE ("Have existing frame %1", _first_nonexistant_frame);
+ if (!ok) {
+ --_first_nonexistant_frame;
+ }
+ }
+
+ if (!_film->three_d ()) {
+ /* If we are doing 3D we might have found a good L frame with no R, so only
+ do this if we're in 2D and we've just found a good B(oth) frame.
+ */
++_first_nonexistant_frame;
}
- fclose (asset);
+ fclose (asset_file);
+ fclose (info_file);
}
/** @param frame Frame index.
s->set_content_title_text (_film->name ());
s->set_language (lang);
s->set_edit_rate (dcp::Fraction (_film->video_frame_rate (), 1));
+ s->set_reel_number (1);
s->set_time_code_rate (_film->video_frame_rate ());
+ s->set_start_time (dcp::Time ());
_subtitle_asset = s;
}
}
void
Writer::set_encoder_threads (int threads)
{
- _maximum_frames_in_memory = rint (threads * 1.1);
+ _maximum_frames_in_memory = lrint (threads * 1.1);
}
long
Writer::frame_info_position (int frame, Eyes eyes) const
{
- static int const info_size = 48;
-
switch (eyes) {
case EYES_BOTH:
- return frame * info_size;
+ return frame * _info_size;
case EYES_LEFT:
- return frame * info_size * 2;
+ return frame * _info_size * 2;
case EYES_RIGHT:
- return frame * info_size * 2 + info_size;
+ return frame * _info_size * 2 + _info_size;
default:
DCPOMATIC_ASSERT (false);
}
-
DCPOMATIC_ASSERT (false);
}
projects / dcpomatic.git / blobdiff