X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fwriter.cc;h=d346c4a4ff32eba5573ffe6c897f29301a02f101;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hp=d85db56894ccb59525ab18ef00303810a08d7ee6;hpb=ea6b2dae46caa1da829fbf499e83cd6ae3b3773a;p=dcpomatic.git

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index d85db5689..d346c4a4f 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -87,6 +87,8 @@ Writer::Writer (shared_ptr<const Film> film, weak_ptr<Job> j)
 		_reels.push_back (ReelWriter (film, p, job, reel_index++, reels.size(), _film->content_summary(p)));
 	}
 
+	_last_written.resize (reels.size());
+
 	/* We can keep track of the current audio, subtitle and closed caption reels easily because audio
 	   and captions arrive to the Writer in sequence.  This is not so for video.
 	*/
@@ -214,18 +216,18 @@ Writer::fake_write (Frame frame, Eyes eyes)
 	}
 
 	size_t const reel = video_reel (frame);
-	Frame const reel_frame = frame - _reels[reel].start ();
+	Frame const frame_in_reel = frame - _reels[reel].start ();
 
 	QueueItem qi;
 	qi.type = QueueItem::FAKE;
 
 	{
 		shared_ptr<InfoFileHandle> info_file = _film->info_file_handle(_reels[reel].period(), true);
-		qi.size = _reels[reel].read_frame_info(info_file, reel_frame, eyes).size;
+		qi.size = _reels[reel].read_frame_info(info_file, frame_in_reel, eyes).size;
 	}
 
 	qi.reel = reel;
-	qi.frame = reel_frame;
+	qi.frame = frame_in_reel;
 	if (_film->three_d() && eyes == EYES_BOTH) {
 		qi.eyes = EYES_LEFT;
 		_queue.push_back (qi);
@@ -284,15 +286,12 @@ Writer::write (shared_ptr<const AudioBuffers> audio, DCPTime const time)
 			};
 
 			if (part_frames[0]) {
-				shared_ptr<AudioBuffers> part (new AudioBuffers (audio->channels(), part_frames[0]));
-				part->copy_from (audio.get(), part_frames[0], 0, 0);
+				shared_ptr<AudioBuffers> part (new AudioBuffers(audio, part_frames[0], 0));
 				_audio_reel->write (part);
 			}
 
 			if (part_frames[1]) {
-				shared_ptr<AudioBuffers> part (new AudioBuffers (audio->channels(), part_frames[1]));
-				part->copy_from (audio.get(), part_frames[1], part_frames[0], 0);
-				audio = part;
+				audio.reset (new AudioBuffers(audio, part_frames[1], part_frames[0]));
 			} else {
 				audio.reset ();
 			}
@@ -303,7 +302,8 @@ Writer::write (shared_ptr<const AudioBuffers> audio, DCPTime const time)
 	}
 }
 
-/** This must be called from Writer::thread() with an appropriate lock held */
+
+/** Caller must hold a lock on _state_mutex */
 bool
 Writer::have_sequenced_image_at_queue_head ()
 {
@@ -312,30 +312,41 @@ Writer::have_sequenced_image_at_queue_head ()
 	}
 
 	_queue.sort ();
-
 	QueueItem const & f = _queue.front();
-	ReelWriter const & reel = _reels[f.reel];
+	return _last_written[f.reel].next(f);
+}
 
-	/* The queue should contain only EYES_LEFT/EYES_RIGHT pairs or EYES_BOTH */
 
-	if (f.eyes == EYES_BOTH) {
+bool
+Writer::LastWritten::next (QueueItem qi) const
+{
+	if (qi.eyes == EYES_BOTH) {
 		/* 2D */
-		return f.frame == (reel.last_written_video_frame() + 1);
+		return qi.frame == (_frame + 1);
 	}
 
 	/* 3D */
 
-	if (reel.last_written_eyes() == EYES_LEFT && f.frame == reel.last_written_video_frame() && f.eyes == EYES_RIGHT) {
+	if (_eyes == EYES_LEFT && qi.frame == _frame && qi.eyes == EYES_RIGHT) {
 		return true;
 	}
 
-	if (reel.last_written_eyes() == EYES_RIGHT && f.frame == (reel.last_written_video_frame() + 1) && f.eyes == EYES_LEFT) {
+	if (_eyes == EYES_RIGHT && qi.frame == (_frame + 1) && qi.eyes == EYES_LEFT) {
 		return true;
 	}
 
 	return false;
 }
 
+
+void
+Writer::LastWritten::update (QueueItem qi)
+{
+	_frame = qi.frame;
+	_eyes = qi.eyes;
+}
+
+
 void
 Writer::thread ()
 try
@@ -370,11 +381,11 @@ try
 			/* (Hopefully temporarily) log anything that was not written */
 			if (!_queue.empty() && !have_sequenced_image_at_queue_head()) {
 				LOG_WARNING (N_("Finishing writer with a left-over queue of %1:"), _queue.size());
-				for (list<QueueItem>::const_iterator i = _queue.begin(); i != _queue.end(); ++i) {
-					if (i->type == QueueItem::FULL) {
-						LOG_WARNING (N_("- type FULL, frame %1, eyes %2"), i->frame, (int) i->eyes);
+				BOOST_FOREACH (QueueItem const& i, _queue) {
+					if (i.type == QueueItem::FULL) {
+						LOG_WARNING (N_("- type FULL, frame %1, eyes %2"), i.frame, (int) i.eyes);
 					} else {
-						LOG_WARNING (N_("- type FAKE, size %1, frame %2, eyes %3"), i->size, i->frame, (int) i->eyes);
+						LOG_WARNING (N_("- type FAKE, size %1, frame %2, eyes %3"), i.size, i.frame, (int) i.eyes);
 					}
 				}
 			}
@@ -384,6 +395,7 @@ try
 		/* Write any frames that we can write; i.e. those that are in sequence. */
 		while (have_sequenced_image_at_queue_head ()) {
 			QueueItem qi = _queue.front ();
+			_last_written[qi.reel].update (qi);
 			_queue.pop_front ();
 			if (qi.type == QueueItem::FULL && qi.encoded) {
 				--_queued_full_in_memory;
@@ -404,7 +416,7 @@ try
 				break;
 			case QueueItem::FAKE:
 				LOG_DEBUG_ENCODE (N_("Writer FAKE-writes %1"), qi.frame);
-				reel.fake_write (qi.frame, qi.eyes, qi.size);
+				reel.fake_write (qi.size);
 				++_fake_written;
 				break;
 			case QueueItem::REPEAT:
@@ -433,7 +445,7 @@ try
 			DCPOMATIC_ASSERT (i != _queue.rend());
 			++_pushed_to_disk;
 			/* For the log message below */
-			int const awaiting = _reels[_queue.front().reel].last_written_video_frame() + 1;
+			int const awaiting = _last_written[_queue.front().reel].frame() + 1;
 			lock.unlock ();
 
 			/* i is valid here, even though we don't hold a lock on the mutex,