Bump libdcp.

[libsub.git] / src / stl_binary_reader.cc

diff --git a/src/stl_binary_reader.cc b/src/stl_binary_reader.cc
index e8e88328a479c8be1ef4f7e5a6b2af199ba82dca..35091f083cfbcddebcbdcb12af77595a7289d35f 100644 (file)
--- a/src/stl_binary_reader.cc
+++ b/src/stl_binary_reader.cc
@@ -36,7 +36,7 @@ using boost::lexical_cast;
 using boost::algorithm::replace_all;
 using boost::is_any_of;
 using boost::locale::conv::utf_to_utf;
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace sub;
 
 namespace sub {
@@ -187,6 +187,7 @@ void STLBinaryReader::read (shared_ptr<InputReader> reader)
        editor_name = reader->get_string(309, 32);
        editor_contact_details = reader->get_string(341, 32);
 
+       int highest_line = 0;
        for (int i = 0; i < tti_blocks; ++i) {
 
                reader->read (128, "TTI");
@@ -207,14 +208,15 @@ void STLBinaryReader::read (shared_ptr<InputReader> reader)
                bool italic = false;
                bool underline = false;
 
-               for (size_t i = 0; i < lines.size(); ++i) {
+               for (size_t j = 0; j < lines.size(); ++j) {
                        RawSubtitle sub;
                        sub.from = reader->get_timecode(5, frame_rate);
                        sub.to = reader->get_timecode(9, frame_rate);
-                        /* XXX: only the verticial position of the first TTI block should be used (says the spec),
-                           so using reader->get_int(13, 1) here is wrong if i > 0
-                         */
-                       sub.vertical_position.line = reader->get_int(13, 1) + i;
+                       /* XXX: vertical position of TTI extension blocks should be ignored (spec page 10) so this
+                        * is wrong if the EBN of this TTI block is not 255 (I think).
+                        */
+                       sub.vertical_position.line = reader->get_int(13, 1) + j;
+                       highest_line = std::max(highest_line, *sub.vertical_position.line);
                        sub.vertical_position.lines = maximum_rows;
                        sub.vertical_position.reference = TOP_OF_SCREEN;
                        sub.italic = italic;
@@ -237,9 +239,9 @@ void STLBinaryReader::read (shared_ptr<InputReader> reader)
 
                        /* Loop over characters */
                        string text;
-                       for (size_t j = 0; j < lines[i].size(); ++j) {
+                       for (size_t k = 0; k < lines[j].size(); ++k) {
 
-                               unsigned char const c = static_cast<unsigned char> (lines[i][j]);
+                               unsigned char const c = static_cast<unsigned char> (lines[j][k]);
 
                                if (c == 0x8f) {
                                        /* Unused space i.e. end of line */
@@ -267,7 +269,7 @@ void STLBinaryReader::read (shared_ptr<InputReader> reader)
                                        underline = false;
                                        break;
                                default:
-                                       text += lines[i][j];
+                                       text += lines[j][k];
                                        break;
                                }
 
@@ -283,6 +285,14 @@ void STLBinaryReader::read (shared_ptr<InputReader> reader)
                        /* XXX: justification */
                }
        }
+
+       /* Fix line numbers so they don't go off the bottom of the screen */
+       if (highest_line > maximum_rows) {
+               int correction = highest_line - maximum_rows;
+               for (auto& i: _subs) {
+                       *i.vertical_position.line -= correction;
+               }
+       }
 }
 
 map<string, string>