X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=a157b05993ca4b2532d0dd5fc8168436c2048a69;hb=44555d6be9043c00030050caf9b49cd0241730c9;hp=2e413678f5d0aa219a91157b8162b8a0594fd3f5;hpb=996b0c06e23bcb6b300d7b8799df94993692e07d;p=dcpomatic.git

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 2e413678f..a157b0599 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -17,26 +17,32 @@
 
 */
 
+#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 (shared_ptr<const Film> f, Time s, ContentVideoFrame len)
+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"))
 {
 
 }
@@ -44,6 +50,8 @@ VideoContent::VideoContent (shared_ptr<const Film> f, Time s, ContentVideoFrame
 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"))
 {
 
 }
@@ -51,7 +59,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
 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");
@@ -59,15 +67,10 @@ VideoContent::VideoContent (shared_ptr<const Film> f, shared_ptr<const cxml::Nod
 	_crop.right = node->number_child<int> ("RightCrop");
 	_crop.top = node->number_child<int> ("TopCrop");
 	_crop.bottom = node->number_child<int> ("BottomCrop");
-}
-
-VideoContent::VideoContent (VideoContent const & o)
-	: Content (o)
-	, _video_length (o._video_length)
-	, _video_size (o._video_size)
-	, _video_frame_rate (o._video_frame_rate)
-{
-
+	optional<string> r = node->optional_string_child ("Ratio");
+	if (r) {
+		_ratio = Ratio::from_id (r.get ());
+	}
 }
 
 void
@@ -82,23 +85,26 @@ VideoContent::as_xml (xmlpp::Node* node) const
 	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 ();
 	
-        {
-                boost::mutex::scoped_lock lm (_mutex);
-                _video_size = vs;
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_video_size = vs;
 		_video_frame_rate = vfr;
-        }
-        
-        signal_changed (VideoContentProperty::VIDEO_SIZE);
-        signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+	}
+	
+	signal_changed (VideoContentProperty::VIDEO_SIZE);
+	signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
 }
 
 
@@ -121,16 +127,6 @@ VideoContent::information () const
 	return s.str ();
 }
 
-void
-VideoContent::set_crop (Crop c)
-{
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		_crop = c;
-	}
-	signal_changed (VideoContentProperty::VIDEO_CROP);
-}
-
 void
 VideoContent::set_left_crop (int c)
 {
@@ -192,3 +188,35 @@ VideoContent::set_bottom_crop (int c)
 	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);
+}
+
+/** @return string which includes everything about how this content looks */
+string
+VideoContent::identifier () const
+{
+	stringstream s;
+	s << Content::digest()
+	  << "_" << crop().left
+	  << "_" << crop().right
+	  << "_" << crop().top
+	  << "_" << crop().bottom;
+
+	if (ratio()) {
+		s << "_" << ratio()->id ();
+	}
+
+	return s.str ();
+}