projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated ru_RU translation from Igor Voytovich.
[dcpomatic.git]
/
src
/
lib
/
video_content.h
diff --git
a/src/lib/video_content.h
b/src/lib/video_content.h
index 792929419c42f36e091efe40ef583df3eb20b7d3..c0a609a6ac90ae7891ca9d1cea1d421fb7b30401 100644
(file)
--- a/
src/lib/video_content.h
+++ b/
src/lib/video_content.h
@@
-44,7
+44,7
@@
class VideoContent : public virtual Content
{
public:
VideoContent (boost::shared_ptr<const Film>);
{
public:
VideoContent (boost::shared_ptr<const Film>);
- VideoContent (boost::shared_ptr<const Film>, DCPTime,
ContentTi
me);
+ VideoContent (boost::shared_ptr<const Film>, DCPTime,
Fra
me);
VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
VideoContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int);
VideoContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
VideoContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int);
VideoContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
@@
-53,17
+53,24
@@
public:
std::string technical_summary () const;
virtual std::string identifier () const;
std::string technical_summary () const;
virtual std::string identifier () const;
- ContentTime video_length () const {
+ virtual void set_default_colour_conversion ();
+
+ /** @return points at which to split this content when
+ * REELTYPE_BY_VIDEO_CONTENT is in use.
+ */
+ virtual std::list<DCPTime> reel_split_points () const;
+
+ Frame video_length () const {
boost::mutex::scoped_lock lm (_mutex);
return _video_length;
}
boost::mutex::scoped_lock lm (_mutex);
return _video_length;
}
-
ContentTi
me video_length_after_3d_combine () const {
+
Fra
me video_length_after_3d_combine () const {
boost::mutex::scoped_lock lm (_mutex);
if (_video_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) {
boost::mutex::scoped_lock lm (_mutex);
if (_video_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) {
- return
ContentTime (_video_length.get() / 2)
;
+ return
_video_length / 2
;
}
}
-
+
return _video_length;
}
return _video_length;
}
@@
-71,14
+78,14
@@
public:
boost::mutex::scoped_lock lm (_mutex);
return _video_size;
}
boost::mutex::scoped_lock lm (_mutex);
return _video_size;
}
-
-
float
video_frame_rate () const {
+
+
double
video_frame_rate () const {
boost::mutex::scoped_lock lm (_mutex);
return _video_frame_rate;
}
void set_video_frame_type (VideoFrameType);
boost::mutex::scoped_lock lm (_mutex);
return _video_frame_rate;
}
void set_video_frame_type (VideoFrameType);
- void set_video_frame_rate (
float
);
+ void set_video_frame_rate (
double
);
void set_left_crop (int);
void set_right_crop (int);
void set_left_crop (int);
void set_right_crop (int);
@@
-86,13
+93,12
@@
public:
void set_bottom_crop (int);
void set_scale (VideoContentScale);
void set_bottom_crop (int);
void set_scale (VideoContentScale);
- void unset_colour_conversion (
bool signal = true
);
+ void unset_colour_conversion ();
void set_colour_conversion (ColourConversion);
void set_colour_conversion (ColourConversion);
- void set_default_colour_conversion (bool signal = true);
- void set_fade_in (
ContentTi
me);
- void set_fade_out (
ContentTi
me);
-
+ void set_fade_in (
Fra
me);
+ void set_fade_out (
Fra
me);
+
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;
@@
-134,27
+140,27
@@
public:
return _colour_conversion;
}
return _colour_conversion;
}
- boost::optional<
float
> sample_aspect_ratio () const {
+ boost::optional<
double
> sample_aspect_ratio () const {
boost::mutex::scoped_lock lm (_mutex);
return _sample_aspect_ratio;
}
boost::mutex::scoped_lock lm (_mutex);
return _sample_aspect_ratio;
}
-
ContentTi
me fade_in () const {
+
Fra
me fade_in () const {
boost::mutex::scoped_lock lm (_mutex);
return _fade_in;
}
boost::mutex::scoped_lock lm (_mutex);
return _fade_in;
}
-
ContentTi
me fade_out () const {
+
Fra
me fade_out () const {
boost::mutex::scoped_lock lm (_mutex);
return _fade_out;
}
boost::mutex::scoped_lock lm (_mutex);
return _fade_out;
}
-
+
dcp::Size video_size_after_3d_split () const;
dcp::Size video_size_after_crop () const;
ContentTime dcp_time_to_content_time (DCPTime) const;
dcp::Size video_size_after_3d_split () const;
dcp::Size video_size_after_crop () const;
ContentTime dcp_time_to_content_time (DCPTime) const;
- boost::optional<
float> fade (Video
Frame) const;
+ boost::optional<
double> fade (
Frame) const;
void scale_and_crop_to_fit_width ();
void scale_and_crop_to_fit_height ();
void scale_and_crop_to_fit_width ();
void scale_and_crop_to_fit_height ();
@@
-163,9
+169,11
@@
public:
protected:
void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
protected:
void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
+ void add_properties (std::list<std::pair<std::string, std::string> > &) const;
- ContentTime _video_length;
- float _video_frame_rate;
+ Frame _video_length;
+ double _video_frame_rate;
+ boost::optional<ColourConversion> _colour_conversion;
private:
friend struct ffmpeg_pts_offset_test;
private:
friend struct ffmpeg_pts_offset_test;
@@
-174,18
+182,17
@@
private:
friend struct audio_sampling_rate_test;
void setup_default_colour_conversion ();
friend struct audio_sampling_rate_test;
void setup_default_colour_conversion ();
-
+
dcp::Size _video_size;
VideoFrameType _video_frame_type;
Crop _crop;
VideoContentScale _scale;
dcp::Size _video_size;
VideoFrameType _video_frame_type;
Crop _crop;
VideoContentScale _scale;
- boost::optional<ColourConversion> _colour_conversion;
/** Sample aspect ratio obtained from the content file's header,
if there is one.
*/
/** Sample aspect ratio obtained from the content file's header,
if there is one.
*/
- boost::optional<
float
> _sample_aspect_ratio;
-
ContentTi
me _fade_in;
-
ContentTi
me _fade_out;
+ boost::optional<
double
> _sample_aspect_ratio;
+
Fra
me _fade_in;
+
Fra
me _fade_out;
};
#endif
};
#endif