projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various bits mostly related to colour conversions.
[dcpomatic.git]
/
src
/
lib
/
video_content.h
diff --git
a/src/lib/video_content.h
b/src/lib/video_content.h
index 97ef6a9fae710fba1b5e7482542b817514d6490a..72c72625b5c30a97927fdefe17b56c98492cf24f 100644
(file)
--- a/
src/lib/video_content.h
+++ b/
src/lib/video_content.h
@@
-21,6
+21,7
@@
#define DCPOMATIC_VIDEO_CONTENT_H
#include "content.h"
#define DCPOMATIC_VIDEO_CONTENT_H
#include "content.h"
+#include "colour_conversion.h"
class VideoExaminer;
class Ratio;
class VideoExaminer;
class Ratio;
@@
-33,6
+34,7
@@
public:
static int const VIDEO_FRAME_TYPE;
static int const VIDEO_CROP;
static int const VIDEO_RATIO;
static int const VIDEO_FRAME_TYPE;
static int const VIDEO_CROP;
static int const VIDEO_RATIO;
+ static int const COLOUR_CONVERSION;
};
class VideoContent : public virtual Content
};
class VideoContent : public virtual Content
@@
-71,6
+73,8
@@
public:
void set_top_crop (int);
void set_bottom_crop (int);
void set_top_crop (int);
void set_bottom_crop (int);
+ void set_colour_conversion (ColourConversion);
+
VideoFrameType video_frame_type () const {
boost::mutex::scoped_lock lm (_mutex);
return _video_frame_type;
VideoFrameType video_frame_type () const {
boost::mutex::scoped_lock lm (_mutex);
return _video_frame_type;
@@
-88,6
+92,11
@@
public:
return _ratio;
}
return _ratio;
}
+ ColourConversion colour_conversion () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _colour_conversion;
+ }
+
libdcp::Size video_size_after_3d_split () const;
protected:
libdcp::Size video_size_after_3d_split () const;
protected:
@@
-106,6
+115,7
@@
private:
VideoFrameType _video_frame_type;
Crop _crop;
Ratio const * _ratio;
VideoFrameType _video_frame_type;
Crop _crop;
Ratio const * _ratio;
+ ColourConversion _colour_conversion;
};
#endif
};
#endif