projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basic ability to set video range (JPEG/MPEG) at least for YUV content. May not work...
[dcpomatic.git]
/
src
/
lib
/
video_content.h
diff --git
a/src/lib/video_content.h
b/src/lib/video_content.h
index 3d07a09470061049396b3aefa06a3bd7392a2e32..f5fb6c9ac747320c03b610b4d76b2417c3a02069 100644
(file)
--- a/
src/lib/video_content.h
+++ b/
src/lib/video_content.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
6
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
9
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-46,6
+46,7
@@
public:
static int const COLOUR_CONVERSION;
static int const FADE_IN;
static int const FADE_OUT;
static int const COLOUR_CONVERSION;
static int const FADE_IN;
static int const FADE_OUT;
+ static int const RANGE;
};
class VideoContent : public ContentPart, public boost::enable_shared_from_this<VideoContent>
};
class VideoContent : public ContentPart, public boost::enable_shared_from_this<VideoContent>
@@
-92,6
+93,8
@@
public:
void set_fade_in (Frame);
void set_fade_out (Frame);
void set_fade_in (Frame);
void set_fade_out (Frame);
+ void set_range (VideoRange);
+
VideoFrameType frame_type () const {
boost::mutex::scoped_lock lm (_mutex);
return _frame_type;
VideoFrameType frame_type () const {
boost::mutex::scoped_lock lm (_mutex);
return _frame_type;
@@
-153,6
+156,11
@@
public:
return _fade_out;
}
return _fade_out;
}
+ VideoRange range () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _range;
+ }
+
dcp::Size size_after_3d_split () const;
dcp::Size size_after_crop () const;
dcp::Size size_after_3d_split () const;
dcp::Size size_after_crop () const;
@@
-194,6
+202,7
@@
private:
bool _yuv;
Frame _fade_in;
Frame _fade_out;
bool _yuv;
Frame _fade_in;
Frame _fade_out;
+ VideoRange _range;
};
#endif
};
#endif