projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setup SubtitleDecoder::_position correctly (in some cases).
[dcpomatic.git]
/
src
/
lib
/
dcp_examiner.h
diff --git
a/src/lib/dcp_examiner.h
b/src/lib/dcp_examiner.h
index 03d43d0f6c9f7a270ab2f2b16d147c4389ec289d..d9c372c3c590a37510ff18b91bbc36dedddd66de 100644
(file)
--- a/
src/lib/dcp_examiner.h
+++ b/
src/lib/dcp_examiner.h
@@
-1,44
+1,54
@@
/*
Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014 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/>.
*/
*/
+/** @file src/lib/dcp_examiner.h
+ * @brief DCPExaminer class.
+ */
+
#include "video_examiner.h"
#include "audio_examiner.h"
#include "video_examiner.h"
#include "audio_examiner.h"
+#include "dcp.h"
class DCPContent;
class DCPContent;
-class DCPExaminer : public VideoExaminer, public AudioExaminer
+class DCPExaminer : public
DCP, public
VideoExaminer, public AudioExaminer
{
public:
DCPExaminer (boost::shared_ptr<const DCPContent>);
{
public:
DCPExaminer (boost::shared_ptr<const DCPContent>);
-
-
float
video_frame_rate () const {
- return _video_frame_rate
.get_value_or (24)
;
+
+
boost::optional<double>
video_frame_rate () const {
+ return _video_frame_rate;
}
}
-
+
dcp::Size video_size () const {
return _video_size.get_value_or (dcp::Size (1998, 1080));
}
dcp::Size video_size () const {
return _video_size.get_value_or (dcp::Size (1998, 1080));
}
-
-
ContentTi
me video_length () const {
+
+
Fra
me video_length () const {
return _video_length;
}
return _video_length;
}
+ bool yuv () const {
+ return false;
+ }
+
std::string name () const {
return _name;
}
std::string name () const {
return _name;
}
@@
-51,14
+61,18
@@
public:
return _encrypted;
}
return _encrypted;
}
+ bool needs_assets () const {
+ return _needs_assets;
+ }
+
int audio_channels () const {
return _audio_channels.get_value_or (0);
}
int audio_channels () const {
return _audio_channels.get_value_or (0);
}
-
-
ContentTi
me audio_length () const {
+
+
Fra
me audio_length () const {
return _audio_length;
}
return _audio_length;
}
-
+
int audio_frame_rate () const {
return _audio_frame_rate.get_value_or (48000);
}
int audio_frame_rate () const {
return _audio_frame_rate.get_value_or (48000);
}
@@
-67,15
+81,36
@@
public:
return _kdm_valid;
}
return _kdm_valid;
}
+ boost::optional<dcp::Standard> standard () const {
+ return _standard;
+ }
+
+ bool three_d () const {
+ return _three_d;
+ }
+
+ std::string cpl () const {
+ return _cpl;
+ }
+
+ std::list<int64_t> reel_lengths () const {
+ return _reel_lengths;
+ }
+
private:
private:
- boost::optional<
float
> _video_frame_rate;
+ boost::optional<
double
> _video_frame_rate;
boost::optional<dcp::Size> _video_size;
boost::optional<dcp::Size> _video_size;
-
ContentTi
me _video_length;
+
Fra
me _video_length;
boost::optional<int> _audio_channels;
boost::optional<int> _audio_frame_rate;
boost::optional<int> _audio_channels;
boost::optional<int> _audio_frame_rate;
-
ContentTi
me _audio_length;
+
Fra
me _audio_length;
std::string _name;
bool _has_subtitles;
bool _encrypted;
std::string _name;
bool _has_subtitles;
bool _encrypted;
+ bool _needs_assets;
bool _kdm_valid;
bool _kdm_valid;
+ boost::optional<dcp::Standard> _standard;
+ bool _three_d;
+ std::string _cpl;
+ std::list<int64_t> _reel_lengths;
};
};