X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_file_encoder.cc;fp=src%2Flib%2Fffmpeg_file_encoder.cc;h=fe39c6b2efa8282f787855db12ea92742e4b23d6;hp=791edb9bcfff2a0c2995b561876098c5d6c8ab70;hb=9b94bc2c884289cc0b5125e918a115a342a12ff2;hpb=c42ce0e5b188d6fe0b022f1aec4fdcb04c4835f1

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index 791edb9bc..fe39c6b2e 100644
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -411,18 +411,7 @@ FFmpegFileEncoder::video (shared_ptr<PlayerVideo> video, DCPTime time)
 	DCPOMATIC_ASSERT (frame);
 
 	for (int i = 0; i < 3; ++i) {
-		{
-			boost::mutex::scoped_lock lm (_pending_images_mutex);
-			auto key = image->data()[i];
-			auto iter = _pending_images.find(key);
-			if (iter != _pending_images.end()) {
-				iter->second.second++;
-			} else {
-				_pending_images[key] = { image, 1 };
-			}
-		}
-
-		auto buffer = av_buffer_create(image->data()[i], image->stride()[i] * image->size().height, &buffer_free, this, 0);
+		auto buffer = _pending_images.create_buffer(image, i);
 		frame->buf[i] = av_buffer_ref (buffer);
 		frame->data[i] = buffer->data;
 		frame->linesize[i] = image->stride()[i];
@@ -496,24 +485,3 @@ FFmpegFileEncoder::subtitle (PlayerText, DCPTimePeriod)
 {
 
 }
-
-
-void
-FFmpegFileEncoder::buffer_free (void* opaque, uint8_t* data)
-{
-	reinterpret_cast<FFmpegFileEncoder*>(opaque)->buffer_free2(data);
-}
-
-
-void
-FFmpegFileEncoder::buffer_free2 (uint8_t* data)
-{
-	boost::mutex::scoped_lock lm (_pending_images_mutex);
-	auto iter = _pending_images.find(data);
-	if (iter != _pending_images.end()) {
-		iter->second.second--;
-		if (iter->second.second == 0) {
-			_pending_images.erase(data);
-		}
-	}
-}