X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=d45bf9f432b90c996feb870baf1580fc3a5796a4;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=7c36af31b54bbbb7e8c764b9f0b3dcba89145e5e;hpb=67ff55886b1ee86d99c2ea27d10c73b85b0504b7;p=dcpomatic.git

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 7c36af31b..d45bf9f43 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "content.h"
 #include "film.h"
 #include "image.h"
@@ -33,17 +34,19 @@ extern "C" {
 #include <libxml++/libxml++.h>
 #include <iostream>
 
+
 using std::cout;
 using std::dynamic_pointer_cast;
+using std::function;
 using std::make_shared;
 using std::shared_ptr;
 using std::string;
 using std::weak_ptr;
 using boost::optional;
-using std::function;
 using dcp::Data;
 using dcp::raw_convert;
 
+
 PlayerVideo::PlayerVideo (
 	shared_ptr<const ImageProxy> in,
 	Crop crop,
@@ -74,6 +77,7 @@ PlayerVideo::PlayerVideo (
 
 }
 
+
 PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket)
 {
 	_crop = Crop (node);
@@ -103,12 +107,14 @@ PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket
 	}
 }
 
+
 void
 PlayerVideo::set_text (PositionImage image)
 {
 	_text = image;
 }
 
+
 shared_ptr<Image>
 PlayerVideo::image (function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool fast) const
 {
@@ -191,6 +197,7 @@ PlayerVideo::make_image (function<AVPixelFormat (AVPixelFormat)> pixel_format, V
 	}
 }
 
+
 void
 PlayerVideo::add_metadata (xmlpp::Node* node) const
 {
@@ -218,6 +225,7 @@ PlayerVideo::add_metadata (xmlpp::Node* node) const
 	}
 }
 
+
 void
 PlayerVideo::write_to_socket (shared_ptr<Socket> socket) const
 {
@@ -227,6 +235,7 @@ PlayerVideo::write_to_socket (shared_ptr<Socket> socket) const
 	}
 }
 
+
 bool
 PlayerVideo::has_j2k () const
 {
@@ -240,6 +249,7 @@ PlayerVideo::has_j2k () const
 	return _crop == Crop() && _out_size == j2k->size() && _inter_size == j2k->size() && !_text && !_fade && !_colour_conversion;
 }
 
+
 shared_ptr<const dcp::Data>
 PlayerVideo::j2k () const
 {
@@ -248,12 +258,14 @@ PlayerVideo::j2k () const
 	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);
 }
 
+
 /** @return true if this PlayerVideo is definitely the same as another, false if it is probably not */
 bool
 PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
@@ -284,8 +296,9 @@ PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
 	return _in->same (other->_in);
 }
 
+
 AVPixelFormat
-PlayerVideo::force (AVPixelFormat, AVPixelFormat force_to)
+PlayerVideo::force (AVPixelFormat force_to)
 {
 	return force_to;
 }
@@ -296,6 +309,7 @@ PlayerVideo::keep_xyz_or_rgb (AVPixelFormat p)
 	return p == AV_PIX_FMT_XYZ12LE ? AV_PIX_FMT_XYZ12LE : AV_PIX_FMT_RGB48LE;
 }
 
+
 void
 PlayerVideo::prepare (function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, Image::Alignment alignment, bool fast, bool proxy_only)
 {
@@ -306,12 +320,14 @@ PlayerVideo::prepare (function<AVPixelFormat (AVPixelFormat)> pixel_format, Vide
 	}
 }
 
+
 size_t
 PlayerVideo::memory_used () const
 {
 	return _in->memory_used();
 }
 
+
 /** @return Shallow copy of this; _in and _text are shared between the original and the copy */
 shared_ptr<PlayerVideo>
 PlayerVideo::shallow_copy () const
@@ -332,6 +348,7 @@ PlayerVideo::shallow_copy () const
 		);
 }
 
+
 /** Re-read crop, fade, inter/out size, colour conversion and video range from our content.
  *  @return true if this was possible, false if not.
  */
@@ -343,9 +360,14 @@ PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size player_video
 		return false;
 	}
 
-	_crop = content->video->crop();
+	_crop = content->video->actual_crop();
 	_fade = content->video->fade(film, _video_frame.get());
-	_inter_size = scale_for_display(content->video->scaled_size(film->frame_size()), player_video_container_size, film->frame_size());
+	_inter_size = scale_for_display(
+		content->video->scaled_size(film->frame_size()),
+		player_video_container_size,
+		film->frame_size(),
+		content->video->pixel_quanta()
+		);
 	_out_size = player_video_container_size;
 	_colour_conversion = content->video->colour_conversion();
 	_video_range = content->video->range();