X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_file_encoder.cc;h=6799d09b4b6b66a306774a9f511bbe6341726f12;hb=d3ecb8495a42d039b07313e393734c49fdc6be66;hp=ef02f30c8f1ab17863f17e59de62131310f18caa;hpb=3799e91d126d243d41c44dcb0ca1bfa66b53a57e;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index ef02f30c8..6799d09b4 100644
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -127,14 +127,15 @@ public:
 		return false;
 	}
 
-	void write (int size, int channel_offset, int channels, float** data, int64_t sample_offset)
+	void write (int size, int channel_offset, int channels, float* const* data, int64_t sample_offset)
 	{
 		DCPOMATIC_ASSERT (size);
 
 		auto frame = av_frame_alloc ();
 		DCPOMATIC_ASSERT (frame);
 
-		int const buffer_size = av_samples_get_buffer_size (0, channels, size, _codec_context->sample_fmt, 0);
+		int line_size;
+		int const buffer_size = av_samples_get_buffer_size (&line_size, channels, size, _codec_context->sample_fmt, 0);
 		DCPOMATIC_ASSERT (buffer_size >= 0);
 
 		auto samples = av_malloc (buffer_size);
@@ -169,10 +170,8 @@ public:
 		}
 		case AV_SAMPLE_FMT_FLTP:
 		{
-			float* q = reinterpret_cast<float*> (samples);
 			for (int i = 0; i < channels; ++i) {
-				memcpy (q, data[i + channel_offset], sizeof(float) * size);
-				q += size;
+				memcpy (reinterpret_cast<float*>(static_cast<uint8_t*>(samples) + i * line_size), data[i + channel_offset], sizeof(float) * size);
 			}
 			break;
 		}
@@ -229,7 +228,14 @@ FFmpegFileEncoder::FFmpegFileEncoder (
 	_pixel_format = pixel_format (format);
 
 	switch (format) {
-	case ExportFormat::PRORES:
+	case ExportFormat::PRORES_4444:
+		_sample_format = AV_SAMPLE_FMT_S16;
+		_video_codec_name = "prores_ks";
+		_audio_codec_name = "pcm_s16le";
+		av_dict_set(&_video_options, "profile", "4", 0);
+		av_dict_set(&_video_options, "threads", "auto", 0);
+		break;
+	case ExportFormat::PRORES_HQ:
 		_sample_format = AV_SAMPLE_FMT_S16;
 		_video_codec_name = "prores_ks";
 		_audio_codec_name = "pcm_s16le";
@@ -242,12 +248,6 @@ FFmpegFileEncoder::FFmpegFileEncoder (
 		_audio_codec_name = "aac";
 		av_dict_set_int (&_video_options, "crf", x264_crf, 0);
 		break;
-	case ExportFormat::H264_PCM:
-		_sample_format = AV_SAMPLE_FMT_S32;
-		_video_codec_name = "libx264";
-		_audio_codec_name = "pcm_s24le";
-		av_dict_set_int (&_video_options, "crf", x264_crf, 0);
-		break;
 	default:
 		DCPOMATIC_ASSERT (false);
 	}
@@ -272,7 +272,7 @@ FFmpegFileEncoder::FFmpegFileEncoder (
 		throw EncodeError (N_("avformat_write_header"), N_("FFmpegFileEncoder::FFmpegFileEncoder"), r);
 	}
 
-	_pending_audio.reset (new AudioBuffers(channels, 0));
+	_pending_audio = make_shared<AudioBuffers>(channels, 0);
 }
 
 
@@ -280,6 +280,7 @@ FFmpegFileEncoder::~FFmpegFileEncoder ()
 {
 	_audio_streams.clear ();
 	avcodec_close (_video_codec_context);
+	avio_close (_format_context->pb);
 	avformat_free_context (_format_context);
 }
 
@@ -288,10 +289,11 @@ AVPixelFormat
 FFmpegFileEncoder::pixel_format (ExportFormat format)
 {
 	switch (format) {
-	case ExportFormat::PRORES:
+	case ExportFormat::PRORES_4444:
+		return AV_PIX_FMT_YUV444P10;
+	case ExportFormat::PRORES_HQ:
 		return AV_PIX_FMT_YUV422P10;
 	case ExportFormat::H264_AAC:
-	case ExportFormat::H264_PCM:
 		return AV_PIX_FMT_YUV420P;
 	default:
 		DCPOMATIC_ASSERT (false);
@@ -323,7 +325,7 @@ FFmpegFileEncoder::setup_video ()
 	_video_codec_context->flags |= AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_GLOBAL_HEADER;
 
 	if (avcodec_open2 (_video_codec_context, _video_codec, &_video_options) < 0) {
-		throw EncodeError (N_("avcodec_open"), N_("FFmpegFileEncoder::setup_video"));
+		throw EncodeError(N_("avcodec_open2"), N_("FFmpegFileEncoder::setup_video"));
 	}
 
 	_video_stream = avformat_new_stream (_format_context, _video_codec);
@@ -400,22 +402,16 @@ FFmpegFileEncoder::video (shared_ptr<PlayerVideo> video, DCPTime time)
 {
 	/* All our output formats are video range at the moment */
 	auto image = video->image (
-		bind (&PlayerVideo::force, _1, _pixel_format),
+		bind (&PlayerVideo::force, _pixel_format),
 		VideoRange::VIDEO,
-		Image::Alignment::PADDED,
 		false
 		);
 
 	auto frame = av_frame_alloc ();
 	DCPOMATIC_ASSERT (frame);
 
-	{
-		boost::mutex::scoped_lock lm (_pending_images_mutex);
-		_pending_images[image->data()[0]] = image;
-	}
-
 	for (int i = 0; i < 3; ++i) {
-		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];
@@ -489,20 +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);
-	if (_pending_images.find(data) != _pending_images.end()) {
-		_pending_images.erase (data);
-	}
-}