X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=076cd6ec676765556723c7231ddc8e21e514a74f;hb=9b240c6d5d4e2189401498a99f98f41d1b15ed31;hp=84dee81d1f22935abaa6dd6abdf3e7383879a911;hpb=a0856e3fbef17f24073b01cb96be6bbcb229ecbc;p=dcpomatic.git

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 84dee81d1..076cd6ec6 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -17,30 +17,35 @@
 
 */
 
+#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_SIZE	 = 0;
 int const VideoContentProperty::VIDEO_FRAME_RATE = 1;
-int const VideoContentProperty::VIDEO_CROP	 = 2;
-int const VideoContentProperty::VIDEO_RATIO	 = 3;
+int const VideoContentProperty::VIDEO_FRAME_TYPE = 2;
+int const VideoContentProperty::VIDEO_CROP	 = 3;
+int const VideoContentProperty::VIDEO_RATIO	 = 4;
 
 using std::string;
 using std::stringstream;
 using std::setprecision;
+using std::cout;
 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 (0)
+	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
+	, _ratio (Ratio::from_id ("185"))
 {
 
 }
@@ -49,7 +54,8 @@ VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	: Content (f, p)
 	, _video_length (0)
 	, _video_frame_rate (0)
-	, _ratio (0)
+	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
+	, _ratio (Ratio::from_id ("185"))
 {
 
 }
@@ -57,10 +63,11 @@ 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");
+	_video_frame_type = static_cast<VideoFrameType> (node->number_child<int> ("VideoFrameType"));
 	_crop.left = node->number_child<int> ("LeftCrop");
 	_crop.right = node->number_child<int> ("RightCrop");
 	_crop.top = node->number_child<int> ("TopCrop");
@@ -71,16 +78,6 @@ VideoContent::VideoContent (shared_ptr<const Film> f, shared_ptr<const cxml::Nod
 	}
 }
 
-VideoContent::VideoContent (VideoContent const & o)
-	: Content (o)
-	, _video_length (o._video_length)
-	, _video_size (o._video_size)
-	, _video_frame_rate (o._video_frame_rate)
-	, _ratio (o._ratio)
-{
-
-}
-
 void
 VideoContent::as_xml (xmlpp::Node* node) const
 {
@@ -89,6 +86,7 @@ VideoContent::as_xml (xmlpp::Node* node) const
 	node->add_child("VideoWidth")->add_child_text (lexical_cast<string> (_video_size.width));
 	node->add_child("VideoHeight")->add_child_text (lexical_cast<string> (_video_size.height));
 	node->add_child("VideoFrameRate")->add_child_text (lexical_cast<string> (_video_frame_rate));
+	node->add_child("VideoFrameType")->add_child_text (lexical_cast<string> (static_cast<int> (_video_frame_type)));
 	node->add_child("LeftCrop")->add_child_text (boost::lexical_cast<string> (_crop.left));
 	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));
@@ -99,20 +97,20 @@ VideoContent::as_xml (xmlpp::Node* node) const
 }
 
 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);
 }
 
 
@@ -135,16 +133,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)
 {
@@ -220,3 +208,32 @@ VideoContent::set_ratio (Ratio const * 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 ();
+}
+
+void
+VideoContent::set_video_frame_type (VideoFrameType t)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_video_frame_type = t;
+	}
+
+	signal_changed (VideoContentProperty::VIDEO_FRAME_TYPE);
+}