Merge branch 'grok2' into v2.17.xv2.17.8

This is the DoM support for Aaron Boxer's "grok" GPU J2K encoder,
with some cleanups and other assorted/related DoM changes.

1 files changed, 24 insertions, 0 deletions

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 8eb76fdd6..940ca31d2 100644
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -118,6 +118,30 @@ DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler
 	return xyz;
 }
 
+dcp::Size
+DCPVideo::get_size() const
+{
+	auto image = _frame->image(bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, false);
+	return image->size();
+}
+
+
+void
+DCPVideo::convert_to_xyz(uint16_t* dst) const
+{
+	auto image = _frame->image(bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, false);
+	if (_frame->colour_conversion()) {
+		dcp::rgb_to_xyz (
+			image->data()[0],
+			dst,
+			image->size(),
+			image->stride()[0],
+			_frame->colour_conversion().get()
+			);
+	}
+}
+
+
 /** J2K-encode this frame on the local host.
  *  @return Encoded data.
  */