X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=cf1849971450659f5d12ccb64d0b1c681a825561;hb=05f2028ec1280a98050dc22609879230337a35ef;hp=d9020ac018dcce2ab2bcda5df638d74d1cc9653f;hpb=249ae25148213a2ab5d76980133182e7f2521524;p=dcpomatic.git diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index d9020ac01..cf1849971 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -21,6 +21,9 @@ #ifndef DCPOMATIC_FFMPEG_CONTENT_H #define DCPOMATIC_FFMPEG_CONTENT_H +#ifdef DCPOMATIC_VARIANT_SWAROOP +#include "encrypted_ecinema_kdm.h" +#endif #include "content.h" #include "audio_stream.h" @@ -41,25 +44,31 @@ public: /** The chosen subtitle stream, or something about it */ static int const SUBTITLE_STREAM; static int const FILTERS; + static int const KDM; }; class FFmpegContent : public Content { public: - FFmpegContent (boost::shared_ptr, boost::filesystem::path); - FFmpegContent (boost::shared_ptr, cxml::ConstNodePtr, int version, std::list &); - FFmpegContent (boost::shared_ptr, std::vector >); + FFmpegContent (boost::filesystem::path); + FFmpegContent (cxml::ConstNodePtr, int version, std::list &); + FFmpegContent (std::vector >); boost::shared_ptr shared_from_this () { return boost::dynamic_pointer_cast (Content::shared_from_this ()); } - void examine (boost::shared_ptr); + boost::shared_ptr shared_from_this () const { + return boost::dynamic_pointer_cast (Content::shared_from_this ()); + } + + void examine (boost::shared_ptr film, boost::shared_ptr); void take_settings_from (boost::shared_ptr c); std::string summary () const; std::string technical_summary () const; void as_xml (xmlpp::Node *, bool with_paths) const; - DCPTime full_length () const; + dcpomatic::DCPTime full_length (boost::shared_ptr film) const; + dcpomatic::DCPTime approximate_length () const; std::string identifier () const; @@ -86,30 +95,56 @@ public: void set_subtitle_stream (boost::shared_ptr); - boost::optional first_video () const { + boost::optional first_video () const { boost::mutex::scoped_lock lm (_mutex); return _first_video; } void signal_subtitle_stream_changed (); +#ifdef DCPOMATIC_VARIANT_SWAROOP + + bool encrypted () const { + boost::mutex::scoped_lock lm (_mutex); + return _encrypted; + } + + void add_kdm (EncryptedECinemaKDM kdm); + + boost::optional kdm () const { + return _kdm; + } + + boost::optional id () const { + return _id; + } + + bool kdm_timing_window_valid () const; + +#endif + private: - void add_properties (std::list &) const; + void add_properties (boost::shared_ptr film, std::list &) const; friend struct ffmpeg_pts_offset_test; friend struct audio_sampling_rate_test; std::vector > _subtitle_streams; boost::shared_ptr _subtitle_stream; - boost::optional _first_video; + boost::optional _first_video; /** Video filters that should be used when generating DCPs */ std::vector _filters; - AVColorRange _color_range; - AVColorPrimaries _color_primaries; - AVColorTransferCharacteristic _color_trc; - AVColorSpace _colorspace; + boost::optional _color_range; + boost::optional _color_primaries; + boost::optional _color_trc; + boost::optional _colorspace; boost::optional _bits_per_pixel; +#ifdef DCPOMATIC_VARIANT_SWAROOP + bool _encrypted; + boost::optional _kdm; + boost::optional _id; +#endif }; #endif