X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video_frame.cc;h=78d73ad00c0a035d9156059e29de9e5c8ab4b093;hb=6219882009ffd499b4b8000697b17a659c834212;hp=25abd6f0df57ee7f9f0304e9713b919052639c00;hpb=f8678dcae5f90eb946ad6e51d9a62e0c02bc63e3;p=dcpomatic.git

diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 25abd6f0d..78d73ad00 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -59,12 +59,12 @@
 #include "scaler.h"
 #include "image.h"
 #include "log.h"
+#include "cross.h"
 
 #include "i18n.h"
 
 using std::string;
 using std::stringstream;
-using std::ofstream;
 using std::cout;
 using boost::shared_ptr;
 using boost::lexical_cast;
@@ -79,7 +79,7 @@ using libdcp::Size;
  *  @param l Log to write to.
  */
 DCPVideoFrame::DCPVideoFrame (
-	shared_ptr<const Image> image, int f, Eyes eyes, ColourConversion c, int dcp_fps, int bw, shared_ptr<Log> l
+	shared_ptr<const Image> image, int f, Eyes eyes, ColourConversion c, int dcp_fps, int bw, Resolution r, shared_ptr<Log> l
 	)
 	: _image (image)
 	, _frame (f)
@@ -87,6 +87,7 @@ DCPVideoFrame::DCPVideoFrame (
 	, _conversion (c)
 	, _frames_per_second (dcp_fps)
 	, _j2k_bandwidth (bw)
+	, _resolution (r)
 	, _log (l)
 {
 	
@@ -110,6 +111,7 @@ DCPVideoFrame::DCPVideoFrame (shared_ptr<const Image> image, shared_ptr<const cx
 	_conversion = ColourConversion (node->node_child ("ColourConversion"));
 	_frames_per_second = node->number_child<int> ("FramesPerSecond");
 	_j2k_bandwidth = node->number_child<int> ("J2KBandwidth");
+	_resolution = Resolution (node->optional_number_child<int>("Resolution").get_value_or (RESOLUTION_2K));
 }
 
 /** J2K-encode this frame on the local host.
@@ -194,9 +196,27 @@ DCPVideoFrame::encode_locally ()
 	parameters.tcp_rates[0] = 0;
 	parameters.tcp_numlayers++;
 	parameters.cp_disto_alloc = 1;
-	parameters.cp_rsiz = CINEMA2K;
+	parameters.cp_rsiz = _resolution == RESOLUTION_2K ? CINEMA2K : CINEMA4K;
+	if (_resolution == RESOLUTION_4K) {
+		parameters.numpocs = 2;
+		parameters.POC[0].tile = 1;
+		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].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 = CINEMA2K_24;
+	parameters.cp_cinema = _resolution == RESOLUTION_2K ? CINEMA2K_24 : CINEMA4K_24;
 
 	/* 3 components, so use MCT */
 	parameters.tcp_mct = 1;
@@ -317,6 +337,7 @@ DCPVideoFrame::add_metadata (xmlpp::Element* el) const
 
 	el->add_child("FramesPerSecond")->add_child_text (lexical_cast<string> (_frames_per_second));
 	el->add_child("J2KBandwidth")->add_child_text (lexical_cast<string> (_j2k_bandwidth));
+	el->add_child("Resolution")->add_child_text (lexical_cast<string> (int (_resolution)));
 }
 
 EncodedData::EncodedData (int s)
@@ -331,7 +352,7 @@ EncodedData::EncodedData (boost::filesystem::path file)
 	_size = boost::filesystem::file_size (file);
 	_data = new uint8_t[_size];
 
-	FILE* f = fopen (file.string().c_str(), N_("rb"));
+	FILE* f = fopen_boost (file, "rb");
 	if (!f) {
 		throw FileError (_("could not open file for reading"), file);
 	}
@@ -360,7 +381,7 @@ EncodedData::write (shared_ptr<const Film> film, int frame, Eyes eyes) const
 {
 	boost::filesystem::path const tmp_j2c = film->j2c_path (frame, eyes, true);
 
-	FILE* f = fopen (tmp_j2c.string().c_str (), N_("wb"));
+	FILE* f = fopen_boost (tmp_j2c, "wb");
 	
 	if (!f) {
 		throw WriteFileError (tmp_j2c, errno);
@@ -379,8 +400,9 @@ void
 EncodedData::write_info (shared_ptr<const Film> film, int frame, Eyes eyes, libdcp::FrameInfo fin) const
 {
 	boost::filesystem::path const info = film->info_path (frame, eyes);
-	ofstream h (info.string().c_str());
+	FILE* h = fopen_boost (info, "w");
 	fin.write (h);
+	fclose (h);
 }
 
 /** Send this data to a socket.