X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fffmpeg_decoder.cc;h=698078b5b4339eae552aa67d249d24d24bd82d9d;hb=e5eec6c5e7b96cc6e7697bbf42d3f27546c5ad52;hp=72845a133eb0b11be7a5cfc307e0d0d5ef4addd4;hpb=2acb65ac1502de08c9398f97ca41ecbf9d2243f0;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 72845a133..698078b5b 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -218,6 +218,17 @@ FFmpegDecoder::deinterleave_audio (shared_ptr<FFmpegAudioStream> stream) const
 	}
 	break;
 
+	case AV_SAMPLE_FMT_S32P:
+	{
+		int32_t** p = reinterpret_cast<int32_t **> (_frame->data);
+		for (int i = 0; i < stream->channels(); ++i) {
+			for (int j = 0; j < frames; ++j) {
+				audio->data(i)[j] = static_cast<float>(p[i][j]) / (1 << 31);
+			}
+		}
+	}
+	break;
+
 	case AV_SAMPLE_FMT_FLT:
 	{
 		float* p = reinterpret_cast<float*> (_frame->data[0]);
@@ -484,12 +495,21 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimeP
 	*/
 	shared_ptr<Image> image (new Image (AV_PIX_FMT_RGBA, dcp::Size (rect->w, rect->h), true));
 
+#ifdef DCPOMATIC_HAVE_AVSUBTITLERECT_PICT
+	/* Start of the first line in the subtitle */
+	uint8_t* sub_p = rect->pict.data[0];
+	/* sub_p looks up into a BGRA palette which is here
+	   (i.e. first byte B, second G, third R, fourth A)
+	*/
+	uint32_t const * palette = (uint32_t *) rect->pict.data[1];
+#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)
 	*/
 	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.
 	*/
@@ -520,7 +540,11 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimeP
 			/* XXX: this seems to be wrong to me (isn't the output image RGBA?) but it looks right on screen */
 			*out_line_p++ = (p.a << 24) | (p.r << 16) | (p.g << 8) | p.b;
 		}
+#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);
 	}
 
@@ -573,6 +597,7 @@ FFmpegDecoder::decode_ass_subtitle (string ass, ContentTimePeriod period)
 					dcp::SubtitleString (
 						boost::optional<string> (),
 						k.italic,
+						k.bold,
 						dcp::Colour (255, 255, 255),
 						/* 48pt is 1/22nd of the screen height */
 						48,
@@ -586,6 +611,7 @@ FFmpegDecoder::decode_ass_subtitle (string ass, ContentTimePeriod period)
 						*/
 						1.015 - ((1 + highest - j.vertical_position.line.get()) * 1.5 / 22),
 						dcp::VALIGN_TOP,
+						dcp::DIRECTION_LTR,
 						k.text,
 						static_cast<dcp::Effect> (0),
 						dcp::Colour (255, 255, 255),