#include <fstream>
#include <cerrno>
-#include <libdcp/picture_asset.h>
+#include <libdcp/mono_picture_asset.h>
+#include <libdcp/stereo_picture_asset.h>
#include <libdcp/sound_asset.h>
-#include <libdcp/picture_frame.h>
#include <libdcp/reel.h>
#include <libdcp/dcp.h>
#include <libdcp/cpl.h>
it into the DCP later.
*/
- if (f->dcp_3d ()) {
- _stereo_picture_asset.reset (
- new libdcp::StereoPictureAsset (
- _film->internal_video_mxf_dir (),
- _film->internal_video_mxf_filename (),
- _film->dcp_video_frame_rate (),
- _film->container()->size (_film->full_frame ())
- )
- );
-
- _stereo_picture_asset_writer = _stereo_picture_asset->start_write (_first_nonexistant_frame > 0);
-
- _picture_asset = _stereo_picture_asset;
- _picture_asset_writer = _stereo_picture_asset_writer;
-
+ if (_film->three_d ()) {
+ _picture_asset.reset (new libdcp::StereoPictureAsset (_film->internal_video_mxf_dir (), _film->internal_video_mxf_filename ()));
} else {
- _mono_picture_asset.reset (
- new libdcp::MonoPictureAsset (
- _film->internal_video_mxf_dir (),
- _film->internal_video_mxf_filename (),
- _film->dcp_video_frame_rate (),
- _film->container()->size (_film->full_frame ())
- )
- );
-
- _mono_picture_asset_writer = _mono_picture_asset->start_write (_first_nonexistant_frame > 0);
-
- _picture_asset = _mono_picture_asset;
- _picture_asset_writer = _mono_picture_asset_writer;
+ _picture_asset.reset (new libdcp::MonoPictureAsset (_film->internal_video_mxf_dir (), _film->internal_video_mxf_filename ()));
}
- _sound_asset.reset (
- new libdcp::SoundAsset (
- _film->dir (_film->dcp_name()),
- _film->dcp_audio_mxf_filename (),
- _film->dcp_video_frame_rate (),
- _film->dcp_audio_channels (),
- _film->dcp_audio_frame_rate ()
- )
- );
+ _picture_asset->set_edit_rate (_film->video_frame_rate ());
+ _picture_asset->set_size (_film->container()->size (_film->full_frame ()));
+
+ if (_film->encrypted ()) {
+ _picture_asset->set_key (_film->key ());
+ }
+
+ _picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
+
+ _sound_asset.reset (new libdcp::SoundAsset (_film->dir (_film->dcp_name()), _film->audio_mxf_filename ()));
+ _sound_asset->set_edit_rate (_film->video_frame_rate ());
+ _sound_asset->set_channels (_film->audio_channels ());
+ _sound_asset->set_sampling_rate (_film->audio_frame_rate ());
+
+ if (_film->encrypted ()) {
+ _sound_asset->set_key (_film->key ());
+ }
_sound_asset_writer = _sound_asset->start_write ();
_thread = new boost::thread (boost::bind (&Writer::thread, this));
+
+ _job->descend (0.9);
}
void
qi.encoded = encoded;
qi.frame = frame;
- if (_film->dcp_3d() && eyes == EYES_BOTH) {
+ if (_film->three_d() && eyes == EYES_BOTH) {
/* 2D material in a 3D DCP; fake the 3D */
qi.eyes = EYES_LEFT;
_queue.push_back (qi);
qi.type = QueueItem::FAKE;
qi.size = info.size;
qi.frame = frame;
- qi.eyes = eyes;
- _queue.push_back (qi);
+ if (_film->three_d() && eyes == EYES_BOTH) {
+ qi.eyes = EYES_LEFT;
+ _queue.push_back (qi);
+ qi.eyes = EYES_RIGHT;
+ _queue.push_back (qi);
+ } else {
+ qi.eyes = eyes;
+ _queue.push_back (qi);
+ }
_condition.notify_all ();
}
qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, qi.eyes, false)));
}
- if (_mono_picture_asset_writer) {
- libdcp::FrameInfo fin = _mono_picture_asset_writer->write (qi.encoded->data(), qi.encoded->size());
- qi.encoded->write_info (_film, qi.frame, qi.eyes, fin);
- } else {
- libdcp::FrameInfo fin = _stereo_picture_asset_writer->write (
- qi.encoded->data(),
- qi.encoded->size(),
- qi.eyes == EYES_LEFT ? libdcp::EYE_LEFT : libdcp::EYE_RIGHT
- );
- qi.encoded->write_info (_film, qi.frame, qi.eyes, fin);
- }
+ libdcp::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::REPEAT:
{
_film->log()->log (String::compose (N_("Writer REPEAT-writes %1 to MXF"), qi.frame));
- if (_mono_picture_asset_writer) {
-
- libdcp::FrameInfo fin = _mono_picture_asset_writer->write (
- _last_written[qi.eyes]->data(),
- _last_written[qi.eyes]->size()
- );
-
- _last_written[qi.eyes]->write_info (_film, qi.frame, qi.eyes, fin);
-
- } else {
-
- libdcp::FrameInfo fin = _stereo_picture_asset_writer->write (
- _last_written[qi.eyes]->data(),
- _last_written[qi.eyes]->size(),
- qi.eyes == EYES_LEFT ? libdcp::EYE_LEFT : libdcp::EYE_RIGHT
- );
-
- _last_written[qi.eyes]->write_info (_film, qi.frame, qi.eyes, fin);
- }
-
+ libdcp::FrameInfo fin = _picture_asset_writer->write (
+ _last_written[qi.eyes]->data(),
+ _last_written[qi.eyes]->size()
+ );
+
+ _last_written[qi.eyes]->write_info (_film, qi.frame, qi.eyes, fin);
++_repeat_written;
break;
}
boost::filesystem::path to;
to /= _film->dir (_film->dcp_name());
- to /= _film->dcp_video_mxf_filename ();
+ to /= _film->video_mxf_filename ();
boost::system::error_code ec;
boost::filesystem::create_hard_link (from, to, ec);
/* And update the asset */
_picture_asset->set_directory (_film->dir (_film->dcp_name ()));
- _picture_asset->set_file_name (_film->dcp_video_mxf_filename ());
+ _picture_asset->set_file_name (_film->video_mxf_filename ());
_sound_asset->set_duration (frames);
libdcp::DCP dcp (_film->dir (_film->dcp_name()));
_film->dcp_name(),
_film->dcp_content_type()->libdcp_kind (),
frames,
- _film->dcp_video_frame_rate ()
+ _film->video_frame_rate ()
)
);
)
));
+ /* Compute the digests for the assets now so that we can keep track of progress.
+ We did _job->descend (0.9) in our constructor */
+ _job->ascend ();
+
+ _job->descend (0.1);
+ _picture_asset->compute_digest (boost::bind (&Job::set_progress, _job.get(), _1));
+ _job->ascend ();
+
+ _job->descend (0.1);
+ _sound_asset->compute_digest (boost::bind (&Job::set_progress, _job.get(), _1));
+ _job->ascend ();
+
libdcp::XMLMetadata meta = Config::instance()->dcp_metadata ();
meta.set_issue_date_now ();
- dcp.write_xml (meta);
+ dcp.write_xml (_film->interop (), meta, make_signer ());
_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));
}
QueueItem qi;
qi.type = QueueItem::REPEAT;
qi.frame = f;
- qi.eyes = e;
-
- _queue.push_back (qi);
+ if (_film->three_d() && e == EYES_BOTH) {
+ qi.eyes = EYES_LEFT;
+ _queue.push_back (qi);
+ qi.eyes = EYES_RIGHT;
+ _queue.push_back (qi);
+ } else {
+ qi.eyes = e;
+ _queue.push_back (qi);
+ }
_condition.notify_all ();
}
/* Read the frame info as written */
ifstream ifi (_film->info_path (f, eyes).c_str());
libdcp::FrameInfo info (ifi);
+ if (info.size == 0) {
+ _film->log()->log (String::compose ("Existing frame %1 has no info file", f));
+ return false;
+ }
/* Read the data from the MXF and hash it */
fseek (mxf, info.offset, SEEK_SET);
while (1) {
- if (_film->dcp_3d ()) {
+ if (_film->three_d ()) {
if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_LEFT)) {
break;
}
if (a.frame != b.frame) {
return a.frame < b.frame;
}
-
- return a.eyes == EYES_LEFT && b.eyes == EYES_RIGHT;
+
+ return static_cast<int> (a.eyes) < static_cast<int> (b.eyes);
}
bool
projects / dcpomatic.git / blobdiff