projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix checking of frame channels vs stream channels.
[dcpomatic.git]
/
src
/
lib
/
video_content.h
diff --git
a/src/lib/video_content.h
b/src/lib/video_content.h
index 0c46499547c3245b0ad410dd4a1ea2b0b16708c7..7214d35e40d2994b5d525c0a9120cb39a96d1905 100644
(file)
--- a/
src/lib/video_content.h
+++ b/
src/lib/video_content.h
@@
-26,6
+26,7
@@
#include "colour_conversion.h"
#include "content_part.h"
#include "dcpomatic_time.h"
#include "colour_conversion.h"
#include "content_part.h"
#include "dcpomatic_time.h"
+#include "pixel_quanta.h"
#include "types.h"
#include "user_property.h"
#include <dcp/language_tag.h>
#include "types.h"
#include "user_property.h"
#include <dcp/language_tag.h>
@@
-59,7
+60,7
@@
class VideoContent : public ContentPart, public std::enable_shared_from_this<Vid
{
public:
explicit VideoContent (Content* parent);
{
public:
explicit VideoContent (Content* parent);
- VideoContent (Content* parent, cxml::ConstNodePtr
,
int);
+ VideoContent (Content* parent, cxml::ConstNodePtr
node, int version, VideoRange video_range_h
int);
VideoContent (Content* parent, std::vector<std::shared_ptr<Content>>);
void as_xml (xmlpp::Node *) const;
VideoContent (Content* parent, std::vector<std::shared_ptr<Content>>);
void as_xml (xmlpp::Node *) const;
@@
-88,6
+89,7
@@
public:
void set_frame_type (VideoFrameType);
void set_frame_type (VideoFrameType);
+ void set_crop (Crop crop);
void set_left_crop (int);
void set_right_crop (int);
void set_top_crop (int);
void set_left_crop (int);
void set_right_crop (int);
void set_top_crop (int);
@@
-112,27
+114,29
@@
public:
return _frame_type;
}
return _frame_type;
}
- Crop crop () const {
+ Crop actual_crop () const;
+
+ Crop requested_crop () const {
boost::mutex::scoped_lock lm (_mutex);
return _crop;
}
boost::mutex::scoped_lock lm (_mutex);
return _crop;
}
- int left_crop () const {
+ int
requested_
left_crop () const {
boost::mutex::scoped_lock lm (_mutex);
return _crop.left;
}
boost::mutex::scoped_lock lm (_mutex);
return _crop.left;
}
- int right_crop () const {
+ int r
equested_r
ight_crop () const {
boost::mutex::scoped_lock lm (_mutex);
return _crop.right;
}
boost::mutex::scoped_lock lm (_mutex);
return _crop.right;
}
- int top_crop () const {
+ int
requested_
top_crop () const {
boost::mutex::scoped_lock lm (_mutex);
return _crop.top;
}
boost::mutex::scoped_lock lm (_mutex);
return _crop.top;
}
- int bottom_crop () const {
+ int
requested_
bottom_crop () const {
boost::mutex::scoped_lock lm (_mutex);
return _crop.bottom;
}
boost::mutex::scoped_lock lm (_mutex);
return _crop.bottom;
}
@@
-180,6
+184,11
@@
public:
return _range;
}
return _range;
}
+ PixelQuanta pixel_quanta () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _pixel_quanta;
+ }
+
bool use () const {
boost::mutex::scoped_lock lm (_mutex);
return _use;
bool use () const {
boost::mutex::scoped_lock lm (_mutex);
return _use;
@@
-208,7
+217,7
@@
public:
void modify_position (std::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const;
void modify_trim_start (dcpomatic::ContentTime& pos) const;
void modify_position (std::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const;
void modify_trim_start (dcpomatic::ContentTime& pos) const;
- static std::shared_ptr<VideoContent> from_xml (Content* parent, cxml::ConstNodePtr
,
int);
+ static std::shared_ptr<VideoContent> from_xml (Content* parent, cxml::ConstNodePtr
node, int version, VideoRange video_range_h
int);
private:
private:
@@
-245,6
+254,7
@@
private:
/** fade out time in content frames */
Frame _fade_out;
VideoRange _range;
/** fade out time in content frames */
Frame _fade_out;
VideoRange _range;
+ PixelQuanta _pixel_quanta;
boost::optional<dcp::LanguageTag> _burnt_subtitle_language;
};
boost::optional<dcp::LanguageTag> _burnt_subtitle_language;
};