X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.cc;h=e90c33c80a848bca3c3faecbd7032c1df72d0526;hb=985a83ffbf251db481150221914ef74fbfe549b2;hp=dd47d306a6e54c0611e0abde6b6ab802cab4e77b;hpb=1f82930e73679d6aec5223caa255f564339a1a2a;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index dd47d306a..e90c33c80 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -23,7 +23,6 @@
 
 #include <stdexcept>
 #include <vector>
-#include <sstream>
 #include <iomanip>
 #include <iostream>
 #include <stdint.h>
@@ -51,12 +50,12 @@ extern "C" {
 
 #define LOG_GENERAL(...) _video_content->film()->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
 #define LOG_ERROR(...) _video_content->film()->log()->log (String::compose (__VA_ARGS__), Log::TYPE_ERROR);
-#define LOG_WARNING(...) _video_content->film()->log()->log (__VA_ARGS__, Log::TYPE_WARNING);
+#define LOG_WARNING_NC(...) _video_content->film()->log()->log (__VA_ARGS__, Log::TYPE_WARNING);
+#define LOG_WARNING(...) _video_content->film()->log()->log (String::compose (__VA_ARGS__), Log::TYPE_WARNING);
 
 using std::cout;
 using std::string;
 using std::vector;
-using std::stringstream;
 using std::list;
 using std::min;
 using std::pair;
@@ -296,10 +295,11 @@ FFmpegDecoder::seek (ContentTime time, bool accurate)
 
 	ContentTime pre_roll = accurate ? ContentTime::from_seconds (2) : ContentTime (0);
 	time -= pre_roll;
-	if (time < ContentTime (0)) {
-		time = ContentTime (0);
-	}
 
+	/* XXX: it seems debatable whether PTS should be used here...
+	   http://www.mjbshaw.com/2012/04/seeking-in-ffmpeg-know-your-timestamp.html
+	*/
+	
 	ContentTime const u = time - _pts_offset;
 	int64_t s = u.seconds() / av_q2d (_format_context->streams[_video_stream]->time_base);
 
@@ -309,12 +309,6 @@ FFmpegDecoder::seek (ContentTime time, bool accurate)
 			);
 	}
 
-	/* Ridiculous empirical hack */
-	s--;
-	if (s < 0) {
-		s = 0;
-	}
-
 	av_seek_frame (_format_context, _video_stream, s, 0);
 
 	avcodec_flush_buffers (video_codec_context());
@@ -338,11 +332,21 @@ FFmpegDecoder::decode_audio_packet ()
 	while (copy_packet.size > 0) {
 
 		int frame_finished;
-		int const decode_result = avcodec_decode_audio4 (audio_codec_context(), _frame, &frame_finished, &copy_packet);
-
+		int decode_result = avcodec_decode_audio4 (audio_codec_context(), _frame, &frame_finished, &copy_packet);
 		if (decode_result < 0) {
-			LOG_ERROR ("avcodec_decode_audio4 failed (%1)", decode_result);
-			return;
+			/* avcodec_decode_audio4 can sometimes return an error even though it has decoded
+			   some valid data; for example dca_subframe_footer can return AVERROR_INVALIDDATA
+			   if it overreads the auxiliary data.  ffplay carries on if frame_finished is true,
+			   even in the face of such an error, so I think we should too.
+
+			   Returning from the method here caused mantis #352.
+			*/
+			LOG_WARNING ("avcodec_decode_audio4 failed (%1)", decode_result);
+
+			/* Fudge decode_result so that we come out of the while loop when
+			   we've processed this data.
+			*/
+			decode_result = copy_packet.size;
 		}
 
 		if (frame_finished) {
@@ -397,11 +401,11 @@ FFmpegDecoder::decode_video_packet ()
 		if (i->second != AV_NOPTS_VALUE) {
 			double const pts = i->second * av_q2d (_format_context->streams[_video_stream]->time_base) + _pts_offset.seconds ();
 			video (
-				shared_ptr<ImageProxy> (new RawImageProxy (image, _video_content->film()->log())),
+				shared_ptr<ImageProxy> (new RawImageProxy (image)),
 				rint (pts * _ffmpeg_content->video_frame_rate ())
 				);
 		} else {
-			LOG_WARNING ("Dropping frame without PTS");
+			LOG_WARNING_NC ("Dropping frame without PTS");
 		}
 	}