/*
Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#include "dcp_decoder.h"
#include "subtitle_content.h"
#include <dcp/dcp.h>
+#include <dcp/raw_convert.h>
#include <dcp/exceptions.h>
#include <dcp/reel_picture_asset.h>
#include <dcp/reel.h>
using boost::scoped_ptr;
using boost::optional;
using boost::function;
+using dcp::raw_convert;
int const DCPContentProperty::CAN_BE_PLAYED = 600;
int const DCPContentProperty::REFERENCE_VIDEO = 601;
DCPContent::DCPContent (shared_ptr<const Film> film, boost::filesystem::path p)
: Content (film)
, _encrypted (false)
+ , _needs_assets (false)
, _kdm_valid (false)
, _reference_video (false)
, _reference_audio (false)
, _reference_subtitle (false)
+ , _three_d (false)
{
video.reset (new VideoContent (this));
audio.reset (new AudioContent (this));
: Content (film, node)
{
video = VideoContent::from_xml (this, node, version);
- audio = AudioContent::from_xml (this, node);
+ audio = AudioContent::from_xml (this, node, version);
subtitle = SubtitleContent::from_xml (this, node, version);
audio->set_stream (
AudioStreamPtr (
new AudioStream (
node->number_child<int> ("AudioFrameRate"),
- node->number_child<Frame> ("AudioLength"),
+ /* AudioLength was not present in some old metadata versions */
+ node->optional_number_child<Frame>("AudioLength").get_value_or (
+ video->length() * node->number_child<int>("AudioFrameRate") / video_frame_rate().get()
+ ),
AudioMapping (node->node_child ("AudioMapping"), version)
)
)
);
_name = node->string_child ("Name");
-
_encrypted = node->bool_child ("Encrypted");
+ _needs_assets = node->bool_child ("NeedsAssets");
if (node->optional_node_child ("KDM")) {
_kdm = dcp::EncryptedKDM (node->string_child ("KDM"));
}
DCPOMATIC_ASSERT (false);
}
}
+ _three_d = node->optional_bool_child("ThreeD").get_value_or (false);
+ _cpl = node->optional_string_child("CPL");
}
void
subtitle.reset (new SubtitleContent (this));
}
_encrypted = examiner->encrypted ();
+ _needs_assets = examiner->needs_assets ();
_kdm_valid = examiner->kdm_valid ();
_standard = examiner->standard ();
+ _three_d = examiner->three_d ();
+ _cpl = examiner->cpl ();
}
if (could_be_played != can_be_played ()) {
signal_changed (DCPContentProperty::CAN_BE_PLAYED);
}
+
+ video->set_frame_type (_three_d ? VIDEO_FRAME_TYPE_3D : VIDEO_FRAME_TYPE_2D);
}
string
}
void
-DCPContent::as_xml (xmlpp::Node* node) const
+DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const
{
node->add_child("Type")->add_child_text ("DCP");
boost::mutex::scoped_lock lm (_mutex);
node->add_child("Name")->add_child_text (_name);
node->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0");
+ node->add_child("NeedsAssets")->add_child_text (_needs_assets ? "1" : "0");
if (_kdm) {
node->add_child("KDM")->add_child_text (_kdm->as_xml ());
}
DCPOMATIC_ASSERT (false);
}
}
+ node->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0");
+ if (_cpl) {
+ node->add_child("CPL")->add_child_text (_cpl.get ());
+ }
}
DCPTime
string
DCPContent::identifier () const
{
- SafeStringStream s;
- s << Content::identifier() << "_" << video->identifier() << "_";
+ string s = Content::identifier() + "_" + video->identifier() + "_";
if (subtitle) {
- s << subtitle->identifier () << " ";
+ s += subtitle->identifier () + " ";
}
- s << (_reference_video ? "1" : "0")
- << (_reference_subtitle ? "1" : "0");
- return s.str ();
+
+ s += string (_reference_video ? "1" : "0") + string (_reference_subtitle ? "1" : "0");
+ return s;
}
void
_kdm = k;
}
+void
+DCPContent::add_ov (boost::filesystem::path ov)
+{
+ read_directory (ov);
+}
+
bool
DCPContent::can_be_played () const
+{
+ return !needs_kdm() && !needs_assets();
+}
+
+bool
+DCPContent::needs_kdm () const
{
boost::mutex::scoped_lock lm (_mutex);
- return !_encrypted || _kdm_valid;
+ return _encrypted && !_kdm_valid;
}
-boost::filesystem::path
-DCPContent::directory () const
+bool
+DCPContent::needs_assets () const
{
- optional<size_t> smallest;
- boost::filesystem::path dir;
- for (size_t i = 0; i < number_of_paths(); ++i) {
- boost::filesystem::path const p = path (i).parent_path ();
- size_t const d = distance (p.begin(), p.end());
- if (!smallest || d < smallest.get ()) {
- dir = p;
- }
- }
+ boost::mutex::scoped_lock lm (_mutex);
+ return _needs_assets;
+}
- return dir;
+vector<boost::filesystem::path>
+DCPContent::directories () const
+{
+ return dcp::DCP::directories_from_files (paths ());
}
void
DCPContent::add_properties (list<UserProperty>& p) const
{
+ Content::add_properties (p);
+ video->add_properties (p);
audio->add_properties (p);
}
list<DCPTimePeriod> p;
scoped_ptr<DCPDecoder> decoder;
try {
- decoder.reset (new DCPDecoder (shared_from_this(), film()->log(), false));
+ decoder.reset (new DCPDecoder (shared_from_this(), film()->log()));
} catch (...) {
/* Could not load the DCP; guess reels */
list<DCPTimePeriod> p;
*/
BOOST_FOREACH (DCPTimePeriod i, reels()) {
if (find (fr.begin(), fr.end(), i) == fr.end ()) {
- why_not.push_back (_("Reel lengths in the film differ from those in the DCP; set the reel mode to 'split by video content'."));
+ why_not.push_back (_("The reel lengths in the film differ from those in the DCP; set the reel mode to 'split by video content'."));
return false;
}
}
bool
DCPContent::can_reference_audio (list<string>& why_not) const
{
- DCPDecoder decoder (shared_from_this(), film()->log(), false);
+ DCPDecoder decoder (shared_from_this(), film()->log());
BOOST_FOREACH (shared_ptr<dcp::Reel> i, decoder.reels()) {
if (!i->main_sound()) {
why_not.push_back (_("The DCP does not have sound in all reels."));
bool
DCPContent::can_reference_subtitle (list<string>& why_not) const
{
- DCPDecoder decoder (shared_from_this(), film()->log(), false);
+ DCPDecoder decoder (shared_from_this(), film()->log());
BOOST_FOREACH (shared_ptr<dcp::Reel> i, decoder.reels()) {
if (!i->main_subtitle()) {
why_not.push_back (_("The DCP does not have subtitles in all reels."));
projects / dcpomatic.git / blobdiff