projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add --no-check to dcpomatic_cli.
[dcpomatic.git]
/
src
/
lib
/
video_mxf_content.cc
diff --git
a/src/lib/video_mxf_content.cc
b/src/lib/video_mxf_content.cc
index f049965d4db705ddb31c5602f424ba94418d501d..bf8bb9f469b22fb772c9b547f8876e40284f4175 100644
(file)
--- a/
src/lib/video_mxf_content.cc
+++ b/
src/lib/video_mxf_content.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 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.
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
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/>.
*/
*/
@@
-23,6
+24,7
@@
#include "job.h"
#include "film.h"
#include "compose.hpp"
#include "job.h"
#include "film.h"
#include "compose.hpp"
+#include <asdcp/KM_log.h>
#include <dcp/mono_picture_asset.h>
#include <dcp/stereo_picture_asset.h>
#include <dcp/exceptions.h>
#include <dcp/mono_picture_asset.h>
#include <dcp/stereo_picture_asset.h>
#include <dcp/exceptions.h>
@@
-33,15
+35,16
@@
using std::list;
using std::string;
using boost::shared_ptr;
using std::list;
using std::string;
using boost::shared_ptr;
+using namespace dcpomatic;
-VideoMXFContent::VideoMXFContent (
shared_ptr<const Film> film,
boost::filesystem::path path)
- : Content (
film,
path)
+VideoMXFContent::VideoMXFContent (boost::filesystem::path path)
+ : Content (path)
{
}
{
}
-VideoMXFContent::VideoMXFContent (
shared_ptr<const Film> film,
cxml::ConstNodePtr node, int version)
- : Content (
film,
node)
+VideoMXFContent::VideoMXFContent (cxml::ConstNodePtr node, int version)
+ : Content (node)
{
video = VideoContent::from_xml (this, node, version);
}
{
video = VideoContent::from_xml (this, node, version);
}
@@
-49,6
+52,8
@@
VideoMXFContent::VideoMXFContent (shared_ptr<const Film> film, cxml::ConstNodePt
bool
VideoMXFContent::valid_mxf (boost::filesystem::path path)
{
bool
VideoMXFContent::valid_mxf (boost::filesystem::path path)
{
+ Kumu::DefaultLogSink().UnsetFilterFlag(Kumu::LOG_ALLOW_ALL);
+
try {
shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (path));
return true;
try {
shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (path));
return true;
@@
-59,6
+64,7
@@
VideoMXFContent::valid_mxf (boost::filesystem::path path)
}
try {
}
try {
+ Kumu::DefaultLogSink().SetFilterFlag(0);
shared_ptr<dcp::StereoPictureAsset> sp (new dcp::StereoPictureAsset (path));
return true;
} catch (dcp::MXFFileError& e) {
shared_ptr<dcp::StereoPictureAsset> sp (new dcp::StereoPictureAsset (path));
return true;
} catch (dcp::MXFFileError& e) {
@@
-67,19
+73,22
@@
VideoMXFContent::valid_mxf (boost::filesystem::path path)
}
}
+ Kumu::DefaultLogSink().SetFilterFlag(Kumu::LOG_ALLOW_ALL);
+
return false;
}
void
return false;
}
void
-VideoMXFContent::examine (shared_ptr<Job> job)
+VideoMXFContent::examine (shared_ptr<
const Film> film, shared_ptr<
Job> job)
{
job->set_progress_unknown ();
{
job->set_progress_unknown ();
- Content::examine (job);
+ Content::examine (
film,
job);
video.reset (new VideoContent (this));
shared_ptr<VideoMXFExaminer> examiner (new VideoMXFExaminer (shared_from_this ()));
video->take_from_examiner (examiner);
video.reset (new VideoContent (this));
shared_ptr<VideoMXFExaminer> examiner (new VideoMXFExaminer (shared_from_this ()));
video->take_from_examiner (examiner);
+ video->unset_colour_conversion ();
}
string
}
string
@@
-101,28
+110,29
@@
VideoMXFContent::identifier () const
}
void
}
void
-VideoMXFContent::as_xml (xmlpp::Node* node) const
+VideoMXFContent::as_xml (xmlpp::Node* node
, bool with_paths
) const
{
node->add_child("Type")->add_child_text ("VideoMXF");
{
node->add_child("Type")->add_child_text ("VideoMXF");
- Content::as_xml (node);
+ Content::as_xml (node
, with_paths
);
video->as_xml (node);
}
DCPTime
video->as_xml (node);
}
DCPTime
-VideoMXFContent::full_length () const
+VideoMXFContent::full_length (
shared_ptr<const Film> film
) const
{
{
- FrameRateChange const frc (
active_video_frame_rate(), film()->video_frame_rate
());
- return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film
()
->video_frame_rate());
+ FrameRateChange const frc (
film, shared_from_this
());
+ return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film->video_frame_rate());
}
}
-void
-VideoMXFContent::a
dd_properties (list<UserProperty>& p
) const
+DCPTime
+VideoMXFContent::a
pproximate_length (
) const
{
{
-
video->add_properties (p
);
+
return DCPTime::from_frames (video->length_after_3d_combine(), 24
);
}
void
}
void
-VideoMXFContent::
set_default_colour_conversion ()
+VideoMXFContent::
add_properties (shared_ptr<const Film> film, list<UserProperty>& p) const
{
{
- video->unset_colour_conversion ();
+ Content::add_properties (film, p);
+ video->add_properties (p);
}
}