projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add -ISDCF to ISDCF name as required (#2416).
[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 def58c5ebb3a5a7bc0e69dcccc2df31be1ed82b0..9adca5a2da33d40d91f5312f5ccb9918df006206 100644
(file)
--- a/
src/lib/video_mxf_content.cc
+++ b/
src/lib/video_mxf_content.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,6
+18,7
@@
*/
*/
+
#include "video_mxf_examiner.h"
#include "video_mxf_content.h"
#include "video_content.h"
#include "video_mxf_examiner.h"
#include "video_mxf_content.h"
#include "video_content.h"
@@
-32,9
+33,13
@@
#include "i18n.h"
#include "i18n.h"
+
using std::list;
using std::string;
using std::list;
using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::make_shared;
+using namespace dcpomatic;
+
VideoMXFContent::VideoMXFContent (boost::filesystem::path path)
: Content (path)
VideoMXFContent::VideoMXFContent (boost::filesystem::path path)
: Content (path)
@@
-42,33
+47,35
@@
VideoMXFContent::VideoMXFContent (boost::filesystem::path path)
}
}
+
VideoMXFContent::VideoMXFContent (cxml::ConstNodePtr node, int version)
: Content (node)
{
VideoMXFContent::VideoMXFContent (cxml::ConstNodePtr node, int version)
: Content (node)
{
- video = VideoContent::from_xml (this, node, version);
+ video = VideoContent::from_xml (this, node, version
, VideoRange::FULL
);
}
}
+
bool
VideoMXFContent::valid_mxf (boost::filesystem::path path)
{
Kumu::DefaultLogSink().UnsetFilterFlag(Kumu::LOG_ALLOW_ALL);
try {
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)
);
+
dcp::MonoPictureAsset mp (path
);
return true;
} catch (dcp::MXFFileError& e) {
return true;
} catch (dcp::MXFFileError& e) {
- } catch (dcp::
DCP
ReadError& e) {
+ } catch (dcp::ReadError& e) {
}
try {
Kumu::DefaultLogSink().SetFilterFlag(0);
}
try {
Kumu::DefaultLogSink().SetFilterFlag(0);
-
shared_ptr<dcp::StereoPictureAsset> sp (new dcp::StereoPictureAsset (path)
);
+
dcp::StereoPictureAsset sp (path
);
return true;
} catch (dcp::MXFFileError& e) {
return true;
} catch (dcp::MXFFileError& e) {
- } catch (dcp::
DCP
ReadError& e) {
+ } catch (dcp::ReadError& e) {
}
}
@@
-77,6
+84,7
@@
VideoMXFContent::valid_mxf (boost::filesystem::path path)
return false;
}
return false;
}
+
void
VideoMXFContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
{
void
VideoMXFContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
{
@@
-85,46
+93,60
@@
VideoMXFContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
Content::examine (film, job);
video.reset (new VideoContent (this));
Content::examine (film, job);
video.reset (new VideoContent (this));
-
shared_ptr<VideoMXFExaminer> examiner (new VideoMXFExaminer (shared_from_this ()
));
- video->take_from_examiner
(
examiner);
+
auto examiner = make_shared<VideoMXFExaminer>(shared_from_this(
));
+ video->take_from_examiner
(film,
examiner);
video->unset_colour_conversion ();
}
video->unset_colour_conversion ();
}
+
string
VideoMXFContent::summary () const
{
return String::compose (_("%1 [video]"), path_summary());
}
string
VideoMXFContent::summary () const
{
return String::compose (_("%1 [video]"), path_summary());
}
+
string
VideoMXFContent::technical_summary () const
{
string
VideoMXFContent::technical_summary () const
{
- return Content::technical_summary() + " - " + video->technical_summary
();
+ return Content::technical_summary() + " - " + video->technical_summary();
}
}
+
string
VideoMXFContent::identifier () const
{
return Content::identifier() + "_" + video->identifier();
}
string
VideoMXFContent::identifier () const
{
return Content::identifier() + "_" + video->identifier();
}
+
void
VideoMXFContent::as_xml (xmlpp::Node* node, bool with_paths) const
{
void
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, with_paths);
video->as_xml (node);
}
Content::as_xml (node, with_paths);
video->as_xml (node);
}
+
DCPTime
VideoMXFContent::full_length (shared_ptr<const Film> film) const
{
FrameRateChange const frc (film, shared_from_this());
DCPTime
VideoMXFContent::full_length (shared_ptr<const Film> film) const
{
FrameRateChange const frc (film, shared_from_this());
- return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film->video_frame_rate());
+ return DCPTime::from_frames (llrint(video->length_after_3d_combine() * frc.factor()), film->video_frame_rate());
+}
+
+
+DCPTime
+VideoMXFContent::approximate_length () const
+{
+ return DCPTime::from_frames (video->length_after_3d_combine(), 24);
}
}
+
void
void
-VideoMXFContent::add_properties (list<UserProperty>& p) const
+VideoMXFContent::add_properties (
shared_ptr<const Film> film,
list<UserProperty>& p) const
{
{
+ Content::add_properties (film, p);
video->add_properties (p);
}
video->add_properties (p);
}