+/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
+
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
#include <boost/algorithm/string.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/date_time.hpp>
+#include <libxml++/libxml++.h>
+#include <libcxml/cxml.h>
#include "film.h"
#include "format.h"
#include "job.h"
#include "filter.h"
-#include "transcoder.h"
#include "util.h"
#include "job_manager.h"
#include "ab_transcode_job.h"
#include "transcode_job.h"
#include "scp_dcp_job.h"
#include "log.h"
-#include "options.h"
#include "exceptions.h"
#include "examine_content_job.h"
#include "scaler.h"
-#include "decoder_factory.h"
#include "config.h"
#include "version.h"
#include "ui_signaller.h"
-#include "video_decoder.h"
-#include "audio_decoder.h"
-#include "external_audio_decoder.h"
+#include "analyse_audio_job.h"
+#include "playlist.h"
+#include "player.h"
+#include "ffmpeg_content.h"
+#include "imagemagick_content.h"
+#include "sndfile_content.h"
+#include "dcp_content_type.h"
#include "i18n.h"
using std::setfill;
using std::min;
using std::make_pair;
+using std::endl;
+using std::cout;
+using std::list;
using boost::shared_ptr;
using boost::lexical_cast;
using boost::to_upper_copy;
using boost::optional;
using libdcp::Size;
-int const Film::state_version = 3;
+int const Film::state_version = 4;
/** Construct a Film object in a given directory, reading any metadata
* file that exists in that directory. An exception will be thrown if
*/
Film::Film (string d, bool must_exist)
- : _use_dci_name (true)
- , _trust_content_header (true)
- , _dcp_content_type (0)
- , _format (0)
- , _scaler (Scaler::from_id (N_("bicubic")))
+ : _playlist (new Playlist)
+ , _use_dci_name (true)
+ , _trust_content_headers (true)
+ , _dcp_content_type (Config::instance()->default_dcp_content_type ())
+ , _format (Config::instance()->default_format ())
+ , _scaler (Scaler::from_id ("bicubic"))
, _trim_start (0)
, _trim_end (0)
- , _dcp_ab (false)
- , _use_content_audio (true)
+ , _trim_type (CPL)
+ , _ab (false)
, _audio_gain (0)
, _audio_delay (0)
- , _still_duration (10)
, _with_subtitles (false)
, _subtitle_offset (0)
, _subtitle_scale (1)
, _colour_lut (0)
, _j2k_bandwidth (200000000)
, _dci_metadata (Config::instance()->default_dci_metadata ())
- , _frames_per_second (0)
+ , _dcp_video_frame_rate (0)
, _dirty (false)
{
set_dci_date_today ();
+
+ _playlist->Changed.connect (bind (&Film::playlist_changed, this));
+ _playlist->ContentChanged.connect (bind (&Film::playlist_content_changed, this, _1, _2));
/* Make state.directory a complete path without ..s (where possible)
(Code swiped from Adam Bowen on stackoverflow)
boost::filesystem::path p (boost::filesystem::system_complete (d));
boost::filesystem::path result;
for (boost::filesystem::path::iterator i = p.begin(); i != p.end(); ++i) {
- if (*i == N_("..")) {
- if (boost::filesystem::is_symlink (result) || result.filename() == N_("..")) {
+ if (*i == "..") {
+ if (boost::filesystem::is_symlink (result) || result.filename() == "..") {
result /= *i;
} else {
result = result.parent_path ();
}
- } else if (*i != N_(".")) {
+ } else if (*i != ".") {
result /= *i;
}
}
}
}
- _external_audio_stream = ExternalAudioStream::create ();
-
if (must_exist) {
read_metadata ();
+ } else {
+ write_metadata ();
}
- _log = new FileLog (file (N_("log")));
+ _log.reset (new FileLog (file ("log")));
}
Film::Film (Film const & o)
: boost::enable_shared_from_this<Film> (o)
- , _log (0)
+ /* note: the copied film shares the original's log */
+ , _log (o._log)
+ , _playlist (new Playlist (o._playlist))
, _directory (o._directory)
, _name (o._name)
, _use_dci_name (o._use_dci_name)
- , _content (o._content)
- , _trust_content_header (o._trust_content_header)
+ , _trust_content_headers (o._trust_content_headers)
, _dcp_content_type (o._dcp_content_type)
, _format (o._format)
, _crop (o._crop)
, _scaler (o._scaler)
, _trim_start (o._trim_start)
, _trim_end (o._trim_end)
- , _dcp_ab (o._dcp_ab)
- , _content_audio_stream (o._content_audio_stream)
- , _external_audio (o._external_audio)
- , _use_content_audio (o._use_content_audio)
+ , _trim_type (o._trim_type)
+ , _ab (o._ab)
, _audio_gain (o._audio_gain)
, _audio_delay (o._audio_delay)
- , _still_duration (o._still_duration)
- , _subtitle_stream (o._subtitle_stream)
, _with_subtitles (o._with_subtitles)
, _subtitle_offset (o._subtitle_offset)
, _subtitle_scale (o._subtitle_scale)
, _colour_lut (o._colour_lut)
, _j2k_bandwidth (o._j2k_bandwidth)
, _dci_metadata (o._dci_metadata)
+ , _dcp_video_frame_rate (o._dcp_video_frame_rate)
, _dci_date (o._dci_date)
- , _size (o._size)
- , _length (o._length)
- , _dcp_intrinsic_duration (o._dcp_intrinsic_duration)
- , _content_digest (o._content_digest)
- , _content_audio_streams (o._content_audio_streams)
- , _external_audio_stream (o._external_audio_stream)
- , _subtitle_streams (o._subtitle_streams)
- , _frames_per_second (o._frames_per_second)
, _dirty (o._dirty)
{
-
-}
-
-Film::~Film ()
-{
- delete _log;
+ _playlist->ContentChanged.connect (bind (&Film::playlist_content_changed, this, _1, _2));
}
string
Film::video_state_identifier () const
{
assert (format ());
+ LocaleGuard lg;
pair<string, string> f = Filter::ffmpeg_strings (filters());
stringstream s;
s << format()->id()
- << N_("_") << content_digest()
- << N_("_") << crop().left << N_("_") << crop().right << N_("_") << crop().top << N_("_") << crop().bottom
- << N_("_") << f.first << N_("_") << f.second
- << N_("_") << scaler()->id()
- << N_("_") << j2k_bandwidth()
- << N_("_") << boost::lexical_cast<int> (colour_lut());
-
- if (dcp_ab()) {
+ << "_" << _playlist->video_digest()
+ << "_" << crop().left << "_" << crop().right << "_" << crop().top << "_" << crop().bottom
+ << "_" << _dcp_video_frame_rate
+ << "_" << f.first << "_" << f.second
+ << "_" << scaler()->id()
+ << "_" << j2k_bandwidth()
+ << "_" << boost::lexical_cast<int> (colour_lut());
+
+ if (ab()) {
pair<string, string> fa = Filter::ffmpeg_strings (Config::instance()->reference_filters());
- s << N_("ab_") << Config::instance()->reference_scaler()->id() << N_("_") << fa.first << N_("_") << fa.second;
+ s << "ab_" << Config::instance()->reference_scaler()->id() << "_" << fa.first << "_" << fa.second;
}
return s.str ();
Film::info_dir () const
{
boost::filesystem::path p;
- p /= N_("info");
+ p /= "info";
p /= video_state_identifier ();
return dir (p.string());
}
string
-Film::video_mxf_dir () const
+Film::internal_video_mxf_dir () const
{
boost::filesystem::path p;
- return dir (N_("video"));
+ return dir ("video");
}
string
-Film::video_mxf_filename () const
+Film::internal_video_mxf_filename () const
{
- return video_state_identifier() + N_(".mxf");
+ return video_state_identifier() + ".mxf";
+}
+
+string
+Film::dcp_video_mxf_filename () const
+{
+ return filename_safe_name() + "_video.mxf";
+}
+
+string
+Film::dcp_audio_mxf_filename () const
+{
+ return filename_safe_name() + "_audio.mxf";
+}
+
+string
+Film::filename_safe_name () const
+{
+ string const n = name ();
+ string o;
+ for (size_t i = 0; i < n.length(); ++i) {
+ if (isalnum (n[i])) {
+ o += n[i];
+ } else {
+ o += "_";
+ }
+ }
+
+ return o;
+}
+
+string
+Film::audio_analysis_path () const
+{
+ boost::filesystem::path p;
+ p /= "analysis";
+ p /= _playlist->audio_digest();
+ return file (p.string ());
}
/** Add suitable Jobs to the JobManager to create a DCP for this Film */
{
set_dci_date_today ();
- if (dcp_name().find (N_("/")) != string::npos) {
+ if (dcp_name().find ("/") != string::npos) {
throw BadSettingError (_("name"), _("cannot contain slashes"));
}
- log()->log (String::compose (N_("DVD-o-matic %1 git %2 using %3"), dvdomatic_version, dvdomatic_git_commit, dependency_version_summary()));
+ log()->log (String::compose ("DCP-o-matic %1 git %2 using %3", dcpomatic_version, dcpomatic_git_commit, dependency_version_summary()));
{
char buffer[128];
gethostname (buffer, sizeof (buffer));
- log()->log (String::compose (N_("Starting to make DCP on %1"), buffer));
+ log()->log (String::compose ("Starting to make DCP on %1", buffer));
}
- log()->log (String::compose (N_("Content is %1; type %2"), content_path(), (content_type() == STILL ? _("still") : _("video"))));
- if (length()) {
- log()->log (String::compose (N_("Content length %1"), length().get()));
- }
- log()->log (String::compose (N_("Content digest %1"), content_digest()));
- log()->log (String::compose (N_("%1 threads"), Config::instance()->num_local_encoding_threads()));
- log()->log (String::compose (N_("J2K bandwidth %1"), j2k_bandwidth()));
-#ifdef DVDOMATIC_DEBUG
- log()->log (N_("DVD-o-matic built in debug mode."));
+// 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()));
+ log()->log (String::compose ("%1 threads", Config::instance()->num_local_encoding_threads()));
+ log()->log (String::compose ("J2K bandwidth %1", j2k_bandwidth()));
+#ifdef DCPOMATIC_DEBUG
+ log()->log ("DCP-o-matic built in debug mode.");
#else
- log()->log (N_("DVD-o-matic built in optimised mode."));
+ log()->log ("DCP-o-matic built in optimised mode.");
#endif
#ifdef LIBDCP_DEBUG
- log()->log (N_("libdcp built in debug mode."));
+ log()->log ("libdcp built in debug mode.");
#else
- log()->log (N_("libdcp built in optimised mode."));
+ log()->log ("libdcp built in optimised mode.");
#endif
pair<string, int> const c = cpu_info ();
- log()->log (String::compose (N_("CPU: %1, %2 processors"), c.first, c.second));
+ log()->log (String::compose ("CPU: %1, %2 processors", c.first, c.second));
if (format() == 0) {
throw MissingSettingError (_("format"));
}
- if (content().empty ()) {
- throw MissingSettingError (_("content"));
+ if (_playlist->content().empty ()) {
+ throw StringError (_("You must add some content to the DCP before creating it"));
}
if (dcp_content_type() == 0) {
throw MissingSettingError (_("name"));
}
- DecodeOptions od;
- od.decode_subtitles = with_subtitles ();
-
shared_ptr<Job> r;
- if (dcp_ab()) {
- r = JobManager::instance()->add (shared_ptr<Job> (new ABTranscodeJob (shared_from_this(), od)));
+ if (ab()) {
+ r = JobManager::instance()->add (shared_ptr<Job> (new ABTranscodeJob (shared_from_this())));
} else {
- r = JobManager::instance()->add (shared_ptr<Job> (new TranscodeJob (shared_from_this(), od)));
+ r = JobManager::instance()->add (shared_ptr<Job> (new TranscodeJob (shared_from_this())));
}
}
-/** Start a job to examine our content file */
+/** Start a job to analyse the audio in our Playlist */
void
-Film::examine_content ()
+Film::analyse_audio ()
{
- if (_examine_content_job) {
+ if (_analyse_audio_job) {
return;
}
- _examine_content_job.reset (new ExamineContentJob (shared_from_this()));
- _examine_content_job->Finished.connect (bind (&Film::examine_content_finished, this));
- JobManager::instance()->add (_examine_content_job);
+ _analyse_audio_job.reset (new AnalyseAudioJob (shared_from_this()));
+ _analyse_audio_job->Finished.connect (bind (&Film::analyse_audio_finished, this));
+ JobManager::instance()->add (_analyse_audio_job);
}
+/** Start a job to examine a piece of content */
void
-Film::examine_content_finished ()
+Film::examine_content (shared_ptr<Content> c)
{
- _examine_content_job.reset ();
+ shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), c, trust_content_headers ()));
+ JobManager::instance()->add (j);
+}
+
+void
+Film::analyse_audio_finished ()
+{
+ ensure_ui_thread ();
+
+ if (_analyse_audio_job->finished_ok ()) {
+ AudioAnalysisSucceeded ();
+ }
+
+ _analyse_audio_job.reset ();
}
/** Start a job to send our DCP to the configured TMS */
Film::write_metadata () const
{
boost::mutex::scoped_lock lm (_state_mutex);
+ LocaleGuard lg;
boost::filesystem::create_directories (directory());
- string const m = file (N_("metadata"));
- ofstream f (m.c_str ());
- if (!f.good ()) {
- throw CreateFileError (m);
- }
+ xmlpp::Document doc;
+ xmlpp::Element* root = doc.create_root_node ("Metadata");
- f << N_("version ") << state_version << N_("\n");
+ root->add_child("Version")->add_child_text (boost::lexical_cast<string> (state_version));
+ root->add_child("Name")->add_child_text (_name);
+ root->add_child("UseDCIName")->add_child_text (_use_dci_name ? "1" : "0");
+ root->add_child("TrustContentHeaders")->add_child_text (_trust_content_headers ? "1" : "0");
- /* User stuff */
- f << N_("name ") << _name << N_("\n");
- f << N_("use_dci_name ") << _use_dci_name << N_("\n");
- f << N_("content ") << _content << N_("\n");
- f << N_("trust_content_header ") << (_trust_content_header ? N_("1") : N_("0")) << N_("\n");
if (_dcp_content_type) {
- f << N_("dcp_content_type ") << _dcp_content_type->dci_name () << N_("\n");
+ root->add_child("DCPContentType")->add_child_text (_dcp_content_type->dci_name ());
}
+
if (_format) {
- f << N_("format ") << _format->as_metadata () << N_("\n");
+ root->add_child("Format")->add_child_text (_format->id ());
}
- f << N_("left_crop ") << _crop.left << N_("\n");
- f << N_("right_crop ") << _crop.right << N_("\n");
- f << N_("top_crop ") << _crop.top << N_("\n");
- f << N_("bottom_crop ") << _crop.bottom << N_("\n");
- for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
- f << N_("filter ") << (*i)->id () << N_("\n");
- }
- f << N_("scaler ") << _scaler->id () << N_("\n");
- f << N_("trim_start ") << _trim_start << N_("\n");
- f << N_("trim_end ") << _trim_end << N_("\n");
- f << N_("dcp_ab ") << (_dcp_ab ? N_("1") : N_("0")) << N_("\n");
- if (_content_audio_stream) {
- f << N_("selected_content_audio_stream ") << _content_audio_stream->to_string() << N_("\n");
- }
- for (vector<string>::const_iterator i = _external_audio.begin(); i != _external_audio.end(); ++i) {
- f << N_("external_audio ") << *i << N_("\n");
- }
- f << N_("use_content_audio ") << (_use_content_audio ? N_("1") : N_("0")) << N_("\n");
- f << N_("audio_gain ") << _audio_gain << N_("\n");
- f << N_("audio_delay ") << _audio_delay << N_("\n");
- f << N_("still_duration ") << _still_duration << N_("\n");
- if (_subtitle_stream) {
- f << N_("selected_subtitle_stream ") << _subtitle_stream->to_string() << N_("\n");
- }
- f << N_("with_subtitles ") << _with_subtitles << N_("\n");
- f << N_("subtitle_offset ") << _subtitle_offset << N_("\n");
- f << N_("subtitle_scale ") << _subtitle_scale << N_("\n");
- f << N_("colour_lut ") << _colour_lut << N_("\n");
- f << N_("j2k_bandwidth ") << _j2k_bandwidth << N_("\n");
- _dci_metadata.write (f);
- f << N_("dci_date ") << boost::gregorian::to_iso_string (_dci_date) << N_("\n");
- f << N_("width ") << _size.width << N_("\n");
- f << N_("height ") << _size.height << N_("\n");
- f << N_("length ") << _length.get_value_or(0) << N_("\n");
- f << N_("dcp_intrinsic_duration ") << _dcp_intrinsic_duration.get_value_or(0) << N_("\n");
- f << N_("content_digest ") << _content_digest << N_("\n");
- for (vector<shared_ptr<AudioStream> >::const_iterator i = _content_audio_streams.begin(); i != _content_audio_streams.end(); ++i) {
- f << N_("content_audio_stream ") << (*i)->to_string () << N_("\n");
+ switch (_trim_type) {
+ case CPL:
+ root->add_child("TrimType")->add_child_text ("CPL");
+ break;
+ case ENCODE:
+ root->add_child("TrimType")->add_child_text ("Encode");
}
+
+ root->add_child("LeftCrop")->add_child_text (boost::lexical_cast<string> (_crop.left));
+ root->add_child("RightCrop")->add_child_text (boost::lexical_cast<string> (_crop.right));
+ root->add_child("TopCrop")->add_child_text (boost::lexical_cast<string> (_crop.top));
+ root->add_child("BottomCrop")->add_child_text (boost::lexical_cast<string> (_crop.bottom));
- f << N_("external_audio_stream ") << _external_audio_stream->to_string() << N_("\n");
-
- for (vector<shared_ptr<SubtitleStream> >::const_iterator i = _subtitle_streams.begin(); i != _subtitle_streams.end(); ++i) {
- f << N_("subtitle_stream ") << (*i)->to_string () << N_("\n");
+ for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
+ root->add_child("Filter")->add_child_text ((*i)->id ());
}
-
- f << N_("frames_per_second ") << _frames_per_second << N_("\n");
+
+ root->add_child("Scaler")->add_child_text (_scaler->id ());
+ root->add_child("TrimStart")->add_child_text (boost::lexical_cast<string> (_trim_start));
+ root->add_child("TrimEnd")->add_child_text (boost::lexical_cast<string> (_trim_end));
+ root->add_child("AB")->add_child_text (_ab ? "1" : "0");
+ root->add_child("AudioGain")->add_child_text (boost::lexical_cast<string> (_audio_gain));
+ root->add_child("AudioDelay")->add_child_text (boost::lexical_cast<string> (_audio_delay));
+ root->add_child("WithSubtitles")->add_child_text (_with_subtitles ? "1" : "0");
+ root->add_child("SubtitleOffset")->add_child_text (boost::lexical_cast<string> (_subtitle_offset));
+ root->add_child("SubtitleScale")->add_child_text (boost::lexical_cast<string> (_subtitle_scale));
+ root->add_child("ColourLUT")->add_child_text (boost::lexical_cast<string> (_colour_lut));
+ root->add_child("J2KBandwidth")->add_child_text (boost::lexical_cast<string> (_j2k_bandwidth));
+ _dci_metadata.as_xml (root->add_child ("DCIMetadata"));
+ root->add_child("DCPVideoFrameRate")->add_child_text (boost::lexical_cast<string> (_dcp_video_frame_rate));
+ root->add_child("DCIDate")->add_child_text (boost::gregorian::to_iso_string (_dci_date));
+ _playlist->as_xml (root->add_child ("Playlist"));
+
+ doc.write_to_file_formatted (file ("metadata.xml"));
_dirty = false;
}
Film::read_metadata ()
{
boost::mutex::scoped_lock lm (_state_mutex);
+ LocaleGuard lg;
- _external_audio.clear ();
- _content_audio_streams.clear ();
- _subtitle_streams.clear ();
-
- boost::optional<int> version;
-
- /* Backward compatibility things */
- boost::optional<int> audio_sample_rate;
- boost::optional<int> audio_stream_index;
- boost::optional<int> subtitle_stream_index;
-
- ifstream f (file (N_("metadata")).c_str());
- if (!f.good()) {
- throw OpenFileError (file (N_("metadata")));
+ if (boost::filesystem::exists (file ("metadata")) && !boost::filesystem::exists (file ("metadata.xml"))) {
+ throw StringError (_("This film was created with an older version of DCP-o-matic, and unfortunately it cannot be loaded into this version. You will need to create a new Film, re-add your content and set it up again. Sorry!"));
}
-
- multimap<string, string> kv = read_key_value (f);
- /* We need version before anything else */
- multimap<string, string>::iterator v = kv.find (N_("version"));
- if (v != kv.end ()) {
- version = atoi (v->second.c_str());
- }
+ cxml::File f (file ("metadata.xml"), "Metadata");
- for (multimap<string, string>::const_iterator i = kv.begin(); i != kv.end(); ++i) {
- string const k = i->first;
- string const v = i->second;
+ _name = f.string_child ("Name");
+ _use_dci_name = f.bool_child ("UseDCIName");
+ _trust_content_headers = f.bool_child ("TrustContentHeaders");
- if (k == N_("audio_sample_rate")) {
- audio_sample_rate = atoi (v.c_str());
- }
-
- /* User-specified stuff */
- if (k == N_("name")) {
- _name = v;
- } else if (k == N_("use_dci_name")) {
- _use_dci_name = (v == N_("1"));
- } else if (k == N_("content")) {
- _content = v;
- } else if (k == N_("trust_content_header")) {
- _trust_content_header = (v == N_("1"));
- } else if (k == N_("dcp_content_type")) {
- if (version < 3) {
- _dcp_content_type = DCPContentType::from_pretty_name (v);
- } else {
- _dcp_content_type = DCPContentType::from_dci_name (v);
- }
- } else if (k == N_("format")) {
- _format = Format::from_metadata (v);
- } else if (k == N_("left_crop")) {
- _crop.left = atoi (v.c_str ());
- } else if (k == N_("right_crop")) {
- _crop.right = atoi (v.c_str ());
- } else if (k == N_("top_crop")) {
- _crop.top = atoi (v.c_str ());
- } else if (k == N_("bottom_crop")) {
- _crop.bottom = atoi (v.c_str ());
- } else if (k == N_("filter")) {
- _filters.push_back (Filter::from_id (v));
- } else if (k == N_("scaler")) {
- _scaler = Scaler::from_id (v);
- } else if ( ((!version || version < 2) && k == N_("dcp_trim_start")) || k == N_("trim_start")) {
- _trim_start = atoi (v.c_str ());
- } else if ( ((!version || version < 2) && k == N_("dcp_trim_end")) || k == N_("trim_end")) {
- _trim_end = atoi (v.c_str ());
- } else if (k == N_("dcp_ab")) {
- _dcp_ab = (v == N_("1"));
- } else if (k == N_("selected_content_audio_stream") || (!version && k == N_("selected_audio_stream"))) {
- if (!version) {
- audio_stream_index = atoi (v.c_str ());
- } else {
- _content_audio_stream = audio_stream_factory (v, version);
- }
- } else if (k == N_("external_audio")) {
- _external_audio.push_back (v);
- } else if (k == N_("use_content_audio")) {
- _use_content_audio = (v == N_("1"));
- } else if (k == N_("audio_gain")) {
- _audio_gain = atof (v.c_str ());
- } else if (k == N_("audio_delay")) {
- _audio_delay = atoi (v.c_str ());
- } else if (k == N_("still_duration")) {
- _still_duration = atoi (v.c_str ());
- } else if (k == N_("selected_subtitle_stream")) {
- if (!version) {
- subtitle_stream_index = atoi (v.c_str ());
- } else {
- _subtitle_stream = subtitle_stream_factory (v, version);
- }
- } else if (k == N_("with_subtitles")) {
- _with_subtitles = (v == N_("1"));
- } else if (k == N_("subtitle_offset")) {
- _subtitle_offset = atoi (v.c_str ());
- } else if (k == N_("subtitle_scale")) {
- _subtitle_scale = atof (v.c_str ());
- } else if (k == N_("colour_lut")) {
- _colour_lut = atoi (v.c_str ());
- } else if (k == N_("j2k_bandwidth")) {
- _j2k_bandwidth = atoi (v.c_str ());
- } else if (k == N_("dci_date")) {
- _dci_date = boost::gregorian::from_undelimited_string (v);
+ {
+ optional<string> c = f.optional_string_child ("DCPContentType");
+ if (c) {
+ _dcp_content_type = DCPContentType::from_dci_name (c.get ());
}
+ }
- _dci_metadata.read (k, v);
-
- /* Cached stuff */
- if (k == N_("width")) {
- _size.width = atoi (v.c_str ());
- } else if (k == N_("height")) {
- _size.height = atoi (v.c_str ());
- } else if (k == N_("length")) {
- int const vv = atoi (v.c_str ());
- if (vv) {
- _length = vv;
- }
- } else if (k == N_("dcp_intrinsic_duration")) {
- int const vv = atoi (v.c_str ());
- if (vv) {
- _dcp_intrinsic_duration = vv;
- }
- } else if (k == N_("content_digest")) {
- _content_digest = v;
- } else if (k == N_("content_audio_stream") || (!version && k == N_("audio_stream"))) {
- _content_audio_streams.push_back (audio_stream_factory (v, version));
- } else if (k == N_("external_audio_stream")) {
- _external_audio_stream = audio_stream_factory (v, version);
- } else if (k == N_("subtitle_stream")) {
- _subtitle_streams.push_back (subtitle_stream_factory (v, version));
- } else if (k == N_("frames_per_second")) {
- _frames_per_second = atof (v.c_str ());
+ {
+ optional<string> c = f.optional_string_child ("Format");
+ if (c) {
+ _format = Format::from_id (c.get ());
}
}
- if (!version) {
- if (audio_sample_rate) {
- /* version < 1 didn't specify sample rate in the audio streams, so fill it in here */
- for (vector<shared_ptr<AudioStream> >::iterator i = _content_audio_streams.begin(); i != _content_audio_streams.end(); ++i) {
- (*i)->set_sample_rate (audio_sample_rate.get());
- }
+ {
+ optional<string> c = f.optional_string_child ("TrimType");
+ if (!c || c.get() == "CPL") {
+ _trim_type = CPL;
+ } else if (c && c.get() == "Encode") {
+ _trim_type = ENCODE;
}
+ }
- /* also the selected stream was specified as an index */
- if (audio_stream_index && audio_stream_index.get() >= 0 && audio_stream_index.get() < (int) _content_audio_streams.size()) {
- _content_audio_stream = _content_audio_streams[audio_stream_index.get()];
- }
+ _crop.left = f.number_child<int> ("LeftCrop");
+ _crop.right = f.number_child<int> ("RightCrop");
+ _crop.top = f.number_child<int> ("TopCrop");
+ _crop.bottom = f.number_child<int> ("BottomCrop");
- /* similarly the subtitle */
- if (subtitle_stream_index && subtitle_stream_index.get() >= 0 && subtitle_stream_index.get() < (int) _subtitle_streams.size()) {
- _subtitle_stream = _subtitle_streams[subtitle_stream_index.get()];
+ {
+ list<shared_ptr<cxml::Node> > c = f.node_children ("Filter");
+ for (list<shared_ptr<cxml::Node> >::iterator i = c.begin(); i != c.end(); ++i) {
+ _filters.push_back (Filter::from_id ((*i)->content ()));
}
}
-
+
+ _scaler = Scaler::from_id (f.string_child ("Scaler"));
+ _trim_start = f.number_child<int> ("TrimStart");
+ _trim_end = f.number_child<int> ("TrimEnd");
+ _ab = f.bool_child ("AB");
+ _audio_gain = f.number_child<float> ("AudioGain");
+ _audio_delay = f.number_child<int> ("AudioDelay");
+ _with_subtitles = f.bool_child ("WithSubtitles");
+ _subtitle_offset = f.number_child<float> ("SubtitleOffset");
+ _subtitle_scale = f.number_child<float> ("SubtitleScale");
+ _colour_lut = f.number_child<int> ("ColourLUT");
+ _j2k_bandwidth = f.number_child<int> ("J2KBandwidth");
+ _dci_metadata = DCIMetadata (f.node_child ("DCIMetadata"));
+ _dcp_video_frame_rate = f.number_child<int> ("DCPVideoFrameRate");
+ _dci_date = boost::gregorian::from_undelimited_string (f.string_child ("DCIDate"));
+
+ _playlist->set_from_xml (f.node_child ("Playlist"));
+
_dirty = false;
}
return p.string ();
}
-/** @return full path of the content (actual video) file
- * of the Film.
- */
-string
-Film::content_path () const
-{
- boost::mutex::scoped_lock lm (_state_mutex);
- if (boost::filesystem::path(_content).has_root_directory ()) {
- return _content;
- }
-
- return file (_content);
-}
-
-ContentType
-Film::content_type () const
-{
- if (boost::filesystem::is_directory (_content)) {
- /* Directory of images, we assume */
- return VIDEO;
- }
-
- if (still_image_file (_content)) {
- return STILL;
- }
-
- return VIDEO;
-}
-
-/** @return The sampling rate that we will resample the audio to */
-int
-Film::target_audio_sample_rate () const
-{
- if (!audio_stream()) {
- return 0;
- }
-
- /* Resample to a DCI-approved sample rate */
- double t = dcp_audio_sample_rate (audio_stream()->sample_rate());
-
- DCPFrameRate dfr (frames_per_second ());
-
- /* Compensate if the DCP is being run at a different frame rate
- to the source; that is, if the video is run such that it will
- look different in the DCP compared to the source (slower or faster).
- skip/repeat doesn't come into effect here.
- */
-
- if (dfr.change_speed) {
- t *= _frames_per_second * dfr.factor() / dfr.frames_per_second;
- }
-
- return rint (t);
-}
-
-int
-Film::still_duration_in_frames () const
-{
- return still_duration() * frames_per_second();
-}
-
/** @return a DCI-compliant name for a DCP of this film */
string
Film::dci_name (bool if_created_now) const
fixed_name = fixed_name.substr (0, 14);
}
- d << fixed_name << N_("_");
+ d << fixed_name;
if (dcp_content_type()) {
- d << dcp_content_type()->dci_name() << N_("_");
+ d << "_" << dcp_content_type()->dci_name();
}
if (format()) {
- d << format()->dci_name() << N_("_");
+ d << "_" << format()->dci_name();
}
DCIMetadata const dm = dci_metadata ();
if (!dm.audio_language.empty ()) {
- d << dm.audio_language;
- if (!dm.subtitle_language.empty() && with_subtitles()) {
- d << N_("-") << dm.subtitle_language;
+ d << "_" << dm.audio_language;
+ if (!dm.subtitle_language.empty()) {
+ d << "-" << dm.subtitle_language;
} else {
- d << N_("-XX");
+ d << "-XX";
}
-
- d << N_("_");
}
if (!dm.territory.empty ()) {
- d << dm.territory;
+ d << "_" << dm.territory;
if (!dm.rating.empty ()) {
- d << N_("-") << dm.rating;
+ d << "-" << dm.rating;
}
- d << N_("_");
}
- switch (audio_channels()) {
- case 1:
- d << N_("10_");
- break;
- case 2:
- d << N_("20_");
- break;
- case 6:
- d << N_("51_");
- break;
- case 8:
- d << N_("71_");
- break;
- }
-
- d << N_("2K_");
+ d << "_51_2K";
if (!dm.studio.empty ()) {
- d << dm.studio << N_("_");
+ d << "_" << dm.studio;
}
if (if_created_now) {
- d << boost::gregorian::to_iso_string (boost::gregorian::day_clock::local_day ()) << N_("_");
+ d << "_" << boost::gregorian::to_iso_string (boost::gregorian::day_clock::local_day ());
} else {
- d << boost::gregorian::to_iso_string (_dci_date) << N_("_");
+ d << "_" << boost::gregorian::to_iso_string (_dci_date);
}
if (!dm.facility.empty ()) {
- d << dm.facility << N_("_");
+ d << "_" << dm.facility;
}
if (!dm.package_type.empty ()) {
- d << dm.package_type;
+ d << "_" << dm.package_type;
}
return d.str ();
}
void
-Film::set_content (string c)
-{
- string check = directory ();
-
- boost::filesystem::path slash (N_("/"));
- string platform_slash = slash.make_preferred().string ();
-
- if (!ends_with (check, platform_slash)) {
- check += platform_slash;
- }
-
- if (boost::filesystem::path(c).has_root_directory () && starts_with (c, check)) {
- c = c.substr (_directory.length() + 1);
- }
-
- string old_content;
-
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- if (c == _content) {
- return;
- }
-
- old_content = _content;
- _content = c;
- }
-
- /* Reset streams here in case the new content doesn't have one or the other */
- _content_audio_stream = shared_ptr<AudioStream> ();
- _subtitle_stream = shared_ptr<SubtitleStream> ();
-
- /* Start off using content audio */
- set_use_content_audio (true);
-
- /* Create a temporary decoder so that we can get information
- about the content.
- */
-
- try {
- Decoders d = decoder_factory (shared_from_this(), DecodeOptions());
-
- set_size (d.video->native_size ());
- set_frames_per_second (d.video->frames_per_second ());
- set_subtitle_streams (d.video->subtitle_streams ());
- if (d.audio) {
- set_content_audio_streams (d.audio->audio_streams ());
- }
-
- /* Start off with the first audio and subtitle streams */
- if (d.audio && !d.audio->audio_streams().empty()) {
- set_content_audio_stream (d.audio->audio_streams().front());
- }
-
- if (!d.video->subtitle_streams().empty()) {
- set_subtitle_stream (d.video->subtitle_streams().front());
- }
-
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _content = c;
- }
-
- signal_changed (CONTENT);
-
- examine_content ();
-
- } catch (...) {
-
- boost::mutex::scoped_lock lm (_state_mutex);
- _content = old_content;
- throw;
-
- }
-
- /* Default format */
- switch (content_type()) {
- case STILL:
- set_format (Format::from_id (N_("var-185")));
- break;
- case VIDEO:
- set_format (Format::from_id (N_("185")));
- break;
- }
-
- /* Still image DCPs must use external audio */
- if (content_type() == STILL) {
- set_use_content_audio (false);
- }
-}
-
-void
-Film::set_trust_content_header (bool t)
+Film::set_trust_content_headers (bool t)
{
{
boost::mutex::scoped_lock lm (_state_mutex);
- _trust_content_header = t;
+ _trust_content_headers = t;
}
- signal_changed (TRUST_CONTENT_HEADER);
-
- if (!_trust_content_header && !content().empty()) {
+ signal_changed (TRUST_CONTENT_HEADERS);
+
+ Playlist::ContentList content = _playlist->content ();
+ if (!_trust_content_headers && !content.empty()) {
/* We just said that we don't trust the content's header */
- examine_content ();
+ for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) {
+ examine_content (*i);
+ }
}
}
}
void
-Film::set_dcp_ab (bool a)
+Film::set_trim_type (TrimType t)
{
{
boost::mutex::scoped_lock lm (_state_mutex);
- _dcp_ab = a;
+ _trim_type = t;
}
- signal_changed (DCP_AB);
+ signal_changed (TRIM_TYPE);
}
void
-Film::set_content_audio_stream (shared_ptr<AudioStream> s)
+Film::set_ab (bool a)
{
{
boost::mutex::scoped_lock lm (_state_mutex);
- _content_audio_stream = s;
+ _ab = a;
}
- signal_changed (CONTENT_AUDIO_STREAM);
-}
-
-void
-Film::set_external_audio (vector<string> a)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _external_audio = a;
- }
-
- shared_ptr<ExternalAudioDecoder> decoder (new ExternalAudioDecoder (shared_from_this(), DecodeOptions()));
- if (decoder->audio_stream()) {
- _external_audio_stream = decoder->audio_stream ();
- }
-
- signal_changed (EXTERNAL_AUDIO);
-}
-
-void
-Film::set_use_content_audio (bool e)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _use_content_audio = e;
- }
-
- signal_changed (USE_CONTENT_AUDIO);
+ signal_changed (AB);
}
void
signal_changed (AUDIO_DELAY);
}
-void
-Film::set_still_duration (int d)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _still_duration = d;
- }
- signal_changed (STILL_DURATION);
-}
-
-void
-Film::set_subtitle_stream (shared_ptr<SubtitleStream> s)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _subtitle_stream = s;
- }
- signal_changed (SUBTITLE_STREAM);
-}
-
void
Film::set_with_subtitles (bool w)
{
signal_changed (DCI_METADATA);
}
-void
-Film::set_size (libdcp::Size s)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _size = s;
- }
- signal_changed (SIZE);
-}
-
-void
-Film::set_length (SourceFrame l)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _length = l;
- }
- signal_changed (LENGTH);
-}
void
-Film::unset_length ()
+Film::set_dcp_video_frame_rate (int f)
{
{
boost::mutex::scoped_lock lm (_state_mutex);
- _length = boost::none;
+ _dcp_video_frame_rate = f;
}
- signal_changed (LENGTH);
+ signal_changed (DCP_VIDEO_FRAME_RATE);
}
-void
-Film::set_dcp_intrinsic_duration (int d)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _dcp_intrinsic_duration = d;
- }
- signal_changed (DCP_INTRINSIC_DURATION);
-}
-
-void
-Film::set_content_digest (string d)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _content_digest = d;
- }
- _dirty = true;
-}
-
-void
-Film::set_content_audio_streams (vector<shared_ptr<AudioStream> > s)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _content_audio_streams = s;
- }
- signal_changed (CONTENT_AUDIO_STREAMS);
-}
-
-void
-Film::set_subtitle_streams (vector<shared_ptr<SubtitleStream> > s)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _subtitle_streams = s;
- }
- signal_changed (SUBTITLE_STREAMS);
-}
-
-void
-Film::set_frames_per_second (float f)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _frames_per_second = f;
- }
- signal_changed (FRAMES_PER_SECOND);
-}
-
void
Film::signal_changed (Property p)
{
_dirty = true;
}
- if (ui_signaller) {
- ui_signaller->emit (boost::bind (boost::ref (Changed), p));
+ switch (p) {
+ case Film::CONTENT:
+ set_dcp_video_frame_rate (_playlist->best_dcp_frame_rate ());
+ break;
+ default:
+ break;
}
-}
-int
-Film::audio_channels () const
-{
- shared_ptr<AudioStream> s = audio_stream ();
- if (!s) {
- return 0;
+ if (ui_signaller) {
+ ui_signaller->emit (boost::bind (boost::ref (Changed), p));
}
-
- return s->channels ();
}
void
_dci_date = boost::gregorian::day_clock::local_day ();
}
-boost::shared_ptr<AudioStream>
-Film::audio_stream () const
-{
- if (use_content_audio()) {
- return _content_audio_stream;
- }
-
- return _external_audio_stream;
-}
-
string
Film::info_path (int f) const
{
stringstream s;
s.width (8);
- s << setfill('0') << f << N_(".md5");
+ s << setfill('0') << f << ".md5";
p /= s.str();
Film::j2c_path (int f, bool t) const
{
boost::filesystem::path p;
- p /= N_("j2c");
+ p /= "j2c";
p /= video_state_identifier ();
stringstream s;
s.width (8);
- s << setfill('0') << f << N_(".j2c");
+ s << setfill('0') << f << ".j2c";
if (t) {
- s << N_(".tmp");
+ s << ".tmp";
}
p /= s.str();
return true;
}
+
+shared_ptr<Player>
+Film::player () const
+{
+ boost::mutex::scoped_lock lm (_state_mutex);
+ return shared_ptr<Player> (new Player (shared_from_this (), _playlist));
+}
+
+shared_ptr<Playlist>
+Film::playlist () const
+{
+ boost::mutex::scoped_lock lm (_state_mutex);
+ return _playlist;
+}
+
+Playlist::ContentList
+Film::content () const
+{
+ return _playlist->content ();
+}
+
+void
+Film::add_content (shared_ptr<Content> c)
+{
+ _playlist->add (c);
+ examine_content (c);
+}
+
+void
+Film::remove_content (shared_ptr<Content> c)
+{
+ _playlist->remove (c);
+}
+
+Time
+Film::length () const
+{
+ return _playlist->length (shared_from_this ());
+}
+
+bool
+Film::has_subtitles () const
+{
+ return _playlist->has_subtitles ();
+}
+
+OutputVideoFrame
+Film::best_dcp_video_frame_rate () const
+{
+ return _playlist->best_dcp_frame_rate ();
+}
+
+void
+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 ());
+ }
+
+ if (ui_signaller) {
+ ui_signaller->emit (boost::bind (boost::ref (ContentChanged), c, p));
+ }
+}
+
+void
+Film::playlist_changed ()
+{
+ 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;
+}
+
+OutputVideoFrame
+Film::time_to_video_frames (Time t) const
+{
+ return t * dcp_video_frame_rate () / TIME_HZ;
+}
+
+Time
+Film::audio_frames_to_time (OutputAudioFrame f) const
+{
+ return f * TIME_HZ / dcp_audio_frame_rate ();
+}
+
+Time
+Film::video_frames_to_time (OutputVideoFrame f) const
+{
+ return f * TIME_HZ / dcp_video_frame_rate ();
+}
+
+OutputAudioFrame
+Film::dcp_audio_frame_rate () const
+{
+ /* XXX */
+ return 48000;
+}
projects / dcpomatic.git / blobdiff