X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=40f6ed9714baacd1a2bc9bb93b813d651a48225e;hb=29a3d5d116da0626f71bf488b0408bd461327184;hp=5f94d5d6bc65e1f95f13ee730a5af12c579ee286;hpb=b8724f408298ff3e804fb821fa15d3bcded0e3db;p=dcpomatic.git

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 5f94d5d6b..40f6ed971 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -19,9 +19,9 @@
 
 #include <fstream>
 #include <cerrno>
-#include <libdcp/picture_asset.h>
+#include <libdcp/mono_picture_asset.h>
+#include <libdcp/stereo_picture_asset.h>
 #include <libdcp/sound_asset.h>
-#include <libdcp/picture_frame.h>
 #include <libdcp/reel.h>
 #include <libdcp/dcp.h>
 #include <libdcp/cpl.h>
@@ -65,53 +65,44 @@ Writer::Writer (shared_ptr<const Film> f, shared_ptr<Job> j)
 {
 	/* Remove any old DCP */
 	boost::filesystem::remove_all (_film->dir (_film->dcp_name ()));
-	
+
+	_job->sub (_("Checking existing image data"));
 	check_existing_picture_mxf ();
-	
+
 	/* Create our picture asset in a subdirectory, named according to those
 	   film's parameters which affect the video output.  We will hard-link
 	   it into the DCP later.
 	*/
 
-	if (f->three_d ()) {
-		_picture_asset.reset (
-			new libdcp::StereoPictureAsset (
-				_film->internal_video_mxf_dir (),
-				_film->internal_video_mxf_filename (),
-				_film->video_frame_rate (),
-				_film->container()->size (_film->full_frame ())
-				)
-			);
-		
+	if (_film->three_d ()) {
+		_picture_asset.reset (new libdcp::StereoPictureAsset (_film->internal_video_mxf_dir (), _film->internal_video_mxf_filename ()));
 	} else {
-		_picture_asset.reset (
-			new libdcp::MonoPictureAsset (
-				_film->internal_video_mxf_dir (),
-				_film->internal_video_mxf_filename (),
-				_film->video_frame_rate (),
-				_film->container()->size (_film->full_frame ())
-				)
-			);
-
+		_picture_asset.reset (new libdcp::MonoPictureAsset (_film->internal_video_mxf_dir (), _film->internal_video_mxf_filename ()));
 	}
 
-	_picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0, _film->interop ());
+	_picture_asset->set_edit_rate (_film->video_frame_rate ());
+	_picture_asset->set_size (fit_ratio_within (_film->container()->ratio(), _film->full_frame ()));
+
+	if (_film->encrypted ()) {
+		_picture_asset->set_key (_film->key ());
+	}
 	
-	_sound_asset.reset (
-		new libdcp::SoundAsset (
-			_film->dir (_film->dcp_name()),
-			_film->audio_mxf_filename (),
-			_film->video_frame_rate (),
-			_film->audio_channels (),
-			_film->audio_frame_rate ()
-			)
-		);
+	_picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
+	
+	_sound_asset.reset (new libdcp::SoundAsset (_film->dir (_film->dcp_name()), _film->audio_mxf_filename ()));
+	_sound_asset->set_edit_rate (_film->video_frame_rate ());
+	_sound_asset->set_channels (_film->audio_channels ());
+	_sound_asset->set_sampling_rate (_film->audio_frame_rate ());
+
+	if (_film->encrypted ()) {
+		_sound_asset->set_key (_film->key ());
+	}
 	
-	_sound_asset_writer = _sound_asset->start_write (_film->interop ());
+	_sound_asset_writer = _sound_asset->start_write ();
 
 	_thread = new boost::thread (boost::bind (&Writer::thread, this));
 
-	_job->descend (0.9);
+	_job->sub (_("Encoding image data"));
 }
 
 void
@@ -146,7 +137,7 @@ Writer::fake_write (int frame, Eyes eyes)
 {
 	boost::mutex::scoped_lock lock (_mutex);
 
-	ifstream ifi (_film->info_path (frame, eyes).c_str());
+	ifstream ifi (_film->info_path (frame, eyes).string().c_str());
 	libdcp::FrameInfo info (ifi);
 	
 	QueueItem qi;
@@ -391,21 +382,15 @@ Writer::finish ()
 							 )
 			       ));
 
-	/* Compute the digests for the assets now so that we can keep track of progress.
-	   We did _job->descend (0.9) in our constructor */
-	_job->ascend ();
+	_job->sub (_("Computing image digest"));
+	_picture_asset->compute_digest (boost::bind (&Job::set_progress, _job.get(), _1, false));
 
-	_job->descend (0.1);
-	_picture_asset->compute_digest (boost::bind (&Job::set_progress, _job.get(), _1));
-	_job->ascend ();
-
-	_job->descend (0.1);
-	_sound_asset->compute_digest (boost::bind (&Job::set_progress, _job.get(), _1));
-	_job->ascend ();
+	_job->sub (_("Computing audio digest"));
+	_sound_asset->compute_digest (boost::bind (&Job::set_progress, _job.get(), _1, false));
 
 	libdcp::XMLMetadata meta = Config::instance()->dcp_metadata ();
 	meta.set_issue_date_now ();
-	dcp.write_xml (_film->interop (), meta);
+	dcp.write_xml (_film->interop (), meta, make_signer ());
 
 	_film->log()->log (String::compose (N_("Wrote %1 FULL, %2 FAKE, %3 REPEAT; %4 pushed to disk"), _full_written, _fake_written, _repeat_written, _pushed_to_disk));
 }
@@ -436,7 +421,7 @@ bool
 Writer::check_existing_picture_mxf_frame (FILE* mxf, int f, Eyes eyes)
 {
 	/* Read the frame info as written */
-	ifstream ifi (_film->info_path (f, eyes).c_str());
+	ifstream ifi (_film->info_path (f, eyes).string().c_str());
 	libdcp::FrameInfo info (ifi);
 	if (info.size == 0) {
 		_film->log()->log (String::compose ("Existing frame %1 has no info file", f));
@@ -444,7 +429,11 @@ Writer::check_existing_picture_mxf_frame (FILE* mxf, int f, Eyes eyes)
 	}
 	
 	/* Read the data from the MXF and hash it */
+#ifdef DCPOMATIC_WINDOWS
+	_fseeki64 (mxf, info.offset, SEEK_SET);
+#else	
 	fseek (mxf, info.offset, SEEK_SET);
+#endif	
 	EncodedData data (info.size);
 	size_t const read = fread (data.data(), 1, data.size(), mxf);
 	if (read != static_cast<size_t> (data.size ())) {
@@ -474,8 +463,15 @@ Writer::check_existing_picture_mxf ()
 		return;
 	}
 
+	int N = 0;
+	for (boost::filesystem::directory_iterator i (_film->info_dir ()); i != boost::filesystem::directory_iterator (); ++i) {
+		++N;
+	}
+
 	while (1) {
 
+		_job->set_progress (float (_first_nonexistant_frame) / N);
+
 		if (_film->three_d ()) {
 			if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_LEFT)) {
 				break;