X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.cc;h=a0965dcfb81a917eef2e0ba46b1223d536f35cc6;hb=9518d2a417833b530d2ef00c33179b27bcfa41da;hp=164785c8368bb0fbffea1a28d468247df4eadf47;hpb=0cb31de2be2b51a8bc19e55ceb1b86dc26ea1c42;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 164785c83..a0965dcfb 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -40,6 +40,7 @@
 #include "audio_decoder.h"
 #include "compose.hpp"
 #include "subtitle_content.h"
+#include "audio_content.h"
 #include <dcp/subtitle_string.h>
 #include <sub/ssa_reader.h>
 #include <sub/subtitle.h>
@@ -73,6 +74,8 @@ using std::map;
 using boost::shared_ptr;
 using boost::is_any_of;
 using boost::split;
+using boost::optional;
+using boost::dynamic_pointer_cast;
 using dcp::Size;
 
 FFmpegDecoder::FFmpegDecoder (shared_ptr<const FFmpegContent> c, shared_ptr<Log> log)
@@ -134,7 +137,7 @@ FFmpegDecoder::pass (PassReason reason, bool accurate)
 			/* Maybe we should fail here, but for now we'll just finish off instead */
 			char buf[256];
 			av_strerror (r, buf, sizeof(buf));
-			LOG_ERROR (N_("error on av_read_frame (%1) (%2)"), buf, r);
+			LOG_ERROR (N_("error on av_read_frame (%1) (%2)"), &buf[0], r);
 		}
 
 		flush ();
@@ -326,7 +329,18 @@ FFmpegDecoder::seek (ContentTime time, bool accurate)
 	   http://www.mjbshaw.com/2012/04/seeking-in-ffmpeg-know-your-timestamp.html
 	*/
 
-	DCPOMATIC_ASSERT (_video_stream);
+	optional<int> stream;
+
+	if (_video_stream) {
+		stream = _video_stream;
+	} else {
+		shared_ptr<FFmpegAudioStream> s = dynamic_pointer_cast<FFmpegAudioStream> (_ffmpeg_content->audio->stream ());
+		if (s) {
+			stream = s->index (_format_context);
+		}
+	}
+
+	DCPOMATIC_ASSERT (stream);
 
 	ContentTime u = time - _pts_offset;
 	if (u < ContentTime ()) {
@@ -334,12 +348,14 @@ FFmpegDecoder::seek (ContentTime time, bool accurate)
 	}
 	av_seek_frame (
 		_format_context,
-		_video_stream.get(),
-		u.seconds() / av_q2d (_format_context->streams[_video_stream.get()]->time_base),
+		stream.get(),
+		u.seconds() / av_q2d (_format_context->streams[stream.get()]->time_base),
 		AVSEEK_FLAG_BACKWARD
 		);
 
-	avcodec_flush_buffers (video_codec_context());
+	if (video_codec_context ()) {
+		avcodec_flush_buffers (video_codec_context());
+	}
 
 	/* XXX: should be flushing audio buffers? */
 
@@ -376,7 +392,7 @@ FFmpegDecoder::decode_audio_packet ()
 		if (decode_result < 0) {
 			/* 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,
+			   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.
@@ -405,7 +421,8 @@ FFmpegDecoder::decode_audio_packet ()
 				ct += ContentTime::from_frames (remove, (*stream)->frame_rate ());
 			}
 
-			if (data->frames() > 0) {
+			/* Give this data provided there is some, and its time is sane */
+			if (ct >= ContentTime() && data->frames() > 0) {
 				audio->give (*stream, data, ct);
 			}
 		}