+/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
+
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
#include <libxml++/libxml++.h>
#include <libcxml/cxml.h>
#include "film.h"
-#include "format.h"
+#include "container.h"
#include "job.h"
#include "filter.h"
#include "util.h"
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
- * must_exist is true and the specified directory does not exist.
+/** Construct a Film object in a given directory.
*
* @param d Film directory.
- * @param must_exist true to throw an exception if does not exist.
*/
-Film::Film (string d, bool must_exist)
+Film::Film (string d)
: _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 ())
+ , _container (Config::instance()->default_container ())
, _scaler (Scaler::from_id ("bicubic"))
- , _trim_start (0)
- , _trim_end (0)
- , _trim_type (CPL)
, _ab (false)
- , _audio_gain (0)
- , _audio_delay (0)
, _with_subtitles (false)
, _subtitle_offset (0)
, _subtitle_scale (1)
, _j2k_bandwidth (200000000)
, _dci_metadata (Config::instance()->default_dci_metadata ())
, _dcp_video_frame_rate (0)
+ , _dcp_audio_channels (MAX_AUDIO_CHANNELS)
, _dirty (false)
{
set_dci_date_today ();
}
set_directory (result.string ());
-
- if (!boost::filesystem::exists (directory())) {
- if (must_exist) {
- throw OpenFileError (directory());
- } else {
- boost::filesystem::create_directory (directory());
- }
- }
-
- if (must_exist) {
- read_metadata ();
- } else {
- write_metadata ();
- }
-
_log.reset (new FileLog (file ("log")));
}
, _directory (o._directory)
, _name (o._name)
, _use_dci_name (o._use_dci_name)
- , _trust_content_headers (o._trust_content_headers)
, _dcp_content_type (o._dcp_content_type)
- , _format (o._format)
- , _crop (o._crop)
- , _filters (o._filters)
+ , _container (o._container)
, _scaler (o._scaler)
- , _trim_start (o._trim_start)
- , _trim_end (o._trim_end)
- , _trim_type (o._trim_type)
, _ab (o._ab)
- , _audio_gain (o._audio_gain)
- , _audio_delay (o._audio_delay)
, _with_subtitles (o._with_subtitles)
, _subtitle_offset (o._subtitle_offset)
, _subtitle_scale (o._subtitle_scale)
string
Film::video_state_identifier () const
{
- assert (format ());
+ assert (container ());
LocaleGuard lg;
- pair<string, string> f = Filter::ffmpeg_strings (filters());
-
stringstream s;
- s << format()->id()
+ s << container()->id()
<< "_" << _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());
+ << "_" << lexical_cast<int> (colour_lut());
if (ab()) {
pair<string, string> fa = Filter::ffmpeg_strings (Config::instance()->reference_filters());
pair<string, int> const c = cpu_info ();
log()->log (String::compose ("CPU: %1, %2 processors", c.first, c.second));
- if (format() == 0) {
- throw MissingSettingError (_("format"));
+ if (container() == 0) {
+ throw MissingSettingError (_("container"));
}
- if (_playlist->regions().empty ()) {
+ if (_playlist->content().empty ()) {
throw StringError (_("You must add some content to the DCP before creating it"));
}
void
Film::examine_content (shared_ptr<Content> c)
{
- shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), c, trust_content_headers ()));
+ shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), c));
JobManager::instance()->add (j);
}
int
Film::encoded_frames () const
{
- if (format() == 0) {
+ if (container() == 0) {
return 0;
}
void
Film::write_metadata () const
{
+ if (!boost::filesystem::exists (directory())) {
+ boost::filesystem::create_directory (directory());
+ }
+
boost::mutex::scoped_lock lm (_state_mutex);
LocaleGuard lg;
xmlpp::Document doc;
xmlpp::Element* root = doc.create_root_node ("Metadata");
- root->add_child("Version")->add_child_text (boost::lexical_cast<string> (state_version));
+ root->add_child("Version")->add_child_text (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");
if (_dcp_content_type) {
root->add_child("DCPContentType")->add_child_text (_dcp_content_type->dci_name ());
}
- if (_format) {
- root->add_child("Format")->add_child_text (_format->id ());
+ if (_container) {
+ root->add_child("Container")->add_child_text (_container->id ());
}
- 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));
-
- for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
- root->add_child("Filter")->add_child_text ((*i)->id ());
- }
-
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));
+ root->add_child("SubtitleOffset")->add_child_text (lexical_cast<string> (_subtitle_offset));
+ root->add_child("SubtitleScale")->add_child_text (lexical_cast<string> (_subtitle_scale));
+ root->add_child("ColourLUT")->add_child_text (lexical_cast<string> (_colour_lut));
+ 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 (boost::lexical_cast<string> (_dcp_video_frame_rate));
+ root->add_child("DCPVideoFrameRate")->add_child_text (lexical_cast<string> (_dcp_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));
_playlist->as_xml (root->add_child ("Playlist"));
doc.write_to_file_formatted (file ("metadata.xml"));
_name = f.string_child ("Name");
_use_dci_name = f.bool_child ("UseDCIName");
- _trust_content_headers = f.bool_child ("TrustContentHeaders");
{
optional<string> c = f.optional_string_child ("DCPContentType");
}
{
- optional<string> c = f.optional_string_child ("Format");
+ optional<string> c = f.optional_string_child ("Container");
if (c) {
- _format = Format::from_id (c.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;
- }
- }
-
- _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");
-
- {
- 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 ()));
+ _container = Container::from_id (c.get ());
}
}
_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");
_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"));
+ _dcp_audio_channels = f.number_child<int> ("DCPAudioChannels");
- _playlist->set_from_xml (f.node_child ("Playlist"));
+ _playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"));
_dirty = false;
}
-libdcp::Size
-Film::cropped_size (libdcp::Size s) const
-{
- boost::mutex::scoped_lock lm (_state_mutex);
- s.width -= _crop.left + _crop.right;
- s.height -= _crop.top + _crop.bottom;
- return s;
-}
-
/** Given a directory name, return its full path within the Film's directory.
* The directory (and its parents) will be created if they do not exist.
*/
d << "_" << dcp_content_type()->dci_name();
}
- if (format()) {
- d << "_" << format()->dci_name();
+ if (container()) {
+ d << "_" << container()->dci_name();
}
DCIMetadata const dm = dci_metadata ();
signal_changed (USE_DCI_NAME);
}
-void
-Film::set_trust_content_headers (bool t)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _trust_content_headers = t;
- }
-
- signal_changed (TRUST_CONTENT_HEADERS);
-
-
- Playlist::RegionList regions = _playlist->regions ();
- if (!_trust_content_headers && !regions.empty()) {
- /* We just said that we don't trust the content's header */
- for (Playlist::RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
- examine_content (i->content);
- }
- }
-}
-
void
Film::set_dcp_content_type (DCPContentType const * t)
{
}
void
-Film::set_format (Format const * f)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _format = f;
- }
- signal_changed (FORMAT);
-}
-
-void
-Film::set_crop (Crop c)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _crop = c;
- }
- signal_changed (CROP);
-}
-
-void
-Film::set_left_crop (int c)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
-
- if (_crop.left == c) {
- return;
- }
-
- _crop.left = c;
- }
- signal_changed (CROP);
-}
-
-void
-Film::set_right_crop (int c)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- if (_crop.right == c) {
- return;
- }
-
- _crop.right = c;
- }
- signal_changed (CROP);
-}
-
-void
-Film::set_top_crop (int c)
+Film::set_container (Container const * c)
{
{
boost::mutex::scoped_lock lm (_state_mutex);
- if (_crop.top == c) {
- return;
- }
-
- _crop.top = c;
+ _container = c;
}
- signal_changed (CROP);
-}
-
-void
-Film::set_bottom_crop (int c)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- if (_crop.bottom == c) {
- return;
- }
-
- _crop.bottom = c;
- }
- signal_changed (CROP);
-}
-
-void
-Film::set_filters (vector<Filter const *> f)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _filters = f;
- }
- signal_changed (FILTERS);
+ signal_changed (CONTAINER);
}
void
signal_changed (SCALER);
}
-void
-Film::set_trim_start (int t)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _trim_start = t;
- }
- signal_changed (TRIM_START);
-}
-
-void
-Film::set_trim_end (int t)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _trim_end = t;
- }
- signal_changed (TRIM_END);
-}
-
-void
-Film::set_trim_type (TrimType t)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _trim_type = t;
- }
- signal_changed (TRIM_TYPE);
-}
-
void
Film::set_ab (bool a)
{
signal_changed (AB);
}
-void
-Film::set_audio_gain (float g)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _audio_gain = g;
- }
- signal_changed (AUDIO_GAIN);
-}
-
-void
-Film::set_audio_delay (int d)
-{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _audio_delay = d;
- }
- signal_changed (AUDIO_DELAY);
-}
-
void
Film::set_with_subtitles (bool w)
{
shared_ptr<Player>
Film::player () const
{
- boost::mutex::scoped_lock lm (_state_mutex);
return shared_ptr<Player> (new Player (shared_from_this (), _playlist));
}
return _playlist;
}
-Playlist::RegionList
-Film::regions () const
+Playlist::ContentList
+Film::content () const
{
- return _playlist->regions ();
+ return _playlist->content ();
}
void
Time
Film::length () const
{
- return _playlist->length (shared_from_this ());
+ return _playlist->length ();
}
bool
projects / dcpomatic.git / blobdiff