Option to draw a border around the content's image (#391).

8 files changed, 40 insertions, 14 deletions

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 0de6f2ded..0891838ff 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1071,7 +1071,7 @@ Film::full_frame () const
 dcp::Size
 Film::frame_size () const
 {
-	return fit_ratio_within (container()->ratio(), full_frame ());
+	return fit_ratio_within (container()->ratio(), full_frame (), 1);
 }
 
 dcp::EncryptedKDM
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 06f9e1365..e46d539f8 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -342,7 +342,7 @@ Player::get_video (DCPTime time, bool accurate)
 			return pvf;
 		}
 		
-		dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size ());
+		dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size (), _approximate_size ? 4 : 1);
 		if (_approximate_size) {
 			image_size.width &= ~3;
 			image_size.height &= ~3;
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index a44264ced..8fd966e5f 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -111,8 +111,6 @@ PlayerVideo::image (bool burn_subtitle) const
 		
 	shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size, _scaler, PIX_FMT_RGB24, true);
 
-	Position<int> const container_offset ((_out_size.width - _inter_size.width) / 2, (_out_size.height - _inter_size.width) / 2);
-
 	if (burn_subtitle && _subtitle.image) {
 		out->alpha_blend (_subtitle.image, _subtitle.position);
 	}
@@ -171,3 +169,11 @@ PlayerVideo::j2k () const
 	assert (j2k);
 	return j2k->j2k ();
 }
+
+Position<int>
+PlayerVideo::inter_position () const
+{
+	return Position<int> ((_out_size.width - _inter_size.width) / 2, (_out_size.height - _inter_size.height) / 2);
+}
+
+
diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 4fe8712d4..74e05d1e9 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -62,6 +62,14 @@ public:
 		return _colour_conversion;
 	}
 
+	/** @return Position of the content within the overall image once it has been scaled up */
+	Position<int> inter_position () const;
+
+	/** @return Size of the content within the overall image once it has been scaled up */
+	dcp::Size inter_size () const {
+		return _inter_size;
+	}
+
 private:
 	boost::shared_ptr<const ImageProxy> _in;
 	DCPTime _time;
diff --git a/src/lib/util.cc b/src/lib/util.cc
index cc8d59f21..60953b544 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -636,6 +636,17 @@ stride_round_up (int c, int const * stride, int t)
 	return a - (a % t);
 }
 
+/** @param n A number.
+ *  @param r Rounding `boundary' (must be a power of 2)
+ *  @return n rounded to the nearest r
+ */
+int
+round_to (float n, int r)
+{
+	assert (r == 1 || r == 2 || r == 4);
+	return int (n + float(r) / 2) &~ (r - 1);
+}
+
 /** Read a sequence of key / value pairs from a text stream;
  *  the keys are the first words on the line, and the values are
  *  the remainder of the line following the key.  Lines beginning
@@ -837,13 +848,13 @@ split_get_request (string url)
 }
 
 dcp::Size
-fit_ratio_within (float ratio, dcp::Size full_frame)
+fit_ratio_within (float ratio, dcp::Size full_frame, int round)
 {
 	if (ratio < full_frame.ratio ()) {
-		return dcp::Size (rint (full_frame.height * ratio), full_frame.height);
+		return dcp::Size (round_to (full_frame.height * ratio, round), full_frame.height);
 	}
 	
-	return dcp::Size (full_frame.width, rint (full_frame.width / ratio));
+	return dcp::Size (full_frame.width, round_to (full_frame.width / ratio, round));
 }
 
 void *
diff --git a/src/lib/util.h b/src/lib/util.h
index b7dc978e3..1bbdfb2cf 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -66,11 +66,12 @@ extern bool valid_image_file (boost::filesystem::path);
 extern boost::filesystem::path mo_path ();
 #endif
 extern std::string tidy_for_filename (std::string);
-extern dcp::Size fit_ratio_within (float ratio, dcp::Size);
+extern dcp::Size fit_ratio_within (float ratio, dcp::Size, int);
 extern std::string entities_to_text (std::string e);
 extern std::map<std::string, std::string> split_get_request (std::string url);
 extern int dcp_audio_frame_rate (int);
 extern int stride_round_up (int, int const *, int);
+extern int round_to (float n, int r);
 extern std::multimap<std::string, std::string> read_key_value (std::istream& s);
 extern int get_required_int (std::multimap<std::string, std::string> const & kv, std::string k);
 extern float get_required_float (std::multimap<std::string, std::string> const & kv, std::string k);
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 0d9a8fc45..0a3e378ee 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -508,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)
 		);
 }
 
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 7d9cb4f8f..dc7de8d54 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -45,7 +45,7 @@ public:
 	VideoContentScale (bool);
 	VideoContentScale (cxml::NodePtr);
 
-	dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size, dcp::Size) const;
+	dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size, dcp::Size, int round) const;
 	std::string id () const;
 	std::string name () const;
 	void as_xml (xmlpp::Node *) const;