X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_image_proxy.cc;h=db6059266dc472e13b8908a67f5baf0b2a800618;hb=83416808c0b1ca732e7a186d3811f1ec796fea08;hp=46c9836e060d781b1a5083184f052b053812ae08;hpb=dceecebd37d5e1b5c098ad1358310d3f276c703c;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc
index 46c9836e0..db6059266 100644
--- a/src/lib/ffmpeg_image_proxy.cc
+++ b/src/lib/ffmpeg_image_proxy.cc
@@ -112,13 +112,14 @@ FFmpegImageProxy::avio_seek (int64_t const pos, int whence)
 	return _pos;
 }
 
-pair<shared_ptr<Image>, int>
+
+ImageProxy::Result
 FFmpegImageProxy::image (optional<dcp::Size>) const
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
 	if (_image) {
-		return make_pair (_image, 0);
+		return Result (_image, 0);
 	}
 
 	uint8_t* avio_buffer = static_cast<uint8_t*> (wrapped_av_malloc(4096));
@@ -134,8 +135,23 @@ FFmpegImageProxy::image (optional<dcp::Size>) const
 	av_dict_set (&options, "probesize", raw_convert<string>(5 * 60 * 1000000).c_str(), 0);
 
 	int e = avformat_open_input (&format_context, 0, 0, &options);
+	if ((e < 0 && e == AVERROR_INVALIDDATA) || (e >= 0 && format_context->probe_score <= 25)) {
+		/* Hack to fix loading of .tga files through AVIOContexts (rather then
+		   directly from the file).  This code just does enough to allow the
+		   probe code to take a hint from "foo.tga" and so try targa format.
+		*/
+		AVInputFormat* f = av_find_input_format ("image2");
+		format_context = avformat_alloc_context ();
+		format_context->pb = avio_context;
+		format_context->iformat = f;
+		e = avformat_open_input (&format_context, "foo.tga", f, &options);
+	}
 	if (e < 0) {
-		throw OpenFileError (_path->string(), e, true);
+		if (_path) {
+			throw OpenFileError (_path->string(), e, OpenFileError::READ);
+		} else {
+			boost::throw_exception(DecodeError(String::compose(_("Could not decode image (%1)"), e)));
+		}
 	}
 
 	if (avformat_find_stream_info(format_context, 0) < 0) {
@@ -177,7 +193,7 @@ FFmpegImageProxy::image (optional<dcp::Size>) const
 	av_free (avio_context->buffer);
 	av_free (avio_context);
 
-	return make_pair (_image, 0);
+	return Result (_image, 0);
 }
 
 void
@@ -187,7 +203,7 @@ FFmpegImageProxy::add_metadata (xmlpp::Node* node) const
 }
 
 void
-FFmpegImageProxy::send_binary (shared_ptr<Socket> socket) const
+FFmpegImageProxy::write_to_socket (shared_ptr<Socket> socket) const
 {
 	socket->write (_data.size());
 	socket->write (_data.data().get(), _data.size());