projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disallow referencing of Interop DCPs in SMPTE films, and vice versa (#804).
[dcpomatic.git]
/
src
/
lib
/
dcp_examiner.h
diff --git
a/src/lib/dcp_examiner.h
b/src/lib/dcp_examiner.h
index 26957b3e45b2ba31a1edc2e9ca5a82c2141cc445..542f018c9eac9b806c9b41999bed8f5b247f2027 100644
(file)
--- a/
src/lib/dcp_examiner.h
+++ b/
src/lib/dcp_examiner.h
@@
-30,19
+30,23
@@
class DCPExaminer : public VideoExaminer, public AudioExaminer
{
public:
DCPExaminer (boost::shared_ptr<const DCPContent>);
{
public:
DCPExaminer (boost::shared_ptr<const DCPContent>);
-
- boost::optional<
float
> video_frame_rate () const {
+
+ boost::optional<
double
> video_frame_rate () const {
return _video_frame_rate;
}
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;
}
@@
-58,11
+62,11
@@
public:
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);
}
@@
-71,15
+75,20
@@
public:
return _kdm_valid;
}
return _kdm_valid;
}
+ boost::optional<dcp::Standard> standard () const {
+ return _standard;
+ }
+
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;
bool _kdm_valid;
std::string _name;
bool _has_subtitles;
bool _encrypted;
bool _kdm_valid;
+ boost::optional<dcp::Standard> _standard;
};
};