From 9726a58f44d52d235b027225ddd68c6acf83c733 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 6 Jul 2022 12:25:15 +0200 Subject: Handle vertical alignment of subs correctly wrt the difference between Interop and SMPTE. --- src/lib/dcp_subtitle_decoder.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/lib/dcp_subtitle_decoder.cc') diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc index 08c2bf7ec..cbfe6fdbe 100644 --- a/src/lib/dcp_subtitle_decoder.cc +++ b/src/lib/dcp_subtitle_decoder.cc @@ -46,6 +46,12 @@ DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr film, shared_ptr< _subtitles = asset->subtitles (); _next = _subtitles.begin (); + if (dynamic_pointer_cast(asset)) { + _standard = dcp::Standard::INTEROP; + } else { + _standard = dcp::Standard::SMPTE; + } + text.push_back (make_shared(this, content->only_text())); update_position(); } @@ -102,7 +108,7 @@ DCPSubtitleDecoder::pass () } } - only_text()->emit_plain (p, s); + only_text()->emit_plain(p, s, _standard); update_position(); -- cgit v1.2.3