X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=9822d77634c659a583de5314a4904032da104ec4;hb=5dc2dbdb6639f8d617a40209ad603d2a38f9df2a;hp=f52a75e706c5105067117c66cf6921556afe5a55;hpb=74fe68e5895654e27a7cf8097917c1e95fa89519;p=dcpomatic.git

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index f52a75e70..9822d7763 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -31,9 +31,13 @@
 #include "film.h"
 #include "exceptions.h"
 #include "frame_rate_change.h"
+#include "log.h"
+#include "safe_stringstream.h"
 
 #include "i18n.h"
 
+#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+
 int const VideoContentProperty::VIDEO_SIZE	  = 0;
 int const VideoContentProperty::VIDEO_FRAME_RATE  = 1;
 int const VideoContentProperty::VIDEO_FRAME_TYPE  = 2;
@@ -42,7 +46,6 @@ int const VideoContentProperty::VIDEO_SCALE	  = 4;
 int const VideoContentProperty::COLOUR_CONVERSION = 5;
 
 using std::string;
-using std::stringstream;
 using std::setprecision;
 using std::cout;
 using std::vector;
@@ -60,7 +63,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f)
 	, _video_length (0)
 	, _video_frame_rate (0)
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
-	, _scale (Ratio::from_id ("185"))
+	, _scale (Config::instance()->default_scale ())
 {
 	setup_default_colour_conversion ();
 }
@@ -70,7 +73,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, ContentTime len
 	, _video_length (len)
 	, _video_frame_rate (0)
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
-	, _scale (Ratio::from_id ("185"))
+	, _scale (Config::instance()->default_scale ())
 {
 	setup_default_colour_conversion ();
 }
@@ -80,7 +83,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	, _video_length (0)
 	, _video_frame_rate (0)
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
-	, _scale (Ratio::from_id ("185"))
+	, _scale (Config::instance()->default_scale ())
 {
 	setup_default_colour_conversion ();
 }
@@ -96,7 +99,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, i
 		/* DCP-o-matic 1.0 branch */
 		_video_length = ContentTime::from_frames (node->number_child<int64_t> ("VideoLength"), _video_frame_rate);
 	} else {
-		_video_length = ContentTime (node->number_child<int64_t> ("VideoLength"));
+		_video_length = ContentTime (node->number_child<ContentTime::Type> ("VideoLength"));
 	}
 	
 	_video_frame_type = static_cast<VideoFrameType> (node->number_child<int> ("VideoFrameType"));
@@ -188,15 +191,22 @@ VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
 	/* These examiner calls could call other content methods which take a lock on the mutex */
 	dcp::Size const vs = d->video_size ();
 	float const vfr = d->video_frame_rate ();
-	
+	ContentTime vl = d->video_length ();
+
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 		_video_size = vs;
 		_video_frame_rate = vfr;
+		_video_length = vl;
 	}
+
+	shared_ptr<const Film> film = _film.lock ();
+	assert (film);
+	LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length.frames (_video_frame_rate));
 	
 	signal_changed (VideoContentProperty::VIDEO_SIZE);
 	signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+	signal_changed (ContentProperty::LENGTH);
 }
 
 
@@ -207,7 +217,7 @@ VideoContent::information () const
 		return "";
 	}
 	
-	stringstream s;
+	SafeStringStream s;
 
 	s << String::compose (
 		_("%1x%2 pixels (%3:1)"),
@@ -299,7 +309,7 @@ VideoContent::set_scale (VideoContentScale s)
 string
 VideoContent::identifier () const
 {
-	stringstream s;
+	SafeStringStream s;
 	s << Content::identifier()
 	  << "_" << crop().left
 	  << "_" << crop().right
@@ -469,10 +479,10 @@ VideoContentScale::as_xml (xmlpp::Node* node) const
 string
 VideoContentScale::id () const
 {
-	stringstream s;
+	SafeStringStream s;
 	
 	if (_ratio) {
-		s << _ratio->id () << "_";
+		s << _ratio->id ();
 	} else {
 		s << (_scale ? "S1" : "S0");
 	}
@@ -494,29 +504,44 @@ VideoContentScale::name () const
 	return _("No scale");
 }
 
+VideoContentScale
+VideoContentScale::from_id (string id)
+{
+	Ratio const * r = Ratio::from_id (id);
+	if (r) {
+		return VideoContentScale (r);
+	}
+
+	if (id == "S0") {
+		return VideoContentScale (false);
+	}
+
+	return VideoContentScale (true);
+}
+		
 /** @param display_container Size of the container that we are displaying this content in.
  *  @param film_container The size of the film's image.
  */
 dcp::Size
-VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size display_container, dcp::Size film_container) const
+VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size display_container, dcp::Size film_container, int round) const
 {
 	if (_ratio) {
-		return fit_ratio_within (_ratio->ratio (), display_container);
+		return fit_ratio_within (_ratio->ratio (), display_container, round);
 	}
 
 	dcp::Size const ac = c->video_size_after_crop ();
 
 	/* Force scale if the film_container is smaller than the content's image */
 	if (_scale || film_container.width < ac.width || film_container.height < ac.height) {
-		return fit_ratio_within (ac.ratio (), display_container);
+		return fit_ratio_within (ac.ratio (), display_container, 1);
 	}
 
 	/* Scale the image so that it will be in the right place in film_container, even if display_container is a
 	   different size.
 	*/
 	return dcp::Size (
-		c->video_size().width  * float(display_container.width)  / film_container.width,
-		c->video_size().height * float(display_container.height) / film_container.height
+		round_to (c->video_size().width  * float(display_container.width)  / film_container.width, round),
+		round_to (c->video_size().height * float(display_container.height) / film_container.height, round)
 		);
 }