Bump libdcp for subtitle Z-position fixes (#2356).
authorCarl Hetherington <cth@carlh.net>
Wed, 2 Nov 2022 21:39:49 +0000 (22:39 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 3 Nov 2022 08:33:46 +0000 (09:33 +0100)
cscript
src/lib/reel_writer.cc
src/lib/text_decoder.cc
test/render_subtitles_test.cc

diff --git a/cscript b/cscript
index f0f0d3fbf78a3e82c2279e3c0e45d56b4b21f5e9..ea99aaf1de2bd0e4ce126ac5a58bda085b610d67 100644 (file)
--- a/cscript
+++ b/cscript
@@ -451,8 +451,8 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.32'))
-    deps.append(('libsub', 'v1.6.35'))
+    deps.append(('libdcp', 'v1.8.33'))
+    deps.append(('libsub', 'v1.6.36'))
     deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
index 4227a45fd01979c5de34dfe6473acc9c79c2a993..f9e29a16f4c15537358f68398b09c8f11b8fdea7 100644 (file)
@@ -871,6 +871,7 @@ ReelWriter::empty_text_asset (TextType type, optional<DCPTextTrack> track, bool
                                        dcp::HAlign::CENTER,
                                        0.5,
                                        dcp::VAlign::CENTER,
+                                       0,
                                        dcp::Direction::LTR,
                                        " ",
                                        dcp::Effect::NONE,
@@ -940,7 +941,7 @@ ReelWriter::write (PlayerText subs, TextType type, optional<DCPTextTrack> track,
                                image_as_png(i.image),
                                dcp::Time(period.from.seconds() - _period.from.seconds(), tcr),
                                dcp::Time(period.to.seconds() - _period.from.seconds(), tcr),
-                               i.rectangle.x, dcp::HAlign::LEFT, i.rectangle.y, dcp::VAlign::TOP,
+                               i.rectangle.x, dcp::HAlign::LEFT, i.rectangle.y, dcp::VAlign::TOP, 0,
                                dcp::Time(), dcp::Time()
                                )
                        );
index fa5ed6c7a1025b441010e625bbdffa83e60f2ac8..4b521ede75449ff2e2cb7df792e8190f2cf9b806 100644 (file)
@@ -255,6 +255,7 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subti
                                h_align,
                                v_position,
                                v_align,
+                               0,
                                dcp::Direction::LTR,
                                escape_text(block.text),
                                dcp::Effect::NONE,
index 282c9311f7e24ef6a10bc8ee4419814f7422bc38..e5de60c4ec64f719c32eb53fa2a7f4bd1b6d3447 100644 (file)
@@ -55,6 +55,7 @@ add (std::list<StringText>& s, std::string text, bool italic, bool bold, bool un
                                dcp::HAlign::LEFT,
                                1,
                                dcp::VAlign::TOP,
+                               0,
                                dcp::Direction::LTR,
                                text,
                                dcp::Effect::NONE,