Support bold in DCP subtitles.

diff --git a/ChangeLog b/ChangeLog
index f480037979606a406df79456d10850ae9f83feed..1ca32fb156c39e8594714f0eda8f75dcfa77bae2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-04-05  Carl Hetherington  <cth@carlh.net>
+
+       * Support bold in DCP subtitles.
+
 2016-04-04  Carl Hetherington  <cth@carlh.net>
 
        * Fix failure to keep italic etc. going across

diff --git a/cscript b/cscript
index a1671ee60027d36eb9e003ce5ebe180f07c3c7a8..55b62a2486b2a33acaebd224ae2db2b33186d867 100644 (file)
--- a/cscript
+++ b/cscript
@@ -262,7 +262,7 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', 'f2952f3', ffmpeg_options),
-            ('libdcp', 'bc70899'),
+            ('libdcp', '42f74b7'),
             ('libsub', 'b9fb00d'))
 
 def configure_options(target):

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 8f97cb2c16a3f17b5d3b56841b9dfecb5f94efd5..bfc3b6132ba6e667bece3f388d8d58640cfd061f 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -584,6 +584,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,

diff --git a/src/lib/text_subtitle_decoder.cc b/src/lib/text_subtitle_decoder.cc
index 893fd5d3c3099cd1277a9c64a2b609aa93d44056..b40f830688099b56fb92eaf14d9ee7e3c47112b1 100644 (file)
--- a/src/lib/text_subtitle_decoder.cc
+++ b/src/lib/text_subtitle_decoder.cc
@@ -79,6 +79,7 @@ TextSubtitleDecoder::pass (PassReason, bool)
                                dcp::SubtitleString (
                                        TextSubtitleContent::font_id,
                                        j.italic,
+                                       j.bold,
                                        /* force the colour to whatever is configured */
                                        content->colour(),
                                        j.font_size.points (72 * 11),