X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_examiner.h;h=232d7f0d87ec2ceebade13de4422530af191c145;hb=c78e9f0d5e802e1bb020694870357ef271217628;hp=16385e07a66662149e27e39653938f32136cab97;hpb=dea824f6ff41384a5e17e23de5434cf84eccff29;p=dcpomatic.git diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h index 16385e07a..232d7f0d8 100644 --- a/src/lib/dcp_examiner.h +++ b/src/lib/dcp_examiner.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -25,13 +25,16 @@ #include "video_examiner.h" #include "audio_examiner.h" #include "dcp.h" +#include "dcp_text_track.h" +#include "dcpomatic_assert.h" +#include class DCPContent; class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer { public: - explicit DCPExaminer (boost::shared_ptr); + explicit DCPExaminer (boost::shared_ptr, bool tolerant); bool has_video () const { return _has_video; @@ -55,6 +58,10 @@ public: return false; } + VideoRange range () const { + return VIDEO_RANGE_FULL; + } + std::string name () const { return _name; } @@ -83,8 +90,16 @@ public: return _audio_frame_rate.get_value_or (48000); } - bool has_caption (CaptionType type) const { - return _has_caption[type]; + /** @param type TEXT_OPEN_SUBTITLE or TEXT_CLOSED_CAPTION. + * @return Number of assets of this type in this DCP. + */ + int text_count (TextType type) const { + return _text_count[type]; + } + + DCPTextTrack dcp_text_track (int i) const { + DCPOMATIC_ASSERT (i >= 0 && i < static_cast(_dcp_text_tracks.size())); + return _dcp_text_tracks[i]; } bool kdm_valid () const { @@ -99,6 +114,10 @@ public: return _three_d; } + dcp::ContentKind content_kind () const { + return _content_kind; + } + std::string cpl () const { return _cpl; } @@ -107,6 +126,30 @@ public: return _reel_lengths; } + std::map markers () const { + return _markers; + } + + std::vector ratings () const { + return _ratings; + } + + std::vector content_versions () const { + return _content_versions; + } + + 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 _video_frame_rate; boost::optional _video_size; @@ -119,12 +162,22 @@ private: bool _has_video; /** true if this DCP has audio content (but false if it has unresolved references to audio content) */ bool _has_audio; - bool _has_caption[CAPTION_COUNT]; + /** number of different assets of each type (OCAP/CCAP) */ + int _text_count[TEXT_COUNT]; + /** the DCPTextTracks for each of our CCAPs */ + std::vector _dcp_text_tracks; bool _encrypted; bool _needs_assets; bool _kdm_valid; boost::optional _standard; bool _three_d; + dcp::ContentKind _content_kind; std::string _cpl; std::list _reel_lengths; + std::map _markers; + std::vector _ratings; + std::vector _content_versions; + bool _has_atmos; + Frame _atmos_length; + dcp::Fraction _atmos_edit_rate; };