#include "content.h"
#include "colour_conversion.h"
+#include "video_content_scale.h"
class VideoExaminer;
class Ratio;
static int const VIDEO_CROP;
static int const VIDEO_SCALE;
static int const COLOUR_CONVERSION;
+ static int const VIDEO_FADE_IN;
+ static int const VIDEO_FADE_OUT;
};
-class VideoContentScale
-{
-public:
- VideoContentScale ();
- VideoContentScale (Ratio const *);
- VideoContentScale (bool);
- VideoContentScale (cxml::NodePtr);
-
- dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size, dcp::Size, int round) const;
- std::string id () const;
- std::string name () const;
- void as_xml (xmlpp::Node *) const;
-
- Ratio const * ratio () const {
- return _ratio;
- }
-
- bool scale () const {
- return _scale;
- }
-
- static void setup_scales ();
- static std::vector<VideoContentScale> all () {
- return _scales;
- }
-
-private:
- /** a ratio to stretch the content to, or 0 for no stretch */
- Ratio const * _ratio;
- /** true if we want to scale the content */
- bool _scale;
-
- static std::vector<VideoContentScale> _scales;
-};
-
-bool operator== (VideoContentScale const & a, VideoContentScale const & b);
-bool operator!= (VideoContentScale const & a, VideoContentScale const & b);
-
class VideoContent : public virtual Content
{
public:
- typedef int Frame;
-
VideoContent (boost::shared_ptr<const Film>);
- VideoContent (boost::shared_ptr<const Film>, DCPTime, ContentTime);
+ VideoContent (boost::shared_ptr<const Film>, DCPTime, Frame);
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> >);
void as_xml (xmlpp::Node *) const;
std::string technical_summary () const;
- virtual std::string information () const;
virtual std::string identifier () const;
- ContentTime video_length () const {
+ virtual void set_default_colour_conversion ();
+
+ Frame video_length () const {
boost::mutex::scoped_lock lm (_mutex);
return _video_length;
}
- ContentTime video_length_after_3d_combine () const {
+ Frame video_length_after_3d_combine () const {
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;
void set_bottom_crop (int);
void set_scale (VideoContentScale);
+ void unset_colour_conversion (bool signal = true);
void set_colour_conversion (ColourConversion);
+
+ void set_fade_in (Frame);
+ void set_fade_out (Frame);
VideoFrameType video_frame_type () const {
boost::mutex::scoped_lock lm (_mutex);
return _scale;
}
- ColourConversion colour_conversion () const {
+ boost::optional<ColourConversion> colour_conversion () const {
boost::mutex::scoped_lock lm (_mutex);
return _colour_conversion;
}
+ boost::optional<float> sample_aspect_ratio () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _sample_aspect_ratio;
+ }
+
+ Frame fade_in () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _fade_in;
+ }
+
+ Frame fade_out () const {
+ 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;
+ boost::optional<float> fade (Frame) const;
+
void scale_and_crop_to_fit_width ();
void scale_and_crop_to_fit_height ();
+ std::string processing_description () const;
+
protected:
void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
- ContentTime _video_length;
+ Frame _video_length;
float _video_frame_rate;
+ boost::optional<ColourConversion> _colour_conversion;
private:
friend struct ffmpeg_pts_offset_test;
VideoFrameType _video_frame_type;
Crop _crop;
VideoContentScale _scale;
- ColourConversion _colour_conversion;
+ /** Sample aspect ratio obtained from the content file's header,
+ if there is one.
+ */
+ boost::optional<float> _sample_aspect_ratio;
+ Frame _fade_in;
+ Frame _fade_out;
};
#endif