Allow build with the Ubuntu 16.04 version of FFmpeg.

5 files changed, 48 insertions, 1 deletions

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 296002c74..656142cd4 100644
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -280,10 +280,17 @@ FFmpeg::subtitle_id (AVSubtitle const & sub)
 		digester.add (rect->y);
 		digester.add (rect->w);
 		digester.add (rect->h);
+#ifdef DCPOMATIC_HAVE_AVSUBTITLERECT_PICT
+		int const line = rect->pict.linesize[0];
+		for (int j = 0; j < rect->h; ++j) {
+			digester.add (rect->pict.data[0] + j * line, line);
+		}
+#else
 		int const line = rect->linesize[0];
 		for (int j = 0; j < rect->h; ++j) {
 			digester.add (rect->data[0] + j * line, line);
 		}
+#endif
 	}
 	return digester.get ();
 }
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index e5e1f04ac..698078b5b 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -495,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.
 	*/
@@ -531,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);
 	}
 
diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 648660478..2b8b2b743 100644
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -249,6 +249,19 @@ FFmpegExaminer::subtitle_packet (AVCodecContext* context, shared_ptr<FFmpegSubti
 
 		for (unsigned int i = 0; i < sub.num_rects; ++i) {
 			if (sub.rects[i]->type == SUBTITLE_BITMAP) {
+#ifdef DCPOMATIC_HAVE_AVSUBTITLERECT_PICT
+				uint32_t* palette = (uint32_t *) sub.rects[i]->pict.data[1];
+				for (int j = 0; j < sub.rects[i]->nb_colors; ++j) {
+					RGBA rgba  (
+						(palette[j] & 0x00ff0000) >> 16,
+						(palette[j] & 0x0000ff00) >> 8,
+						(palette[j] & 0x000000ff) >> 0,
+						(palette[j] & 0xff000000) >> 24
+						);
+
+					stream->set_colour (rgba, rgba);
+				}
+#else
 				uint32_t* palette = (uint32_t *) sub.rects[i]->data[1];
 				for (int j = 0; j < sub.rects[i]->nb_colors; ++j) {
 					RGBA rgba  (
@@ -260,6 +273,7 @@ FFmpegExaminer::subtitle_packet (AVCodecContext* context, shared_ptr<FFmpegSubti
 
 					stream->set_colour (rgba, rgba);
 				}
+#endif
 			}
 		}
 
diff --git a/src/lib/image.cc b/src/lib/image.cc
index 7ccb9906e..49cb20a61 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -581,6 +581,18 @@ Image::bytes_per_pixel (int c) const
 
 	float bpp[4] = { 0, 0, 0, 0 };
 
+#ifdef DCPOMATIC_HAVE_AVCOMPONENTDESCRIPTOR_DEPTH_MINUS1
+	bpp[0] = floor ((d->comp[0].depth_minus1 + 8) / 8);
+	if (d->nb_components > 1) {
+		bpp[1] = floor ((d->comp[1].depth_minus1 + 8) / 8) / pow (2.0f, d->log2_chroma_w);
+	}
+	if (d->nb_components > 2) {
+		bpp[2] = floor ((d->comp[2].depth_minus1 + 8) / 8) / pow (2.0f, d->log2_chroma_w);
+	}
+	if (d->nb_components > 3) {
+		bpp[3] = floor ((d->comp[3].depth_minus1 + 8) / 8) / pow (2.0f, d->log2_chroma_w);
+	}
+#else
 	bpp[0] = floor ((d->comp[0].depth + 7) / 8);
 	if (d->nb_components > 1) {
 		bpp[1] = floor ((d->comp[1].depth + 7) / 8) / pow (2.0f, d->log2_chroma_w);
@@ -591,6 +603,7 @@ Image::bytes_per_pixel (int c) const
 	if (d->nb_components > 3) {
 		bpp[3] = floor ((d->comp[3].depth + 7) / 8) / pow (2.0f, d->log2_chroma_w);
 	}
+#endif
 
 	if ((d->flags & AV_PIX_FMT_FLAG_PLANAR) == 0) {
 		/* Not planar; sum them up */
diff --git a/src/lib/wscript b/src/lib/wscript
index 8dd241a4d..d6d85af49 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -154,7 +154,7 @@ def build(bld):
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
                  SNDFILE SAMPLERATE POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
-                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU PATCHED_FFMPEG
+                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU
                  """
 
     if bld.env.TARGET_OSX: