Build with FFmpeg 4.4 and switch to the new send/receive APIs.

1 files changed, 25 insertions, 22 deletions

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index eb131d434..d476b4c29 100644
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -68,11 +68,9 @@ FFmpeg::~FFmpeg ()
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
-DCPOMATIC_DISABLE_WARNINGS
-	for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
-		avcodec_close (_format_context->streams[i]->codec);
+	for (auto& i: _codec_context) {
+		avcodec_free_context (&i);
 	}
-DCPOMATIC_ENABLE_WARNINGS
 
 	av_frame_free (&_frame);
 	avformat_close_input (&_format_context);
@@ -143,10 +141,9 @@ FFmpeg::setup_general ()
 
 	optional<int> video_stream_undefined_frame_rate;
 
-DCPOMATIC_DISABLE_WARNINGS
 	for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
 		auto s = _format_context->streams[i];
-		if (s->codec->codec_type == AVMEDIA_TYPE_VIDEO && avcodec_find_decoder(s->codec->codec_id)) {
+		if (s->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && avcodec_find_decoder(s->codecpar->codec_id)) {
 			if (s->avg_frame_rate.num > 0 && s->avg_frame_rate.den > 0) {
 				/* This is definitely our video stream */
 				_video_stream = i;
@@ -156,7 +153,6 @@ DCPOMATIC_DISABLE_WARNINGS
 			}
 		}
 	}
-DCPOMATIC_ENABLE_WARNINGS
 
 	/* Files from iTunes sometimes have two video streams, one with the avg_frame_rate.num and .den set
 	   to zero.  Only use such a stream if there is no alternative.
@@ -194,7 +190,7 @@ DCPOMATIC_ENABLE_WARNINGS
 
 	_frame = av_frame_alloc ();
 	if (_frame == 0) {
-		throw DecodeError (N_("could not allocate frame"));
+		throw std::bad_alloc ();
 	}
 }
 
@@ -204,15 +200,23 @@ FFmpeg::setup_decoders ()
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
-DCPOMATIC_DISABLE_WARNINGS
+	_codec_context.resize (_format_context->nb_streams);
 	for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
-		auto context = _format_context->streams[i]->codec;
+		auto codec = avcodec_find_decoder (_format_context->streams[i]->codecpar->codec_id);
+		if (codec) {
+			auto context = avcodec_alloc_context3 (codec);
+			if (!context) {
+				throw std::bad_alloc ();
+			}
+			_codec_context[i] = context;
 
-		context->thread_count = 8;
-		context->thread_type = FF_THREAD_FRAME | FF_THREAD_SLICE;
+			int r = avcodec_parameters_to_context (context, _format_context->streams[i]->codecpar);
+			if (r < 0) {
+				throw DecodeError ("avcodec_parameters_to_context", "FFmpeg::setup_decoders", r);
+			}
 
-		AVCodec* codec = avcodec_find_decoder (context->codec_id);
-		if (codec) {
+			context->thread_count = 8;
+			context->thread_type = FF_THREAD_FRAME | FF_THREAD_SLICE;
 
 			AVDictionary* options = nullptr;
 			/* This option disables decoding of DCA frame footers in our patched version
@@ -227,18 +231,17 @@ DCPOMATIC_DISABLE_WARNINGS
 			/* Enable following of links in files */
 			av_dict_set_int (&options, "enable_drefs", 1, 0);
 
-			if (avcodec_open2 (context, codec, &options) < 0) {
-				throw DecodeError (N_("could not open decoder"));
+			r = avcodec_open2 (context, codec, &options);
+			if (r < 0) {
+				throw DecodeError (N_("avcodec_open2"), N_("FFmpeg::setup_decoders"), r);
 			}
 		} else {
 			dcpomatic_log->log (String::compose ("No codec found for stream %1", i), LogEntry::TYPE_WARNING);
 		}
 	}
-DCPOMATIC_ENABLE_WARNINGS
 }
 
 
-DCPOMATIC_DISABLE_WARNINGS
 AVCodecContext *
 FFmpeg::video_codec_context () const
 {
@@ -246,20 +249,20 @@ FFmpeg::video_codec_context () const
 		return nullptr;
 	}
 
-	return _format_context->streams[_video_stream.get()]->codec;
+	return _codec_context[_video_stream.get()];
 }
 
 
 AVCodecContext *
 FFmpeg::subtitle_codec_context () const
 {
-	if (!_ffmpeg_content->subtitle_stream()) {
+	auto str = _ffmpeg_content->subtitle_stream();
+	if (!str) {
 		return nullptr;
 	}
 
-	return _ffmpeg_content->subtitle_stream()->stream(_format_context)->codec;
+	return _codec_context[str->index(_format_context)];
 }
-DCPOMATIC_ENABLE_WARNINGS
 
 
 int