summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-04-05 01:30:20 +0100
committerCarl Hetherington <cth@carlh.net>2016-04-05 01:30:20 +0100
commitc15274495f5a4dc9806b01d4abefee698044ae49 (patch)
treeee4c770350b3bf441a972d72b799fdc44954835c
parente1824c96a4210e040e4f53651bb035096ad94783 (diff)
Support bold in DCP subtitles.
-rw-r--r--ChangeLog4
-rw-r--r--cscript2
-rw-r--r--src/lib/ffmpeg_decoder.cc1
-rw-r--r--src/lib/text_subtitle_decoder.cc1
4 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f48003797..1ca32fb15 100644
--- 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 a1671ee60..55b62a248 100644
--- 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 8f97cb2c1..bfc3b6132 100644
--- 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 893fd5d3c..b40f83068 100644
--- 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),