X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video.cc;h=b72353d9ecbc6482c6573f496275e53687d495d4;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=a01a72f6b83aebb0a698a957549ea8a37019cbc7;hpb=f213fd833a840fc97e3875979ae7dc7cbbc883b1;p=dcpomatic.git

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index a01a72f6b..b72353d9e 100644
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
     Taken from code Copyright (C) 2010-2011 Terrence Meiczinger
 
     This program is free software; you can redistribute it and/or modify
@@ -33,17 +33,16 @@
 #include "exceptions.h"
 #include "server.h"
 #include "dcpomatic_socket.h"
-#include "scaler.h"
 #include "image.h"
 #include "log.h"
 #include "cross.h"
 #include "player_video.h"
-#include "encoded_data.h"
+#include "raw_convert.h"
+#include "data.h"
 #include <libcxml/cxml.h>
-#include <dcp/xyz_frame.h>
+#include <dcp/openjpeg_image.h>
 #include <dcp/rgb_xyz.h>
 #include <dcp/colour_matrix.h>
-#include <dcp/raw_convert.h>
 #include <boost/array.hpp>
 #include <boost/asio.hpp>
 #include <boost/filesystem.hpp>
@@ -68,7 +67,6 @@ using std::cout;
 using boost::shared_ptr;
 using boost::lexical_cast;
 using dcp::Size;
-using dcp::raw_convert;
 
 #define DCI_COEFFICENT (48.0 / 52.37)
 
@@ -89,7 +87,7 @@ DCPVideo::DCPVideo (
 	, _burn_subtitles (b)
 	, _log (l)
 {
-	
+
 }
 
 DCPVideo::DCPVideo (shared_ptr<const PlayerVideo> frame, shared_ptr<const cxml::Node> node, shared_ptr<Log> log)
@@ -106,18 +104,22 @@ DCPVideo::DCPVideo (shared_ptr<const PlayerVideo> frame, shared_ptr<const cxml::
 /** J2K-encode this frame on the local host.
  *  @return Encoded data.
  */
-shared_ptr<EncodedData>
+Data
 DCPVideo::encode_locally (dcp::NoteHandler note)
 {
-	shared_ptr<dcp::XYZFrame> xyz;
+	shared_ptr<dcp::OpenJPEGImage> xyz;
 
+	shared_ptr<Image> image = _frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles, note);
 	if (_frame->colour_conversion()) {
 		xyz = dcp::rgb_to_xyz (
-			_frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles, note),
-			_frame->colour_conversion().get()
+			image->data()[0],
+			image->size(),
+			image->stride()[0],
+			_frame->colour_conversion().get(),
+			note
 			);
 	} else {
-		xyz = dcp::xyz_to_xyz (_frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles, note));
+		xyz = dcp::xyz_to_xyz (image->data()[0], image->size(), image->stride()[0]);
 	}
 
 	/* Set the max image and component sizes based on frame_rate */
@@ -142,11 +144,11 @@ DCPVideo::encode_locally (dcp::NoteHandler note)
 	parameters.tile_size_on = false;
 	parameters.cp_tdx = 1;
 	parameters.cp_tdy = 1;
-	
+
 	/* Tile part */
 	parameters.tp_flag = 'C';
 	parameters.tp_on = 1;
-	
+
 	/* Tile and Image shall be at (0,0) */
 	parameters.cp_tx0 = 0;
 	parameters.cp_ty0 = 0;
@@ -157,19 +159,19 @@ DCPVideo::encode_locally (dcp::NoteHandler note)
 	parameters.cblockw_init = 32;
 	parameters.cblockh_init = 32;
 	parameters.csty |= 0x01;
-	
+
 	/* The progression order shall be CPRL */
 	parameters.prog_order = CPRL;
-	
+
 	/* No ROI */
 	parameters.roi_compno = -1;
-	
+
 	parameters.subsampling_dx = 1;
 	parameters.subsampling_dy = 1;
-	
+
 	/* 9-7 transform */
 	parameters.irreversible = 1;
-	
+
 	parameters.tcp_rates[0] = 0;
 	parameters.tcp_numlayers++;
 	parameters.cp_disto_alloc = 1;
@@ -177,27 +179,27 @@ DCPVideo::encode_locally (dcp::NoteHandler note)
 	if (_resolution == RESOLUTION_4K) {
 		parameters.numpocs = 2;
 		parameters.POC[0].tile = 1;
-		parameters.POC[0].resno0 = 0; 
+		parameters.POC[0].resno0 = 0;
 		parameters.POC[0].compno0 = 0;
 		parameters.POC[0].layno1 = 1;
 		parameters.POC[0].resno1 = parameters.numresolution - 1;
 		parameters.POC[0].compno1 = 3;
 		parameters.POC[0].prg1 = CPRL;
 		parameters.POC[1].tile = 1;
-		parameters.POC[1].resno0 = parameters.numresolution - 1; 
+		parameters.POC[1].resno0 = parameters.numresolution - 1;
 		parameters.POC[1].compno0 = 0;
 		parameters.POC[1].layno1 = 1;
 		parameters.POC[1].resno1 = parameters.numresolution;
 		parameters.POC[1].compno1 = 3;
 		parameters.POC[1].prg1 = CPRL;
 	}
-	
+
 	parameters.cp_comment = strdup (N_("DCP-o-matic"));
 	parameters.cp_cinema = _resolution == RESOLUTION_2K ? CINEMA2K_24 : CINEMA4K_24;
 
 	/* 3 components, so use MCT */
 	parameters.tcp_mct = 1;
-	
+
 	/* set max image */
 	parameters.max_comp_size = max_comp_size;
 	parameters.tcp_rates[0] = ((float) (3 * xyz->size().width * xyz->size().height * 12)) / (max_cs_len * 8);
@@ -235,7 +237,7 @@ DCPVideo::encode_locally (dcp::NoteHandler note)
 		break;
 	}
 
-	shared_ptr<EncodedData> enc (new LocallyEncodedData (cio->buffer, cio_tell (cio)));
+	Data enc (cio->buffer, cio_tell (cio));
 
 	opj_cio_close (cio);
 	free (parameters.cp_comment);
@@ -248,7 +250,7 @@ DCPVideo::encode_locally (dcp::NoteHandler note)
  *  @param serv Server to send to.
  *  @return Encoded data.
  */
-shared_ptr<EncodedData>
+Data
 DCPVideo::encode_remotely (ServerDescription serv)
 {
 	boost::asio::io_service io_service;
@@ -267,7 +269,7 @@ DCPVideo::encode_remotely (ServerDescription serv)
 	add_metadata (root);
 
 	LOG_GENERAL (N_("Sending frame %1 to remote"), _index);
-	
+
 	/* Send XML metadata */
 	string xml = doc.write_to_string ("UTF-8");
 	socket->write (xml.length() + 1);
@@ -279,11 +281,11 @@ DCPVideo::encode_remotely (ServerDescription serv)
 	/* Read the response (JPEG2000-encoded data); this blocks until the data
 	   is ready and sent back.
 	*/
-	shared_ptr<EncodedData> e (new RemotelyEncodedData (socket->read_uint32 ()));
-	socket->read (e->data(), e->size());
+	Data e (socket->read_uint32 ());
+	socket->read (e.data().get(), e.size());
 
 	LOG_GENERAL (N_("Finished remotely-encoded frame %1"), _index);
-	
+
 	return e;
 }