X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.cc;h=fd248c39a67a0b319a3ddc0cb910ad2bc3d02920;hb=c259c459f5d326e7c42806b41de06c71ad4a3ad8;hp=3d9e965a9d169ad3e66a014cb3cb4e0d7a750c1b;hpb=ad1ef39eda58b3a919ea3b7084401a0439409ec6;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 3d9e965a9..fd248c39a 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -126,7 +126,7 @@ FFmpegDecoder::flush ()
 	if (video) {
 		double const vfr = _ffmpeg_content->video_frame_rate().get();
 		Frame const f = full_length.frames_round (vfr);
-		Frame v = video->position(film()).frames_round(vfr) + 1;
+		Frame v = video->position(film()).get_value_or(ContentTime()).frames_round(vfr) + 1;
 		while (v < f) {
 			video->emit (film(), shared_ptr<const ImageProxy> (new RawImageProxy (_black_image)), v);
 			++v;
@@ -377,6 +377,14 @@ FFmpegDecoder::seek (ContentTime time, bool accurate)
 		AVSEEK_FLAG_BACKWARD
 		);
 
+	{
+		/* Force re-creation of filter graphs to reset them and hence to make sure
+		   they don't have any pre-seek frames knocking about.
+		*/
+		boost::mutex::scoped_lock lm (_filter_graphs_mutex);
+		_filter_graphs.clear ();
+	}
+
 	if (video_codec_context ()) {
 		avcodec_flush_buffers (video_codec_context());
 	}
@@ -616,18 +624,18 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTime
 #else
 	/* Start of the first line in the subtitle */
 	uint8_t* sub_p = rect->data[0];
-	/* sub_p looks up into a BGRA palette which is here
-	   (i.e. first byte B, second G, third R, fourth A)
+	/* sub_p looks up into a BGRA palette which is at rect->data[1].
+	   (first byte B, second G, third R, fourth A)
 	*/
-	uint32_t const * palette = (uint32_t *) rect->data[1];
 #endif
 	/* And the stream has a map of those palette colours to colours
 	   chosen by the user; created a `mapped' palette from those settings.
 	*/
 	map<RGBA, RGBA> colour_map = ffmpeg_content()->subtitle_stream()->colours ();
 	vector<RGBA> mapped_palette (rect->nb_colors);
+	uint8_t const * palette = rect->data[1];
 	for (int i = 0; i < rect->nb_colors; ++i) {
-		RGBA c ((palette[i] & 0xff0000) >> 16, (palette[i] & 0xff00) >> 8, palette[i] & 0xff, (palette[i] & 0xff000000) >> 24);
+		RGBA c (palette[2], palette[1], palette[0], palette[3]);
 		map<RGBA, RGBA>::const_iterator j = colour_map.find (c);
 		if (j != colour_map.end ()) {
 			mapped_palette[i] = j->second;
@@ -638,29 +646,43 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTime
 			*/
 			mapped_palette[i] = c;
 		}
+		palette += 4;
 	}
 
 	/* Start of the output data */
-	uint32_t* out_p = (uint32_t *) image->data()[0];
+	uint8_t* out_p = image->data()[0];
 
 	for (int y = 0; y < rect->h; ++y) {
 		uint8_t* sub_line_p = sub_p;
-		uint32_t* out_line_p = out_p;
+		uint8_t* out_line_p = out_p;
 		for (int x = 0; x < rect->w; ++x) {
 			RGBA const p = mapped_palette[*sub_line_p++];
-			/* XXX: this seems to be wrong to me (isn't the output image BGRA?) but it looks right on screen */
-			*out_line_p++ = (p.a << 24) | (p.b << 16) | (p.g << 8) | p.r;
+			*out_line_p++ = p.b;
+			*out_line_p++ = p.g;
+			*out_line_p++ = p.r;
+			*out_line_p++ = p.a;
 		}
 #ifdef DCPOMATIC_HAVE_AVSUBTITLERECT_PICT
 		sub_p += rect->pict.linesize[0];
 #else
 		sub_p += rect->linesize[0];
 #endif
-		out_p += image->stride()[0] / sizeof (uint32_t);
+		out_p += image->stride()[0];
 	}
 
-	int const target_width = subtitle_codec_context()->width;
-	int const target_height = subtitle_codec_context()->height;
+	int target_width = subtitle_codec_context()->width;
+	if (target_width == 0 && video_codec_context()) {
+		/* subtitle_codec_context()->width == 0 has been seen in the wild but I don't
+		   know if it's supposed to mean something from FFmpeg's point of view.
+		*/
+		target_width = video_codec_context()->width;
+	}
+	int target_height = subtitle_codec_context()->height;
+	if (target_height == 0 && video_codec_context()) {
+		target_height = video_codec_context()->height;
+	}
+	DCPOMATIC_ASSERT (target_width);
+	DCPOMATIC_ASSERT (target_height);
 	dcpomatic::Rect<double> const scaled_rect (
 		static_cast<double> (rect->x) / target_width,
 		static_cast<double> (rect->y) / target_height,