projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: remove unnecessary explicit.
[dcpomatic.git]
/
src
/
lib
/
dcp_examiner.h
diff --git
a/src/lib/dcp_examiner.h
b/src/lib/dcp_examiner.h
index 757e3ff031a279724487b67c98662c021b4f2b8e..b51e7ae7a8e53d69cf406a05f2956599e5a22f89 100644
(file)
--- a/
src/lib/dcp_examiner.h
+++ b/
src/lib/dcp_examiner.h
@@
-25,7
+25,6
@@
#include "audio_examiner.h"
#include "audio_examiner.h"
-#include "dcp.h"
#include "dcp_text_track.h"
#include "dcpomatic_assert.h"
#include "video_examiner.h"
#include "dcp_text_track.h"
#include "dcpomatic_assert.h"
#include "video_examiner.h"
@@
-36,38
+35,38
@@
class DCPContent;
class DCPContent;
-class DCPExaminer : public
DCP, public
VideoExaminer, public AudioExaminer
+class DCPExaminer : public VideoExaminer, public AudioExaminer
{
public:
{
public:
-
explicit DCPExaminer
(std::shared_ptr<const DCPContent>, bool tolerant);
+
DCPExaminer
(std::shared_ptr<const DCPContent>, bool tolerant);
- bool has_video () const {
+ bool has_video () const
override
{
return _has_video;
}
return _has_video;
}
- boost::optional<double> video_frame_rate () const {
+ boost::optional<double> video_frame_rate () const
override
{
return _video_frame_rate;
}
return _video_frame_rate;
}
- dcp::Size video_size () const {
+ dcp::Size video_size () const
override
{
DCPOMATIC_ASSERT (_has_video);
DCPOMATIC_ASSERT (_video_size);
return *_video_size;
}
DCPOMATIC_ASSERT (_has_video);
DCPOMATIC_ASSERT (_video_size);
return *_video_size;
}
- Frame video_length () const {
+ Frame video_length () const
override
{
return _video_length;
}
return _video_length;
}
- bool yuv () const {
+ bool yuv () const
override
{
return false;
}
return false;
}
- VideoRange range () const {
+ VideoRange range () const
override
{
return VideoRange::FULL;
}
return VideoRange::FULL;
}
- PixelQuanta pixel_quanta () const {
+ PixelQuanta pixel_quanta () const
override
{
return {};
}
return {};
}
@@
-83,19
+82,19
@@
public:
return _needs_assets;
}
return _needs_assets;
}
- bool has_audio () const {
+ bool has_audio () const
override
{
return _has_audio;
}
return _has_audio;
}
- int audio_channels () const {
+ int audio_channels () const
override
{
return _audio_channels.get_value_or (0);
}
return _audio_channels.get_value_or (0);
}
- Frame audio_length () const {
+ Frame audio_length () const
override
{
return _audio_length;
}
return _audio_length;
}
- int audio_frame_rate () const {
+ int audio_frame_rate () const
override
{
return _audio_frame_rate.get_value_or (48000);
}
return _audio_frame_rate.get_value_or (48000);
}
@@
-104,10
+103,12
@@
public:
}
/** @param type TEXT_OPEN_SUBTITLE or TEXT_CLOSED_CAPTION.
}
/** @param type TEXT_OPEN_SUBTITLE or TEXT_CLOSED_CAPTION.
- * @return Number of assets of this type in this DCP.
+ * @return the number of "streams" of this type in the DCP.
+ * Reels do not affect the return value of this method: if a DCP
+ * has any subtitles, type=TEXT_OPEN_SUBTITLE will return 1.
*/
int text_count (TextType type) const {
*/
int text_count (TextType type) const {
- return _text_count[
static_cast<int>(type)
];
+ return _text_count[
type
];
}
boost::optional<dcp::LanguageTag> open_subtitle_language () const {
}
boost::optional<dcp::LanguageTag> open_subtitle_language () const {
@@
-132,7
+133,8
@@
public:
}
dcp::ContentKind content_kind () const {
}
dcp::ContentKind content_kind () const {
- return _content_kind;
+ DCPOMATIC_ASSERT(_content_kind);
+ return *_content_kind;
}
std::string cpl () const {
}
std::string cpl () const {
@@
-167,6
+169,11
@@
public:
return _atmos_edit_rate;
}
return _atmos_edit_rate;
}
+ /** @return fonts in each reel */
+ std::vector<std::vector<std::shared_ptr<dcpomatic::Font>>> fonts() const {
+ return _fonts;
+ }
+
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;
@@
-181,7
+188,7
@@
private:
bool _has_audio = false;
boost::optional<dcp::LanguageTag> _audio_language;
/** number of different assets of each type (OCAP/CCAP) */
bool _has_audio = false;
boost::optional<dcp::LanguageTag> _audio_language;
/** number of different assets of each type (OCAP/CCAP) */
-
int _text_count[static_cast<int>(TextType::COUNT)]
;
+
EnumIndexedVector<int, TextType> _text_count
;
boost::optional<dcp::LanguageTag> _open_subtitle_language;
/** the DCPTextTracks for each of our CCAPs */
std::vector<DCPTextTrack> _dcp_text_tracks;
boost::optional<dcp::LanguageTag> _open_subtitle_language;
/** the DCPTextTracks for each of our CCAPs */
std::vector<DCPTextTrack> _dcp_text_tracks;
@@
-190,7
+197,7
@@
private:
bool _kdm_valid = false;
boost::optional<dcp::Standard> _standard;
bool _three_d = false;
bool _kdm_valid = false;
boost::optional<dcp::Standard> _standard;
bool _three_d = false;
-
dcp::ContentKind
_content_kind;
+
boost::optional<dcp::ContentKind>
_content_kind;
std::string _cpl;
std::list<int64_t> _reel_lengths;
std::map<dcp::Marker, dcp::Time> _markers;
std::string _cpl;
std::list<int64_t> _reel_lengths;
std::map<dcp::Marker, dcp::Time> _markers;
@@
-199,4
+206,5
@@
private:
bool _has_atmos = false;
Frame _atmos_length = 0;
dcp::Fraction _atmos_edit_rate;
bool _has_atmos = false;
Frame _atmos_length = 0;
dcp::Fraction _atmos_edit_rate;
+ std::vector<std::vector<std::shared_ptr<dcpomatic::Font>>> _fonts;
};
};