X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.cc;h=77b608fa86b92a7c7734e9a0c1b835aa45c9d5bc;hp=cbde534c30608e97cdd1c673754a95ae6c32bf8b;hb=1679c3dc40262733f46dda9f4151367bf93f2b76;hpb=b68fb4c103b5580509070c7733d3ae7deb46c3ce

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index cbde534c3..77b608fa8 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -42,6 +42,7 @@
 #include "compose.hpp"
 #include "text_content.h"
 #include "audio_content.h"
+#include "frame_interval_checker.h"
 #include <dcp/subtitle_string.h>
 #include <sub/ssa_reader.h>
 #include <sub/subtitle.h>
@@ -126,7 +127,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;
@@ -314,6 +315,7 @@ FFmpegDecoder::deinterleave_audio (shared_ptr<FFmpegAudioStream> stream) const
 	case AV_SAMPLE_FMT_FLTP:
 	{
 		float** p = reinterpret_cast<float**> (_frame->data);
+		DCPOMATIC_ASSERT (_frame->channels <= channels);
 		/* Sometimes there aren't as many channels in the _frame as in the stream */
 		for (int i = 0; i < _frame->channels; ++i) {
 			memcpy (data[i], p[i], frames * sizeof(float));
@@ -364,6 +366,7 @@ FFmpegDecoder::seek (ContentTime time, bool accurate)
 	if (_video_stream) {
 		stream = _video_stream;
 	} else {
+		DCPOMATIC_ASSERT (_ffmpeg_content->audio);
 		shared_ptr<FFmpegAudioStream> s = dynamic_pointer_cast<FFmpegAudioStream> (_ffmpeg_content->audio->stream ());
 		if (s) {
 			stream = s->index (_format_context);
@@ -630,18 +633,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;
@@ -652,25 +655,28 @@ 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 target_width = subtitle_codec_context()->width;