projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply FFmpeg palette fix to examination too; fix build with old FFmpeg.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.h
diff --git
a/src/lib/ffmpeg_content.h
b/src/lib/ffmpeg_content.h
index 4c612cd3ee00eb62720fc35fe1759f5fd2cf1451..cf1849971450659f5d12ccb64d0b1c681a825561 100644
(file)
--- 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
#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"
#include "content.h"
#include "audio_stream.h"
@@
-41,6
+44,7
@@
public:
/** The chosen subtitle stream, or something about it */
static int const SUBTITLE_STREAM;
static int const FILTERS;
/** 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
};
class FFmpegContent : public Content
@@
-63,8
+67,8
@@
public:
std::string summary () const;
std::string technical_summary () const;
void as_xml (xmlpp::Node *, bool with_paths) const;
std::string summary () const;
std::string technical_summary () const;
void as_xml (xmlpp::Node *, bool with_paths) const;
- DCPTime full_length (boost::shared_ptr<const Film> film) const;
- DCPTime approximate_length () const;
+
dcpomatic::
DCPTime full_length (boost::shared_ptr<const Film> film) const;
+
dcpomatic::
DCPTime approximate_length () const;
std::string identifier () const;
std::string identifier () const;
@@
-91,23
+95,34
@@
public:
void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
- boost::optional<ContentTime> first_video () const {
+ boost::optional<
dcpomatic::
ContentTime> first_video () const {
boost::mutex::scoped_lock lm (_mutex);
return _first_video;
}
void signal_subtitle_stream_changed ();
boost::mutex::scoped_lock lm (_mutex);
return _first_video;
}
void signal_subtitle_stream_changed ();
- boost::optional<std::string> decryption_key () const {
- boost::mutex::scoped_lock lm (_mutex);
- return _decryption_key;
- }
+#ifdef DCPOMATIC_VARIANT_SWAROOP
bool encrypted () const {
boost::mutex::scoped_lock lm (_mutex);
return _encrypted;
}
bool encrypted () const {
boost::mutex::scoped_lock lm (_mutex);
return _encrypted;
}
+ void add_kdm (EncryptedECinemaKDM kdm);
+
+ boost::optional<EncryptedECinemaKDM> kdm () const {
+ return _kdm;
+ }
+
+ boost::optional<std::string> id () const {
+ return _id;
+ }
+
+ bool kdm_timing_window_valid () const;
+
+#endif
+
private:
void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty> &) const;
private:
void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty> &) const;
@@
-116,7
+131,7
@@
private:
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
- boost::optional<ContentTime> _first_video;
+ boost::optional<
dcpomatic::
ContentTime> _first_video;
/** Video filters that should be used when generating DCPs */
std::vector<Filter const *> _filters;
/** Video filters that should be used when generating DCPs */
std::vector<Filter const *> _filters;
@@
-125,8
+140,11
@@
private:
boost::optional<AVColorTransferCharacteristic> _color_trc;
boost::optional<AVColorSpace> _colorspace;
boost::optional<int> _bits_per_pixel;
boost::optional<AVColorTransferCharacteristic> _color_trc;
boost::optional<AVColorSpace> _colorspace;
boost::optional<int> _bits_per_pixel;
- boost::optional<std::string> _decryption_key;
+#ifdef DCPOMATIC_VARIANT_SWAROOP
bool _encrypted;
bool _encrypted;
+ boost::optional<EncryptedECinemaKDM> _kdm;
+ boost::optional<std::string> _id;
+#endif
};
#endif
};
#endif