X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_image_proxy.cc;h=54fb1c46837012485d3a93dbdd37ae3e71ceeecc;hp=5e3b725cf3c100580d29d31cbf0b006f4fdea2fd;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hpb=e5ae44fe8287c6a5f91c8f9dfced7cb661f0d79b

diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc
index 5e3b725cf..54fb1c468 100644
--- a/src/lib/ffmpeg_image_proxy.cc
+++ b/src/lib/ffmpeg_image_proxy.cc
@@ -18,57 +18,58 @@
 
 */
 
-#include "ffmpeg_image_proxy.h"
+
+#include "compose.hpp"
 #include "cross.h"
-#include "exceptions.h"
 #include "dcpomatic_socket.h"
+#include "exceptions.h"
+#include "ffmpeg_image_proxy.h"
 #include "image.h"
-#include "compose.hpp"
 #include "util.h"
 #include "warnings.h"
 #include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libavutil/pixdesc.h>
 }
-DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
 DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 #include "i18n.h"
 
-using std::string;
+
 using std::cout;
-using std::pair;
-using std::min;
 using std::make_pair;
+using std::make_shared;
+using std::min;
+using std::pair;
 using std::shared_ptr;
+using std::string;
 using boost::optional;
 using std::dynamic_pointer_cast;
 using dcp::raw_convert;
 
-FFmpegImageProxy::FFmpegImageProxy (boost::filesystem::path path, VideoRange video_range)
+
+FFmpegImageProxy::FFmpegImageProxy (boost::filesystem::path path)
 	: _data (path)
-	, _video_range (video_range)
 	, _pos (0)
 	, _path (path)
 {
 
 }
 
-FFmpegImageProxy::FFmpegImageProxy (dcp::ArrayData data, VideoRange video_range)
+FFmpegImageProxy::FFmpegImageProxy (dcp::ArrayData data)
 	: _data (data)
-	, _video_range (video_range)
 	, _pos (0)
 {
 
 }
 
-FFmpegImageProxy::FFmpegImageProxy (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket)
-	: _video_range (string_to_video_range(node->string_child("VideoRange")))
-	, _pos (0)
+FFmpegImageProxy::FFmpegImageProxy (shared_ptr<Socket> socket)
+	: _pos (0)
 {
 	uint32_t const size = socket->read_uint32 ();
 	_data = dcp::ArrayData (size);
@@ -119,7 +120,6 @@ FFmpegImageProxy::avio_seek (int64_t const pos, int whence)
 	return _pos;
 }
 
-DCPOMATIC_DISABLE_WARNINGS
 
 ImageProxy::Result
 FFmpegImageProxy::image (optional<dcp::Size>) const
@@ -166,7 +166,7 @@ FFmpegImageProxy::image (optional<dcp::Size>) const
 
 	int r = avformat_find_stream_info(format_context, 0);
 	if (r < 0) {
-		throw DecodeError (N_("avcodec_find_stream_info"), name_for_errors, r);
+		throw DecodeError (N_("avcodec_find_stream_info"), name_for_errors, r, *_path);
 	}
 
 	DCPOMATIC_ASSERT (format_context->nb_streams == 1);
@@ -176,40 +176,40 @@ FFmpegImageProxy::image (optional<dcp::Size>) const
 		std::bad_alloc ();
 	}
 
-	AVCodecContext* codec_context = format_context->streams[0]->codec;
-	AVCodec* codec = avcodec_find_decoder (codec_context->codec_id);
+	auto codec = avcodec_find_decoder (format_context->streams[0]->codecpar->codec_id);
 	DCPOMATIC_ASSERT (codec);
 
-	r = avcodec_open2 (codec_context, codec, 0);
+	auto context = avcodec_alloc_context3 (codec);
+	if (!context) {
+		throw DecodeError (N_("avcodec_alloc_context3"), name_for_errors, *_path);
+	}
+
+	r = avcodec_open2 (context, codec, 0);
 	if (r < 0) {
-		throw DecodeError (N_("avcodec_open2"), name_for_errors, r);
+		throw DecodeError (N_("avcodec_open2"), name_for_errors, r, *_path);
 	}
 
 	AVPacket packet;
 	r = av_read_frame (format_context, &packet);
 	if (r < 0) {
-		throw DecodeError (N_("av_read_frame"), name_for_errors, r);
+		throw DecodeError (N_("av_read_frame"), name_for_errors, r, *_path);
 	}
 
-	int frame_finished;
-	if (avcodec_decode_video2(codec_context, frame, &frame_finished, &packet) < 0 || !frame_finished) {
-		throw DecodeError (N_("avcodec_decode_video2"), name_for_errors, r);
+	r = avcodec_send_packet (context, &packet);
+	if (r < 0) {
+		throw DecodeError (N_("avcodec_send_packet"), name_for_errors, r, *_path);
 	}
 
-	AVPixelFormat const pix_fmt = static_cast<AVPixelFormat>(frame->format);
-
-	_image.reset (new Image(frame));
-	if (_video_range == VideoRange::VIDEO && av_pix_fmt_desc_get(pix_fmt)->flags & AV_PIX_FMT_FLAG_RGB) {
-		/* Asking for the video range to be converted by libswscale (in Image) will not work for
-		 * RGB sources since that method only processes video range in YUV and greyscale.  So we have
-		 * to do it ourselves here.
-		 */
-		_image->video_range_to_full_range();
+	r = avcodec_receive_frame (context, frame);
+	if (r < 0) {
+		throw DecodeError (N_("avcodec_receive_frame"), name_for_errors, r, *_path);
 	}
 
+	_image = make_shared<Image>(frame);
+
 	av_packet_unref (&packet);
 	av_frame_free (&frame);
-	avcodec_close (codec_context);
+	avcodec_free_context (&context);
 	avformat_close_input (&format_context);
 	av_free (avio_context->buffer);
 	av_free (avio_context);
@@ -217,13 +217,11 @@ FFmpegImageProxy::image (optional<dcp::Size>) const
 	return Result (_image, 0);
 }
 
-DCPOMATIC_ENABLE_WARNINGS
 
 void
 FFmpegImageProxy::add_metadata (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text (N_("FFmpeg"));
-	node->add_child("VideoRange")->add_child_text(video_range_to_string(_video_range));
 }
 
 void
@@ -236,7 +234,7 @@ FFmpegImageProxy::write_to_socket (shared_ptr<Socket> socket) const
 bool
 FFmpegImageProxy::same (shared_ptr<const ImageProxy> other) const
 {
-	shared_ptr<const FFmpegImageProxy> mp = dynamic_pointer_cast<const FFmpegImageProxy> (other);
+	auto mp = dynamic_pointer_cast<const FFmpegImageProxy>(other);
 	if (!mp) {
 		return false;
 	}