X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=0a3e378eecb1fda2f05ef3b6894659c6849386fe;hb=cc27c2716f755305d67f1e1ba828ecf37f8405dd;hp=05f5c538eee2a81c6344f603ab2bfa3e60dfd2cb;hpb=04533b9cf34ce8089113015715083ee9c5b2b001;p=dcpomatic.git

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 05f5c538e..0a3e378ee 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -31,9 +31,12 @@
 #include "film.h"
 #include "exceptions.h"
 #include "frame_rate_change.h"
+#include "log.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;
@@ -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);
 }
 
 
@@ -408,6 +418,21 @@ VideoContent::scale_and_crop_to_fit_height ()
 	set_right_crop (crop / 2);
 }
 
+void
+VideoContent::set_video_frame_rate (float r)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		if (_video_frame_rate == r) {
+			return;
+		}
+		
+		_video_frame_rate = r;
+	}
+	
+	signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+}
+
 VideoContentScale::VideoContentScale (Ratio const * r)
 	: _ratio (r)
 	, _scale (true)
@@ -483,25 +508,25 @@ VideoContentScale::name () const
  *  @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)
 		);
 }