projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
lib
/
dcp_examiner.h
diff --git
a/src/lib/dcp_examiner.h
b/src/lib/dcp_examiner.h
index b4c87596c70e354079937132d289a06ed2ba8a42..f577e2b3552c999a1f5f0b3e681fbafe4c785248 100644
(file)
--- a/
src/lib/dcp_examiner.h
+++ b/
src/lib/dcp_examiner.h
@@
-25,6
+25,8
@@
#include "video_examiner.h"
#include "audio_examiner.h"
#include "dcp.h"
#include "video_examiner.h"
#include "audio_examiner.h"
#include "dcp.h"
+#include "dcp_text_track.h"
+#include "dcpomatic_assert.h"
#include <dcp/dcp_time.h>
class DCPContent;
#include <dcp/dcp_time.h>
class DCPContent;
@@
-32,7
+34,7
@@
class DCPContent;
class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer
{
public:
class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer
{
public:
- explicit DCPExaminer (
boost
::shared_ptr<const DCPContent>, bool tolerant);
+ explicit DCPExaminer (
std
::shared_ptr<const DCPContent>, bool tolerant);
bool has_video () const {
return _has_video;
bool has_video () const {
return _has_video;
@@
-95,6
+97,11
@@
public:
return _text_count[type];
}
return _text_count[type];
}
+ DCPTextTrack dcp_text_track (int i) const {
+ DCPOMATIC_ASSERT (i >= 0 && i < static_cast<int>(_dcp_text_tracks.size()));
+ return _dcp_text_tracks[i];
+ }
+
bool kdm_valid () const {
return _kdm_valid;
}
bool kdm_valid () const {
return _kdm_valid;
}
@@
-127,14
+134,22
@@
public:
return _ratings;
}
return _ratings;
}
- std::
string content_version
() const {
- return _content_version;
+ std::
vector<std::string> content_versions
() const {
+ return _content_version
s
;
}
bool has_atmos () const {
return _has_atmos;
}
}
bool has_atmos () const {
return _has_atmos;
}
+ Frame atmos_length () const {
+ return _atmos_length;
+ }
+
+ dcp::Fraction atmos_edit_rate () const {
+ return _atmos_edit_rate;
+ }
+
private:
boost::optional<double> _video_frame_rate;
boost::optional<dcp::Size> _video_size;
private:
boost::optional<double> _video_frame_rate;
boost::optional<dcp::Size> _video_size;
@@
-149,6
+164,8
@@
private:
bool _has_audio;
/** number of different assets of each type (OCAP/CCAP) */
int _text_count[TEXT_COUNT];
bool _has_audio;
/** number of different assets of each type (OCAP/CCAP) */
int _text_count[TEXT_COUNT];
+ /** the DCPTextTracks for each of our CCAPs */
+ std::vector<DCPTextTrack> _dcp_text_tracks;
bool _encrypted;
bool _needs_assets;
bool _kdm_valid;
bool _encrypted;
bool _needs_assets;
bool _kdm_valid;
@@
-159,6
+176,8
@@
private:
std::list<int64_t> _reel_lengths;
std::map<dcp::Marker, dcp::Time> _markers;
std::vector<dcp::Rating> _ratings;
std::list<int64_t> _reel_lengths;
std::map<dcp::Marker, dcp::Time> _markers;
std::vector<dcp::Rating> _ratings;
- std::
string _content_version
;
+ std::
vector<std::string> _content_versions
;
bool _has_atmos;
bool _has_atmos;
+ Frame _atmos_length;
+ dcp::Fraction _atmos_edit_rate;
};
};