#include <libdcp/sound_asset.h>
#include <libdcp/picture_frame.h>
#include <libdcp/reel.h>
+#include <libdcp/dcp.h>
+#include <libdcp/cpl.h>
#include "writer.h"
#include "compose.hpp"
#include "film.h"
#include "format.h"
#include "log.h"
#include "dcp_video_frame.h"
+#include "dcp_content_type.h"
+#include "player.h"
+#include "audio_mapping.h"
+#include "config.h"
+
+#include "i18n.h"
using std::make_pair;
using std::pair;
_picture_asset.reset (
new libdcp::MonoPictureAsset (
- _film->video_mxf_dir (),
- _film->video_mxf_filename (),
- DCPFrameRate (_film->frames_per_second()).frames_per_second,
- _film->format()->dcp_size()
+ _film->internal_video_mxf_dir (),
+ _film->internal_video_mxf_filename (),
+ _film->dcp_frame_rate (),
+ _film->format()->dcp_size ()
)
);
_picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
- AudioMapping m (_film->audio_channels ());
-
- if (m.dcp_channels() > 0) {
+ if (_film->audio_channels() > 0) {
_sound_asset.reset (
new libdcp::SoundAsset (
_film->dir (_film->dcp_name()),
- "audio.mxf",
- DCPFrameRate (_film->frames_per_second()).frames_per_second,
- m.dcp_channels (),
- dcp_audio_sample_rate (_film->audio_stream()->sample_rate())
+ _film->dcp_audio_mxf_filename (),
+ _film->dcp_frame_rate (),
+ _film->audio_mapping().dcp_channels (),
+ dcp_audio_sample_rate (_film->audio_frame_rate())
)
);
break;
}
- TIMING ("writer sleeps with a queue of %1", _queue.size());
+ TIMING (N_("writer sleeps with a queue of %1"), _queue.size());
_condition.wait (lock);
- TIMING ("writer wakes with a queue of %1", _queue.size());
+ TIMING (N_("writer wakes with a queue of %1"), _queue.size());
}
if (_finish && _queue.empty()) {
switch (qi.type) {
case QueueItem::FULL:
{
- _film->log()->log (String::compose ("Writer FULL-writes %1 to MXF", qi.frame));
+ _film->log()->log (String::compose (N_("Writer FULL-writes %1 to MXF"), qi.frame));
if (!qi.encoded) {
qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, false)));
}
break;
}
case QueueItem::FAKE:
- _film->log()->log (String::compose ("Writer FAKE-writes %1 to MXF", qi.frame));
+ _film->log()->log (String::compose (N_("Writer FAKE-writes %1 to MXF"), qi.frame));
_picture_asset_writer->fake_write (qi.size);
_last_written.reset ();
++_fake_written;
break;
case QueueItem::REPEAT:
{
- _film->log()->log (String::compose ("Writer REPEAT-writes %1 to MXF", qi.frame));
+ _film->log()->log (String::compose (N_("Writer REPEAT-writes %1 to MXF"), qi.frame));
libdcp::FrameInfo const fin = _picture_asset_writer->write (_last_written->data(), _last_written->size());
_last_written->write_info (_film, qi.frame, fin);
++_repeat_written;
++_pushed_to_disk;
lock.unlock ();
- _film->log()->log (String::compose ("Writer full (awaiting %1); pushes %2 to disk", _last_written_frame + 1, qi.frame));
+ _film->log()->log (String::compose (N_("Writer full (awaiting %1); pushes %2 to disk"), _last_written_frame + 1, qi.frame));
qi.encoded->write (_film, qi.frame);
lock.lock ();
qi.encoded.reset ();
}
int const frames = _last_written_frame + 1;
- int const duration = frames - _film->trim_start() - _film->trim_end();
-
- _film->set_dcp_intrinsic_duration (frames);
+ int duration = 0;
+ if (_film->trim_type() == Film::CPL) {
+ duration = frames - _film->trim_start() - _film->trim_end();
+ _picture_asset->set_entry_point (_film->trim_start ());
+ } else {
+ duration = frames;
+ }
- _picture_asset->set_entry_point (_film->trim_start ());
_picture_asset->set_duration (duration);
/* Hard-link the video MXF into the DCP */
boost::filesystem::path from;
- from /= _film->video_mxf_dir();
- from /= _film->video_mxf_filename();
+ from /= _film->internal_video_mxf_dir();
+ from /= _film->internal_video_mxf_filename();
boost::filesystem::path to;
to /= _film->dir (_film->dcp_name());
- to /= "video.mxf";
-
- boost::filesystem::create_hard_link (from, to);
+ to /= _film->dcp_video_mxf_filename ();
+
+ boost::system::error_code ec;
+ boost::filesystem::create_hard_link (from, to, ec);
+ if (ec) {
+ /* hard link failed; copy instead */
+ boost::filesystem::copy_file (from, to);
+ _film->log()->log ("Hard-link failed; fell back to copying");
+ }
/* And update the asset */
_picture_asset->set_directory (_film->dir (_film->dcp_name ()));
- _picture_asset->set_file_name ("video.mxf");
+ _picture_asset->set_file_name (_film->dcp_video_mxf_filename ());
if (_sound_asset) {
- _sound_asset->set_entry_point (_film->trim_start ());
+ if (_film->trim_type() == Film::CPL) {
+ _sound_asset->set_entry_point (_film->trim_start ());
+ }
_sound_asset->set_duration (duration);
}
libdcp::DCP dcp (_film->dir (_film->dcp_name()));
- DCPFrameRate dfr (_film->frames_per_second ());
shared_ptr<libdcp::CPL> cpl (
- new libdcp::CPL (_film->dir (_film->dcp_name()), _film->dcp_name(), _film->dcp_content_type()->libdcp_kind (), frames, dfr.frames_per_second)
+ new libdcp::CPL (
+ _film->dir (_film->dcp_name()),
+ _film->dcp_name(),
+ _film->dcp_content_type()->libdcp_kind (),
+ frames,
+ _film->dcp_frame_rate ()
+ )
);
dcp.add_cpl (cpl);
)
));
- dcp.write_xml ();
+ libdcp::XMLMetadata meta = Config::instance()->dcp_metadata ();
+ meta.set_issue_date_now ();
+ dcp.write_xml (meta);
- _film->log()->log (String::compose ("Wrote %1 FULL, %2 FAKE, %3 REPEAT; %4 pushed to disk", _full_written, _fake_written, _repeat_written, _pushed_to_disk));
+ _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));
}
/** Tell the writer that frame `f' should be a repeat of the frame before it */
{
/* Try to open the existing MXF */
boost::filesystem::path p;
- p /= _film->video_mxf_dir ();
- p /= _film->video_mxf_filename ();
- FILE* mxf = fopen (p.string().c_str(), "rb");
+ p /= _film->internal_video_mxf_dir ();
+ p /= _film->internal_video_mxf_filename ();
+ FILE* mxf = fopen (p.string().c_str(), N_("rb"));
if (!mxf) {
return;
}
string const existing_hash = md5_digest (data.data(), data.size());
if (existing_hash != info.hash) {
- _film->log()->log (String::compose ("Existing frame %1 failed hash check", _first_nonexistant_frame));
+ _film->log()->log (String::compose (N_("Existing frame %1 failed hash check"), _first_nonexistant_frame));
break;
}
- _film->log()->log (String::compose ("Have existing frame %1", _first_nonexistant_frame));
+ _film->log()->log (String::compose (N_("Have existing frame %1"), _first_nonexistant_frame));
++_first_nonexistant_frame;
}
projects / dcpomatic.git / blobdiff