X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_file_encoder.cc;h=307a30aca340227cc9ec2ed5246aec8c162f73d1;hp=f253c73a0d9b69d6c7d29f41dbf87eb8e3aa8a10;hb=1c57df596882f15403ee97d01862f8b76cfb797b;hpb=037b18b34e3e3fd9b9e692d85f35de17ab67aff8

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index f253c73a0..307a30aca 100644
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -19,16 +19,19 @@
 */
 
 
+#include "compose.hpp"
+#include "cross.h"
 #include "ffmpeg_encoder.h"
 #include "ffmpeg_wrapper.h"
 #include "film.h"
+#include "image.h"
 #include "job.h"
+#include "log.h"
 #include "player.h"
 #include "player_video.h"
-#include "log.h"
-#include "image.h"
-#include "cross.h"
-#include "compose.hpp"
+extern "C" {
+#include <libavutil/channel_layout.h>
+}
 #include <iostream>
 
 #include "i18n.h"
@@ -36,13 +39,9 @@
 
 using std::cout;
 using std::make_shared;
-using std::pair;
-using std::runtime_error;
 using std::shared_ptr;
 using std::string;
-using std::weak_ptr;
 using boost::bind;
-using boost::optional;
 using namespace dcpomatic;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
@@ -128,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);
@@ -170,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;
 		}
@@ -203,7 +201,7 @@ public:
 
 private:
 	AVFormatContext* _format_context;
-	AVCodec* _codec;
+	AVCodec const * _codec;
 	AVCodecContext* _codec_context;
 	AVStream* _stream;
 	int _stream_index;
@@ -230,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";
@@ -243,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);
 	}
@@ -273,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);
 }
 
 
@@ -289,10 +288,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);
@@ -401,9 +401,8 @@ 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,
-		true,
 		false
 		);