*/
+#include <iomanip>
#include <libcxml/cxml.h>
#include "video_content.h"
-#include "video_decoder.h"
+#include "video_examiner.h"
+#include "ratio.h"
+#include "compose.hpp"
#include "i18n.h"
-int const VideoContentProperty::VIDEO_LENGTH = 0;
-int const VideoContentProperty::VIDEO_SIZE = 1;
-int const VideoContentProperty::VIDEO_FRAME_RATE = 2;
-int const VideoContentProperty::VIDEO_CROP = 3;
+int const VideoContentProperty::VIDEO_SIZE = 0;
+int const VideoContentProperty::VIDEO_FRAME_RATE = 1;
+int const VideoContentProperty::VIDEO_CROP = 2;
+int const VideoContentProperty::VIDEO_RATIO = 3;
using std::string;
using std::stringstream;
using std::setprecision;
using boost::shared_ptr;
using boost::lexical_cast;
+using boost::optional;
-VideoContent::VideoContent (Time s, ContentVideoFrame len)
- : Content (s)
+VideoContent::VideoContent (shared_ptr<const Film> f, Time s, VideoContent::Frame len)
+ : Content (f, s)
, _video_length (len)
+ , _video_frame_rate (0)
+ , _ratio (Ratio::from_id ("185"))
{
}
-VideoContent::VideoContent (boost::filesystem::path f)
- : Content (f)
+VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
+ : Content (f, p)
, _video_length (0)
+ , _video_frame_rate (0)
+ , _ratio (Ratio::from_id ("185"))
{
}
-VideoContent::VideoContent (shared_ptr<const cxml::Node> node)
- : Content (node)
+VideoContent::VideoContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
+ : Content (f, node)
{
- _video_length = node->number_child<ContentVideoFrame> ("VideoLength");
+ _video_length = node->number_child<VideoContent::Frame> ("VideoLength");
_video_size.width = node->number_child<int> ("VideoWidth");
_video_size.height = node->number_child<int> ("VideoHeight");
_video_frame_rate = node->number_child<float> ("VideoFrameRate");
_crop.right = node->number_child<int> ("RightCrop");
_crop.top = node->number_child<int> ("TopCrop");
_crop.bottom = node->number_child<int> ("BottomCrop");
+ optional<string> r = node->optional_string_child ("Ratio");
+ if (r) {
+ _ratio = Ratio::from_id (r.get ());
+ }
}
VideoContent::VideoContent (VideoContent const & o)
, _video_length (o._video_length)
, _video_size (o._video_size)
, _video_frame_rate (o._video_frame_rate)
+ , _ratio (o._ratio)
{
}
node->add_child("RightCrop")->add_child_text (boost::lexical_cast<string> (_crop.right));
node->add_child("TopCrop")->add_child_text (boost::lexical_cast<string> (_crop.top));
node->add_child("BottomCrop")->add_child_text (boost::lexical_cast<string> (_crop.bottom));
+ if (_ratio) {
+ node->add_child("Ratio")->add_child_text (_ratio->id ());
+ }
}
void
-VideoContent::take_from_video_decoder (shared_ptr<VideoDecoder> d)
+VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
{
- /* These decoder calls could call other content methods which take a lock on the mutex */
+ /* These examiner calls could call other content methods which take a lock on the mutex */
libdcp::Size const vs = d->video_size ();
float const vfr = d->video_frame_rate ();
signal_changed (VideoContentProperty::VIDEO_CROP);
}
+void
+VideoContent::set_ratio (Ratio const * r)
+{
+ {
+ boost::mutex::scoped_lock lm (_mutex);
+ if (_ratio == r) {
+ return;
+ }
+
+ _ratio = r;
+ }
+
+ signal_changed (VideoContentProperty::VIDEO_RATIO);
+}