, _with_subtitles (false)
, _j2k_bandwidth (Config::instance()->default_j2k_bandwidth ())
, _dci_metadata (Config::instance()->default_dci_metadata ())
- , _dcp_video_frame_rate (24)
- , _dcp_audio_channels (MAX_AUDIO_CHANNELS)
+ , _video_frame_rate (24)
+ , _audio_channels (MAX_AUDIO_CHANNELS)
+ , _three_d (false)
+ , _sequence_video (true)
, _dirty (false)
{
set_dci_date_today ();
}
set_directory (result.string ());
- _log.reset (new FileLog ("log"));
+ _log.reset (new FileLog (file ("log")));
+
+ _playlist->set_sequence_video (_sequence_video);
}
string
s << container()->id()
<< "_" << resolution_to_string (_resolution)
<< "_" << _playlist->video_identifier()
- << "_" << _dcp_video_frame_rate
+ << "_" << _video_frame_rate
<< "_" << scaler()->id()
<< "_" << j2k_bandwidth();
+ if (_three_d) {
+ s << "_3D";
+ }
+
return s.str ();
}
}
string
-Film::dcp_video_mxf_filename () const
+Film::video_mxf_filename () const
{
return filename_safe_name() + "_video.mxf";
}
string
-Film::dcp_audio_mxf_filename () const
+Film::audio_mxf_filename () const
{
return filename_safe_name() + "_audio.mxf";
}
gethostname (buffer, sizeof (buffer));
log()->log (String::compose ("Starting to make DCP on %1", buffer));
}
-
-// log()->log (String::compose ("Content is %1; type %2", content_path(), (content_type() == STILL ? _("still") : _("video"))));
-// if (length()) {
-// log()->log (String::compose ("Content length %1", length().get()));
-// }
-// log()->log (String::compose ("Content digest %1", content_digest()));
-// log()->log (String::compose ("Content at %1 fps, DCP at %2 fps", source_frame_rate(), dcp_frame_rate()));
+
+ ContentList cl = content ();
+ for (ContentList::const_iterator i = cl.begin(); i != cl.end(); ++i) {
+ log()->log (String::compose ("Content: %1", (*i)->technical_summary()));
+ }
+ log()->log (String::compose ("DCP video rate %1 fps", video_frame_rate()));
log()->log (String::compose ("%1 threads", Config::instance()->num_local_encoding_threads()));
log()->log (String::compose ("J2K bandwidth %1", j2k_bandwidth()));
#ifdef DCPOMATIC_DEBUG
#else
log()->log ("libdcp built in optimised mode.");
#endif
- pair<string, int> const c = cpu_info ();
- log()->log (String::compose ("CPU: %1, %2 processors", c.first, c.second));
+ log()->log (String::compose ("CPU: %1, %2 processors", cpu_info(), boost::thread::hardware_concurrency ()));
list<pair<string, string> > const m = mount_info ();
for (list<pair<string, string> >::const_iterator i = m.begin(); i != m.end(); ++i) {
log()->log (String::compose ("Mount: %1 %2", i->first, i->second));
throw MissingSettingError (_("container"));
}
- if (content_without_loop().empty()) {
+ if (content().empty()) {
throw StringError (_("You must add some content to the DCP before creating it"));
}
root->add_child("WithSubtitles")->add_child_text (_with_subtitles ? "1" : "0");
root->add_child("J2KBandwidth")->add_child_text (lexical_cast<string> (_j2k_bandwidth));
_dci_metadata.as_xml (root->add_child ("DCIMetadata"));
- root->add_child("DCPVideoFrameRate")->add_child_text (lexical_cast<string> (_dcp_video_frame_rate));
+ root->add_child("VideoFrameRate")->add_child_text (lexical_cast<string> (_video_frame_rate));
root->add_child("DCIDate")->add_child_text (boost::gregorian::to_iso_string (_dci_date));
- root->add_child("DCPAudioChannels")->add_child_text (lexical_cast<string> (_dcp_audio_channels));
+ root->add_child("AudioChannels")->add_child_text (lexical_cast<string> (_audio_channels));
+ root->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0");
+ root->add_child("SequenceVideo")->add_child_text (_sequence_video ? "1" : "0");
_playlist->as_xml (root->add_child ("Playlist"));
doc.write_to_file_formatted (file ("metadata.xml"));
_with_subtitles = f.bool_child ("WithSubtitles");
_j2k_bandwidth = f.number_child<int> ("J2KBandwidth");
_dci_metadata = DCIMetadata (f.node_child ("DCIMetadata"));
- _dcp_video_frame_rate = f.number_child<int> ("DCPVideoFrameRate");
+ _video_frame_rate = f.number_child<int> ("VideoFrameRate");
_dci_date = boost::gregorian::from_undelimited_string (f.string_child ("DCIDate"));
- _dcp_audio_channels = f.number_child<int> ("DCPAudioChannels");
+ _audio_channels = f.number_child<int> ("AudioChannels");
+ _sequence_video = f.bool_child ("SequenceVideo");
+ _three_d = f.bool_child ("ThreeD");
_playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"));
d << "_" << dcp_content_type()->dci_name();
}
+ if (three_d ()) {
+ d << "-3D";
+ }
+
+ if (video_frame_rate() != 24) {
+ d << "-" << video_frame_rate();
+ }
+
if (container()) {
d << "_" << container()->dci_name();
}
}
}
- switch (dcp_audio_channels ()) {
+ switch (audio_channels ()) {
case 1:
d << "_10";
break;
}
void
-Film::set_dcp_video_frame_rate (int f)
+Film::set_video_frame_rate (int f)
{
{
boost::mutex::scoped_lock lm (_state_mutex);
- _dcp_video_frame_rate = f;
+ _video_frame_rate = f;
}
- signal_changed (DCP_VIDEO_FRAME_RATE);
+ signal_changed (VIDEO_FRAME_RATE);
}
void
-Film::set_dcp_audio_channels (int c)
+Film::set_audio_channels (int c)
{
{
boost::mutex::scoped_lock lm (_state_mutex);
- _dcp_audio_channels = c;
+ _audio_channels = c;
}
- signal_changed (DCP_AUDIO_CHANNELS);
+ signal_changed (AUDIO_CHANNELS);
+}
+
+void
+Film::set_three_d (bool t)
+{
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _three_d = t;
+ }
+ signal_changed (THREE_D);
}
void
switch (p) {
case Film::CONTENT:
- set_dcp_video_frame_rate (_playlist->best_dcp_frame_rate ());
+ set_video_frame_rate (_playlist->best_dcp_frame_rate ());
break;
- case Film::DCP_VIDEO_FRAME_RATE:
+ case Film::VIDEO_FRAME_RATE:
+ case Film::SEQUENCE_VIDEO:
_playlist->maybe_sequence_video ();
break;
default:
}
string
-Film::info_path (int f) const
+Film::info_path (int f, Eyes e) const
{
boost::filesystem::path p;
p /= info_dir ();
stringstream s;
s.width (8);
- s << setfill('0') << f << ".md5";
+ s << setfill('0') << f;
+
+ if (e == EYES_LEFT) {
+ s << ".L";
+ } else if (e == EYES_RIGHT) {
+ s << ".R";
+ }
+ s << ".md5";
+
p /= s.str();
/* info_dir() will already have added any initial bit of the path,
}
string
-Film::j2c_path (int f, bool t) const
+Film::j2c_path (int f, Eyes e, bool t) const
{
boost::filesystem::path p;
p /= "j2c";
stringstream s;
s.width (8);
- s << setfill('0') << f << ".j2c";
+ s << setfill('0') << f;
+
+ if (e == EYES_LEFT) {
+ s << ".L";
+ } else if (e == EYES_RIGHT) {
+ s << ".R";
+ }
+
+ s << ".j2c";
if (t) {
s << ".tmp";
return _playlist;
}
-Playlist::ContentList
-Film::content_without_loop () const
+ContentList
+Film::content () const
{
- return _playlist->content_without_loop ();
+ return _playlist->content ();
}
void
Film::examine_and_add_content (shared_ptr<Content> c)
{
shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), c));
- j->Finished.connect (bind (&Film::add_content_weak, this, boost::weak_ptr<Content> (c)));
+ j->Finished.connect (bind (&Film::maybe_add_content, this, boost::weak_ptr<Job> (j), boost::weak_ptr<Content> (c)));
JobManager::instance()->add (j);
}
void
-Film::add_content_weak (weak_ptr<Content> c)
+Film::maybe_add_content (weak_ptr<Job> j, weak_ptr<Content> c)
{
+ shared_ptr<Job> job = j.lock ();
+ if (!job || !job->finished_ok ()) {
+ return;
+ }
+
shared_ptr<Content> content = c.lock ();
if (content) {
add_content (content);
}
Time
-Film::length_with_loop () const
-{
- return _playlist->length_with_loop ();
-}
-
-Time
-Film::length_without_loop () const
+Film::length () const
{
- return _playlist->length_without_loop ();
+ return _playlist->length ();
}
bool
}
OutputVideoFrame
-Film::best_dcp_video_frame_rate () const
+Film::best_video_frame_rate () const
{
return _playlist->best_dcp_frame_rate ();
}
Film::playlist_content_changed (boost::weak_ptr<Content> c, int p)
{
if (p == VideoContentProperty::VIDEO_FRAME_RATE) {
- set_dcp_video_frame_rate (_playlist->best_dcp_frame_rate ());
+ set_video_frame_rate (_playlist->best_dcp_frame_rate ());
}
if (ui_signaller) {
signal_changed (CONTENT);
}
-int
-Film::loop () const
-{
- return _playlist->loop ();
-}
-
-void
-Film::set_loop (int c)
-{
- _playlist->set_loop (c);
-}
-
OutputAudioFrame
Film::time_to_audio_frames (Time t) const
{
- return t * dcp_audio_frame_rate () / TIME_HZ;
+ return t * audio_frame_rate () / TIME_HZ;
}
OutputVideoFrame
Film::time_to_video_frames (Time t) const
{
- return t * dcp_video_frame_rate () / TIME_HZ;
+ return t * video_frame_rate () / TIME_HZ;
}
Time
Film::audio_frames_to_time (OutputAudioFrame f) const
{
- return f * TIME_HZ / dcp_audio_frame_rate ();
+ return f * TIME_HZ / audio_frame_rate ();
}
Time
Film::video_frames_to_time (OutputVideoFrame f) const
{
- return f * TIME_HZ / dcp_video_frame_rate ();
+ return f * TIME_HZ / video_frame_rate ();
}
OutputAudioFrame
-Film::dcp_audio_frame_rate () const
+Film::audio_frame_rate () const
{
/* XXX */
return 48000;
void
Film::set_sequence_video (bool s)
{
- _playlist->set_sequence_video (s);
+ {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ _sequence_video = s;
+ _playlist->set_sequence_video (s);
+ }
+
+ signal_changed (SEQUENCE_VIDEO);
}
libdcp::Size
projects / dcpomatic.git / blobdiff