/*
- Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#ifndef DCPOMATIC_VIDEO_CONTENT_H
#define DCPOMATIC_VIDEO_CONTENT_H
-#include "content.h"
#include "colour_conversion.h"
#include "video_content_scale.h"
+#include "dcpomatic_time.h"
+#include "user_property.h"
+#include <boost/thread/mutex.hpp>
+#include <boost/weak_ptr.hpp>
class VideoExaminer;
class Ratio;
+class Film;
class VideoContentProperty
{
static int const VIDEO_FADE_OUT;
};
-class VideoContent : public virtual Content
+class VideoContent
{
public:
VideoContent (boost::shared_ptr<const Film>);
- 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 identifier () const;
+ std::string identifier () const;
- virtual void set_default_colour_conversion ();
+ void set_default_colour_conversion ();
Frame video_length () const {
boost::mutex::scoped_lock lm (_mutex);
return _video_size;
}
- double video_frame_rate () const {
+ double video_frame_rate () const;
+
+ /** @return true if this content has a specific video frame rate, false
+ * if it should use the DCP's rate.
+ */
+ bool has_own_video_frame_rate () const {
boost::mutex::scoped_lock lm (_mutex);
- return _video_frame_rate;
+ return static_cast<bool>(_video_frame_rate);
}
void set_video_frame_type (VideoFrameType);
return _sample_aspect_ratio;
}
+ bool yuv () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _yuv;
+ }
+
Frame fade_in () const {
boost::mutex::scoped_lock lm (_mutex);
return _fade_in;
std::string processing_description () const;
-protected:
+private:
void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
- void add_properties (std::list<std::pair<std::string, std::string> > &) const;
+ void add_properties (std::list<UserProperty> &) const;
+ boost::weak_ptr<const Film> _film;
+ mutable boost::mutex _mutex;
Frame _video_length;
- double _video_frame_rate;
+ /** Video frame rate, or not set if this content should use the DCP's frame rate */
+ boost::optional<double> _video_frame_rate;
boost::optional<ColourConversion> _colour_conversion;
-private:
friend struct ffmpeg_pts_offset_test;
friend struct best_dcp_frame_rate_test_single;
friend struct best_dcp_frame_rate_test_double;
if there is one.
*/
boost::optional<double> _sample_aspect_ratio;
+ bool _yuv;
Frame _fade_in;
Frame _fade_out;
};