X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video.cc;h=cacba190f87603dfa5d12a1a27c953229af959a5;hb=b6c780d3107557d452c6612d715d01e2be52dbda;hp=b6b7ab296c2aa6fc5fff7b6b8cd50c25a59e571c;hpb=096660d2cc3e65ae5e13a69e7ace19ff0d48b39a;p=dcpomatic.git

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index b6b7ab296..cacba190f 100644
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -34,7 +34,6 @@
 #include <stdexcept>
 #include <cstdio>
 #include <iomanip>
-#include <sstream>
 #include <iostream>
 #include <fstream>
 #include <unistd.h>
@@ -60,13 +59,13 @@
 #include "log.h"
 #include "cross.h"
 #include "player_video.h"
+#include "encoded_data.h"
 
 #define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
 
 #include "i18n.h"
 
 using std::string;
-using std::stringstream;
 using std::cout;
 using boost::shared_ptr;
 using boost::lexical_cast;
@@ -112,26 +111,33 @@ DCPVideo::DCPVideo (shared_ptr<const PlayerVideo> frame, shared_ptr<const cxml::
 shared_ptr<EncodedData>
 DCPVideo::encode_locally ()
 {
-	shared_ptr<dcp::GammaLUT> in_lut = dcp::GammaLUT::cache.get (
-		12, _frame->colour_conversion().input_gamma, _frame->colour_conversion().input_gamma_linearised
-		);
-	
-	/* XXX: libdcp should probably use boost */
-	
-	double matrix[3][3];
-	for (int i = 0; i < 3; ++i) {
-		for (int j = 0; j < 3; ++j) {
-			matrix[i][j] = _frame->colour_conversion().matrix (i, j);
+	shared_ptr<dcp::XYZFrame> xyz;
+
+	if (_frame->colour_conversion()) {
+		ColourConversion conversion = _frame->colour_conversion().get ();
+		shared_ptr<dcp::GammaLUT> in_lut = dcp::GammaLUT::cache.get (
+			12, conversion.input_gamma, conversion.input_gamma_linearised
+			);
+		
+		/* XXX: dcp should probably use boost */
+		
+		double matrix[3][3];
+		for (int i = 0; i < 3; ++i) {
+			for (int j = 0; j < 3; ++j) {
+				matrix[i][j] = conversion.matrix (i, j);
+			}
 		}
+		
+		xyz = dcp::rgb_to_xyz (
+			_frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles),
+			in_lut,
+			dcp::GammaLUT::cache.get (16, 1 / conversion.output_gamma, false),
+			matrix
+			);
+	} else {
+		xyz = dcp::xyz_to_xyz (_frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles));
 	}
 
-	shared_ptr<dcp::XYZFrame> xyz = dcp::rgb_to_xyz (
-		_frame->image (_burn_subtitles),
-		in_lut,
-		dcp::GammaLUT::cache.get (16, 1 / _frame->colour_conversion().output_gamma, false),
-		matrix
-		);
-
 	/* Set the max image and component sizes based on frame_rate */
 	int max_cs_len = ((float) _j2k_bandwidth) / 8 / _frames_per_second;
 	if (_frame->eyes() == EYES_LEFT || _frame->eyes() == EYES_RIGHT) {
@@ -281,10 +287,9 @@ DCPVideo::encode_remotely (ServerDescription serv)
 	LOG_GENERAL (N_("Sending frame %1 to remote"), _index);
 	
 	/* Send XML metadata */
-	stringstream xml;
-	doc.write_to_stream (xml, "UTF-8");
-	socket->write (xml.str().length() + 1);
-	socket->write ((uint8_t *) xml.str().c_str(), xml.str().length() + 1);
+	string xml = doc.write_to_string ("UTF-8");
+	socket->write (xml.length() + 1);
+	socket->write ((uint8_t *) xml.c_str(), xml.length() + 1);
 
 	/* Send binary data */
 	_frame->send_binary (socket, _burn_subtitles);
@@ -317,90 +322,18 @@ DCPVideo::eyes () const
 	return _frame->eyes ();
 }
 
-EncodedData::EncodedData (int s)
-	: _data (new uint8_t[s])
-	, _size (s)
-{
-
-}
-
-EncodedData::EncodedData (boost::filesystem::path file)
-{
-	_size = boost::filesystem::file_size (file);
-	_data = new uint8_t[_size];
-
-	FILE* f = fopen_boost (file, "rb");
-	if (!f) {
-		throw FileError (_("could not open file for reading"), file);
-	}
-	
-	size_t const r = fread (_data, 1, _size, f);
-	if (r != size_t (_size)) {
-		fclose (f);
-		throw FileError (_("could not read encoded data"), file);
-	}
-		
-	fclose (f);
-}
-
-
-EncodedData::~EncodedData ()
-{
-	delete[] _data;
-}
-
-/** Write this data to a J2K file.
- *  @param Film Film.
- *  @param frame DCP frame index.
+/** @return true if this DCPVideo is definitely the same as another;
+ *  (apart from the frame index), false if it is probably not.
  */
-void
-EncodedData::write (shared_ptr<const Film> film, int frame, Eyes eyes) const
+bool
+DCPVideo::same (shared_ptr<const DCPVideo> other) const
 {
-	boost::filesystem::path const tmp_j2c = film->j2c_path (frame, eyes, true);
-
-	FILE* f = fopen_boost (tmp_j2c, "wb");
-	
-	if (!f) {
-		throw WriteFileError (tmp_j2c, errno);
+	if (_frames_per_second != other->_frames_per_second ||
+	    _j2k_bandwidth != other->_j2k_bandwidth ||
+	    _resolution != other->_resolution ||
+	    _burn_subtitles != other->_burn_subtitles) {
+		return false;
 	}
 
-	fwrite (_data, 1, _size, f);
-	fclose (f);
-
-	boost::filesystem::path const real_j2c = film->j2c_path (frame, eyes, false);
-
-	/* Rename the file from foo.j2c.tmp to foo.j2c now that it is complete */
-	boost::filesystem::rename (tmp_j2c, real_j2c);
-}
-
-void
-EncodedData::write_info (shared_ptr<const Film> film, int frame, Eyes eyes, dcp::FrameInfo fin) const
-{
-	boost::filesystem::path const info = film->info_path (frame, eyes);
-	FILE* h = fopen_boost (info, "w");
-	fin.write (h);
-	fclose (h);
-}
-
-/** Send this data to a socket.
- *  @param socket Socket
- */
-void
-EncodedData::send (shared_ptr<Socket> socket)
-{
-	socket->write (_size);
-	socket->write (_data, _size);
-}
-
-LocallyEncodedData::LocallyEncodedData (uint8_t* d, int s)
-	: EncodedData (s)
-{
-	memcpy (_data, d, s);
-}
-
-/** @param s Size of data in bytes */
-RemotelyEncodedData::RemotelyEncodedData (int s)
-	: EncodedData (s)
-{
-
+	return _frame->same (other->_frame);
 }