Separate out STL binary tables so that writer can use them; start of writer.
authorCarl Hetherington <cth@carlh.net>
Thu, 29 May 2014 13:20:17 +0000 (14:20 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 29 May 2014 13:20:17 +0000 (14:20 +0100)
run/tests
src/stl_binary_reader.cc
src/stl_binary_reader.h
src/stl_binary_tables.cc [new file with mode: 0644]
src/stl_binary_tables.h [new file with mode: 0644]
src/stl_binary_writer.cc
src/stl_binary_writer.h
src/time_pair.h [new file with mode: 0644]
src/wscript
test/stl_binary_writer_test.cc [new file with mode: 0644]
test/wscript

index 6858a3437fe1fda14e4b6b6e029212b70ba783a4..09e58806c9e827b95898d1f9d92bfbd8922a2a9c 100755 (executable)
--- a/run/tests
+++ b/run/tests
@@ -1,4 +1,14 @@
 #!/bin/bash -e
 
+private=../libsub-test-private
+
 export LD_LIBRARY_PATH=build/src
-build/test/tests ../libsub-test-private $*
+if [ "$1" == "--debug" ]; then
+    shift
+    gdb --args build/test/tests $private $*
+elif [ "$1" == "--valgrind" ]; then
+    shift
+    valgrind --tool="memcheck" build/test/tests $private $*
+else
+    build/test/tests $private $*
+fi
index ebcee1bd07e2de72a088c80dab3b34cded9aba42..b0701b5e8e898664abe33aa3dd9d47f8c9a6411a 100644 (file)
@@ -36,49 +36,14 @@ using boost::is_any_of;
 using boost::locale::conv::utf_to_utf;
 using namespace sub;
 
-template <class E, class F>
-E
-file_to_enum (F k, map<F, STLCode<E> > m, string name)
-{
-       typename map<F, STLCode<E> >::const_iterator i = m.find (k);
-       if (i == m.end ()) {
-               throw STLError (String::compose ("Unknown %1 %2 in binary STL file", name, k));
-       }
-
-       return i->second.value;
-}
-
-template <class E, class F>
-string
-enum_to_description (E v, map<F, STLCode<E> > const & m)
-{
-       for (typename map<F, STLCode<E> >::const_iterator i = m.begin(); i != m.end(); ++i) {
-               if (i->second.value == v) {
-                       return i->second.description;
-               }
-       }
-
-       return "";
-}
-
-template <class E, class F>
-void
-code (map<F, STLCode<E> >& m, F k, E v, string d)
-{
-       m[k] = STLCode<E> (v, d);
-}
-
-
 STLBinaryReader::STLBinaryReader (istream& in)
        : _buffer (new unsigned char[1024])
 {
-       create_tables ();
-       
        in.read ((char *) _buffer, 1024);
        if (in.gcount() != 1024) {
                throw STLError ("Could not read GSI block from binary STL file");
        }
-               
+
        code_page_number = atoi (get_string (0, 3).c_str ());
        
        string const dfc = get_string (3, 8);
@@ -92,9 +57,9 @@ STLBinaryReader::STLBinaryReader (istream& in)
                throw STLError (String::compose ("Unknown disk format code %1 in binary STL file", dfc));
        }
 
-       display_standard = file_to_enum (get_string (11, 1), _display_standard_map, "display standard code");
-       language_group = file_to_enum (get_string (12, 2), _language_group_map, "character code");
-       language = file_to_enum (get_string (14, 2), _language_map, "language code");
+       display_standard = _tables.display_standard_file_to_enum (get_string (11, 1));
+       language_group = _tables.language_group_file_to_enum (get_string (12, 2));
+       language = _tables.language_file_to_enum (get_string (14, 2));
        original_programme_title = get_string (16, 32);
        original_episode_title = get_string (48, 32);
        translated_programme_title = get_string (80, 32);
@@ -111,7 +76,7 @@ STLBinaryReader::STLBinaryReader (istream& in)
        subtitle_groups = atoi (get_string (248, 3).c_str ());
        maximum_characters = atoi (get_string (251, 2).c_str ());
        maximum_rows = atoi (get_string (253, 2).c_str ());
-       timecode_status = file_to_enum (get_string (255, 1), _timecode_status_map, "timecode status code");
+       timecode_status = _tables.timecode_status_file_to_enum (get_string (255, 1));
        start_of_programme = get_string (256, 8);
        first_in_cue = get_string (256, 8);
        disks = atoi (get_string (272, 1).c_str ());
@@ -128,7 +93,7 @@ STLBinaryReader::STLBinaryReader (istream& in)
                        throw STLError ("Could not read TTI block from binary STL file");
                }
 
-               if (file_to_enum (get_int (15, 1), _comment_map, "comment flag") == COMMENT_YES) {
+               if (_tables.comment_file_to_enum (get_int (15, 1)) == COMMENT_YES) {
                        continue;
                }
 
@@ -201,9 +166,9 @@ STLBinaryReader::metadata () const
 
        m["Code page number"] = lexical_cast<string> (code_page_number);
        m["Frame rate"] = lexical_cast<string> (frame_rate);
-       m["Display standard"] = enum_to_description (display_standard, _display_standard_map);
-       m["Language group"] = enum_to_description (language_group, _language_group_map);
-       m["Language"] = enum_to_description (language, _language_map);
+       m["Display standard"] = _tables.display_standard_enum_to_description (display_standard);
+       m["Language group"] = _tables.language_group_enum_to_description (language_group);
+       m["Language"] = _tables.language_enum_to_description (language);
        m["Original programme title"] = original_programme_title;
        m["Original episode title"] = original_episode_title;
        m["Translated programme title"] = translated_programme_title;
@@ -219,7 +184,7 @@ STLBinaryReader::metadata () const
        m["Subtitle groups"] = lexical_cast<string> (subtitle_groups);
        m["Maximum characters"] = lexical_cast<string> (maximum_characters);
        m["Maximum rows"] = lexical_cast<string> (maximum_rows);
-       m["Timecode status"] = enum_to_description (timecode_status, _timecode_status_map);
+       m["Timecode status"] = _tables.timecode_status_enum_to_description (timecode_status);
        m["Start of programme"] = start_of_programme;
        m["First in cue"] = first_in_cue;
        m["Disks"] = lexical_cast<string> (disks);
@@ -231,138 +196,3 @@ STLBinaryReader::metadata () const
 
        return m;
 }
-
-void
-STLBinaryReader::create_tables ()
-{
-       code<DisplayStandard, string> (_display_standard_map, " ", DISPLAY_STANDARD_UNDEFINED, "Undefined");
-       code<DisplayStandard, string> (_display_standard_map, "0", DISPLAY_STANDARD_OPEN_SUBTITLING, "Open subtitling");
-       code<DisplayStandard, string> (_display_standard_map, "1", DISPLAY_STANDARD_LEVEL_1_TELETEXT, "Level 1 teletext");
-       code<DisplayStandard, string> (_display_standard_map, "2", DISPLAY_STANDARD_LEVEL_2_TELETEXT, "Level 2 teletext");
-       
-       code<LanguageGroup, string> (_language_group_map, "00", LANGUAGE_GROUP_LATIN, "Latin");
-       code<LanguageGroup, string> (_language_group_map, "01", LANGUAGE_GROUP_LATIN_CYRILLIC, "Latin/Cyrillic");
-       code<LanguageGroup, string> (_language_group_map, "02", LANGUAGE_GROUP_LATIN_ARABIC, "Latin/Arabic");
-       code<LanguageGroup, string> (_language_group_map, "03", LANGUAGE_GROUP_LATIN_GREEK, "Latin/Greek");
-       code<LanguageGroup, string> (_language_group_map, "04", LANGUAGE_GROUP_LATIN_HEBREW, "Latin/Hebrew");
-       
-       code<Language, string> (_language_map, "00", LANGUAGE_UNKNOWN, "Unknown");
-       code<Language, string> (_language_map, "01", LANGUAGE_ALBANIAN, "Albanian");
-       code<Language, string> (_language_map, "02", LANGUAGE_BRETON, "Breton");
-       code<Language, string> (_language_map, "03", LANGUAGE_CATALAN, "Catalan");
-       code<Language, string> (_language_map, "04", LANGUAGE_CROATIAN, "Croatian");
-       code<Language, string> (_language_map, "05", LANGUAGE_WELSH, "Welsh");
-       code<Language, string> (_language_map, "06", LANGUAGE_CZECH, "Czech");
-       code<Language, string> (_language_map, "07", LANGUAGE_DANISH, "Danish");
-       code<Language, string> (_language_map, "08", LANGUAGE_GERMAN, "German");
-       code<Language, string> (_language_map, "09", LANGUAGE_ENGLISH, "English");
-       code<Language, string> (_language_map, "0A", LANGUAGE_SPANISH, "Spanish");
-       code<Language, string> (_language_map, "0B", LANGUAGE_ESPERANTO, "Esperanto");
-       code<Language, string> (_language_map, "0C", LANGUAGE_ESTONIAN, "Estonian");
-       code<Language, string> (_language_map, "0D", LANGUAGE_BASQUE, "Basque");
-       code<Language, string> (_language_map, "0E", LANGUAGE_FAROESE, "Faroese");
-       code<Language, string> (_language_map, "0F", LANGUAGE_FRENCH, "French");
-       code<Language, string> (_language_map, "10", LANGUAGE_FRISIAN, "Frisian");
-       code<Language, string> (_language_map, "11", LANGUAGE_IRISH, "Irish");
-       code<Language, string> (_language_map, "12", LANGUAGE_GAELIC, "Gaelic");
-       code<Language, string> (_language_map, "13", LANGUAGE_GALACIAN, "Galacian");
-       code<Language, string> (_language_map, "14", LANGUAGE_ICELANDIC, "Icelandic");
-       code<Language, string> (_language_map, "15", LANGUAGE_ITALIAN, "Italian");
-       code<Language, string> (_language_map, "16", LANGUAGE_LAPPISH, "Lappish");
-       code<Language, string> (_language_map, "17", LANGUAGE_LATIN, "Latin");
-       code<Language, string> (_language_map, "18", LANGUAGE_LATVIAN, "Latvian");
-       code<Language, string> (_language_map, "19", LANGUAGE_LUXEMBORGIAN, "Luxemborgian");
-       code<Language, string> (_language_map, "1A", LANGUAGE_LITHUANIAN, "Lithuanian");
-       code<Language, string> (_language_map, "1B", LANGUAGE_HUNGARIAN, "Hungarian");
-       code<Language, string> (_language_map, "1C", LANGUAGE_MALTESE, "Maltese");
-       code<Language, string> (_language_map, "1D", LANGUAGE_DUTCH, "Dutch");
-       code<Language, string> (_language_map, "1E", LANGUAGE_NORWEGIAN, "Norwegian");
-       code<Language, string> (_language_map, "1F", LANGUAGE_OCCITAN, "Occitan");
-       code<Language, string> (_language_map, "20", LANGUAGE_POLISH, "Polish");
-       code<Language, string> (_language_map, "21", LANGUAGE_PORTUGESE, "Portugese");
-       code<Language, string> (_language_map, "22", LANGUAGE_ROMANIAN, "Romanian");
-       code<Language, string> (_language_map, "23", LANGUAGE_ROMANSH, "Romansh");
-       code<Language, string> (_language_map, "24", LANGUAGE_SERBIAN, "Serbian");
-       code<Language, string> (_language_map, "25", LANGUAGE_SLOVAK, "Slovak");
-       code<Language, string> (_language_map, "26", LANGUAGE_SLOVENIAN, "Slovenian");
-       code<Language, string> (_language_map, "27", LANGUAGE_FINNISH, "Finnish");
-       code<Language, string> (_language_map, "28", LANGUAGE_SWEDISH, "Swedish");
-       code<Language, string> (_language_map, "29", LANGUAGE_TURKISH, "Turkish");
-       code<Language, string> (_language_map, "2A", LANGUAGE_FLEMISH, "Flemish");
-       code<Language, string> (_language_map, "2B", LANGUAGE_WALLON, "Wallon");
-       code<Language, string> (_language_map, "7F", LANGUAGE_AMHARIC, "Amharic");
-       code<Language, string> (_language_map, "7E", LANGUAGE_ARABIC, "Arabic");
-       code<Language, string> (_language_map, "7D", LANGUAGE_ARMENIAN, "Armenian");
-       code<Language, string> (_language_map, "7C", LANGUAGE_ASSAMESE, "Assamese");
-       code<Language, string> (_language_map, "7B", LANGUAGE_AZERBAIJANI, "Azerbaijani");
-       code<Language, string> (_language_map, "7A", LANGUAGE_BAMBORA, "Bambora");
-       code<Language, string> (_language_map, "79", LANGUAGE_BIELORUSSIAN, "Bielorussian");
-       code<Language, string> (_language_map, "78", LANGUAGE_BENGALI, "Bengali");
-       code<Language, string> (_language_map, "77", LANGUAGE_BULGARIAN, "Bulgarian");
-       code<Language, string> (_language_map, "76", LANGUAGE_BURMESE, "Burmese");
-       code<Language, string> (_language_map, "75", LANGUAGE_CHINESE, "Chinese");
-       code<Language, string> (_language_map, "74", LANGUAGE_CHURASH, "Churash");
-       code<Language, string> (_language_map, "73", LANGUAGE_DARI, "Dari");
-       code<Language, string> (_language_map, "72", LANGUAGE_FULANI, "Fulani");
-       code<Language, string> (_language_map, "71", LANGUAGE_GEORGIAN, "Georgian");
-       code<Language, string> (_language_map, "70", LANGUAGE_GREEK, "Greek");
-       code<Language, string> (_language_map, "6F", LANGUAGE_GUJURATI, "Gujarati");
-       code<Language, string> (_language_map, "6E", LANGUAGE_GURANI, "Gurani");
-       code<Language, string> (_language_map, "6D", LANGUAGE_HAUSA, "Hausa");
-       code<Language, string> (_language_map, "6C", LANGUAGE_HEBREW, "Hebrew");
-       code<Language, string> (_language_map, "6B", LANGUAGE_HINDI, "Hindi");
-       code<Language, string> (_language_map, "6A", LANGUAGE_INDONESIAN, "Indonesian");
-       code<Language, string> (_language_map, "69", LANGUAGE_JAPANESE, "Japanese");
-       code<Language, string> (_language_map, "68", LANGUAGE_KANNADA, "Kannada");
-       code<Language, string> (_language_map, "67", LANGUAGE_KAZAKH, "Kazakh");
-       code<Language, string> (_language_map, "66", LANGUAGE_KHMER, "Khmer");
-       code<Language, string> (_language_map, "65", LANGUAGE_KOREAN, "Korean");
-       code<Language, string> (_language_map, "64", LANGUAGE_LAOTIAN, "Laotian");
-       code<Language, string> (_language_map, "63", LANGUAGE_MACEDONIAN, "Macedonian");
-       code<Language, string> (_language_map, "62", LANGUAGE_MALAGASAY, "Malagasay");
-       code<Language, string> (_language_map, "61", LANGUAGE_MALAYSIAN, "Malaysian");
-       code<Language, string> (_language_map, "60", LANGUAGE_MOLDAVIAN, "Moldavian");
-       code<Language, string> (_language_map, "5F", LANGUAGE_MARATHI, "Marathi");
-       code<Language, string> (_language_map, "5E", LANGUAGE_NDEBELE, "Ndebele");
-       code<Language, string> (_language_map, "5D", LANGUAGE_NEPALI, "Nepali");
-       code<Language, string> (_language_map, "5C", LANGUAGE_ORIYA, "Oriya");
-       code<Language, string> (_language_map, "5B", LANGUAGE_PAPAMIENTO, "Papamiento");
-       code<Language, string> (_language_map, "5A", LANGUAGE_PERSIAN, "Persian");
-       code<Language, string> (_language_map, "59", LANGUAGE_PUNJABI, "Punjabi");
-       code<Language, string> (_language_map, "58", LANGUAGE_PUSHTU, "Pushtu");
-       code<Language, string> (_language_map, "57", LANGUAGE_QUECHUA, "Quechua");
-       code<Language, string> (_language_map, "56", LANGUAGE_RUSSIAN, "Russian");
-       code<Language, string> (_language_map, "55", LANGUAGE_RUTHENIAN, "Ruthenian");
-       code<Language, string> (_language_map, "54", LANGUAGE_SERBO_CROAT, "Serbo Croat");
-       code<Language, string> (_language_map, "53", LANGUAGE_SHONA, "Shona");
-       code<Language, string> (_language_map, "52", LANGUAGE_SINHALESE, "Sinhalese");
-       code<Language, string> (_language_map, "51", LANGUAGE_SOMALI, "Somali");
-       code<Language, string> (_language_map, "50", LANGUAGE_SRANAN_TONGO, "Sranan Tongo");
-       code<Language, string> (_language_map, "4F", LANGUAGE_SWAHILI, "Swahili");
-       code<Language, string> (_language_map, "4E", LANGUAGE_TADZHIK, "Tadzhik");
-       code<Language, string> (_language_map, "4D", LANGUAGE_TAMIL, "Tamil");
-       code<Language, string> (_language_map, "4C", LANGUAGE_TATAR, "Tatar");
-       code<Language, string> (_language_map, "4B", LANGUAGE_TELUGU, "Telugu");
-       code<Language, string> (_language_map, "4A", LANGUAGE_THAI, "Thai");
-       code<Language, string> (_language_map, "49", LANGUAGE_UKRANIAN, "Ukranian");
-       code<Language, string> (_language_map, "48", LANGUAGE_URDU, "Urdu");
-       code<Language, string> (_language_map, "47", LANGUAGE_UZBEK, "Uzbek");
-       code<Language, string> (_language_map, "46", LANGUAGE_VIETNAMESE, "Vietnamese");
-       code<Language, string> (_language_map, "45", LANGUAGE_ZULU, "Zulu");
-
-       code<TimecodeStatus, string> (_timecode_status_map, "0", TIMECODE_STATUS_NOT_INTENDED_FOR_USE, "Not intended for use");
-       code<TimecodeStatus, string> (_timecode_status_map, "1", TIMECODE_STATUS_INTENDED_FOR_USE, "Intended for use");
-
-       code<CumulativeStatus, int> (_cumulative_status_map, 0, CUMULATIVE_STATUS_NOT_CUMULATIVE, "Not part of a cumulative set");
-       code<CumulativeStatus, int> (_cumulative_status_map, 1, CUMULATIVE_STATUS_FIRST, "First subtitle of a cumulative set");
-       code<CumulativeStatus, int> (_cumulative_status_map, 2, CUMULATIVE_STATUS_INTERMEDIATE, "Intermediate subtitle of a cumulative set");
-       code<CumulativeStatus, int> (_cumulative_status_map, 3, CUMULATIVE_STATUS_LAST, "Last subtitle of a cumulative set");
-
-       code<Justification, int> (_justification_map, 0, JUSTIFICATION_NONE, "No justification");
-       code<Justification, int> (_justification_map, 1, JUSTIFICATION_LEFT, "Left justification");
-       code<Justification, int> (_justification_map, 2, JUSTIFICATION_CENTRE, "Centre justification");
-       code<Justification, int> (_justification_map, 3, JUSTIFICATION_CENTRE, "Right justification");
-
-       code<Comment, int> (_comment_map, 0, COMMENT_NO, "Not a comment");
-       code<Comment, int> (_comment_map, 1, COMMENT_YES, "Is a comment");
-}
index b049b93668a5afa43ba09e3f9624bbbcbd776808..0e3c7cf3f851eab7c24b1e5884f0b516fbdb8fa3 100644 (file)
 
 */
 
-#include <map>
 #include "reader.h"
+#include "stl_binary_tables.h"
+#include <map>
 
 namespace sub {
 
-template<class T>
-class STLCode
-{
-public:
-       STLCode ()
-               : value ((T) 0)
-       {}
-
-       STLCode (T v, std::string d)
-               : value (v)
-               , description (d)
-       {}
-       
-       T value;
-       std::string description;
-};
-
 class STLBinaryReader : public Reader
 {
 public:
@@ -47,151 +31,6 @@ public:
 
        std::map<std::string, std::string> metadata () const;
 
-       enum DisplayStandard {
-               DISPLAY_STANDARD_UNDEFINED,
-               DISPLAY_STANDARD_OPEN_SUBTITLING,
-               DISPLAY_STANDARD_LEVEL_1_TELETEXT,
-               DISPLAY_STANDARD_LEVEL_2_TELETEXT
-       };
-
-       enum LanguageGroup {
-               LANGUAGE_GROUP_LATIN,
-               LANGUAGE_GROUP_LATIN_CYRILLIC,
-               LANGUAGE_GROUP_LATIN_ARABIC,
-               LANGUAGE_GROUP_LATIN_GREEK,
-               LANGUAGE_GROUP_LATIN_HEBREW
-       };
-
-       enum Language {
-               LANGUAGE_UNKNOWN,
-               LANGUAGE_ALBANIAN,
-               LANGUAGE_BRETON,
-               LANGUAGE_CATALAN,
-               LANGUAGE_CROATIAN,
-               LANGUAGE_WELSH,
-               LANGUAGE_CZECH,
-               LANGUAGE_DANISH,
-               LANGUAGE_GERMAN,
-               LANGUAGE_ENGLISH,
-               LANGUAGE_SPANISH,
-               LANGUAGE_ESPERANTO,
-               LANGUAGE_ESTONIAN,
-               LANGUAGE_BASQUE,
-               LANGUAGE_FAROESE,
-               LANGUAGE_FRENCH,
-               LANGUAGE_FRISIAN,
-               LANGUAGE_IRISH,
-               LANGUAGE_GAELIC,
-               LANGUAGE_GALACIAN,
-               LANGUAGE_ICELANDIC,
-               LANGUAGE_ITALIAN,
-               LANGUAGE_LAPPISH,
-               LANGUAGE_LATIN,
-               LANGUAGE_LATVIAN,
-               LANGUAGE_LUXEMBORGIAN,
-               LANGUAGE_LITHUANIAN,
-               LANGUAGE_HUNGARIAN,
-               LANGUAGE_MALTESE,
-               LANGUAGE_DUTCH,
-               LANGUAGE_NORWEGIAN,
-               LANGUAGE_OCCITAN,
-               LANGUAGE_POLISH,
-               LANGUAGE_PORTUGESE,
-               LANGUAGE_ROMANIAN,
-               LANGUAGE_ROMANSH,
-               LANGUAGE_SERBIAN,
-               LANGUAGE_SLOVAK,
-               LANGUAGE_SLOVENIAN,
-               LANGUAGE_FINNISH,
-               LANGUAGE_SWEDISH,
-               LANGUAGE_TURKISH,
-               LANGUAGE_FLEMISH,
-               LANGUAGE_WALLON,
-               LANGUAGE_AMHARIC,
-               LANGUAGE_ARABIC,
-               LANGUAGE_ARMENIAN,
-               LANGUAGE_ASSAMESE,
-               LANGUAGE_AZERBAIJANI,
-               LANGUAGE_BAMBORA,
-               LANGUAGE_BIELORUSSIAN,
-               LANGUAGE_BENGALI,
-               LANGUAGE_BULGARIAN,
-               LANGUAGE_BURMESE,
-               LANGUAGE_CHINESE,
-               LANGUAGE_CHURASH,
-               LANGUAGE_DARI,
-               LANGUAGE_FULANI,
-               LANGUAGE_GEORGIAN,
-               LANGUAGE_GREEK,
-               LANGUAGE_GUJURATI,
-               LANGUAGE_GURANI,
-               LANGUAGE_HAUSA,
-               LANGUAGE_HEBREW,
-               LANGUAGE_HINDI,
-               LANGUAGE_INDONESIAN,
-               LANGUAGE_JAPANESE,
-               LANGUAGE_KANNADA,
-               LANGUAGE_KAZAKH,
-               LANGUAGE_KHMER,
-               LANGUAGE_KOREAN,
-               LANGUAGE_LAOTIAN,
-               LANGUAGE_MACEDONIAN,
-               LANGUAGE_MALAGASAY,
-               LANGUAGE_MALAYSIAN,
-               LANGUAGE_MOLDAVIAN,
-               LANGUAGE_MARATHI,
-               LANGUAGE_NDEBELE,
-               LANGUAGE_NEPALI,
-               LANGUAGE_ORIYA,
-               LANGUAGE_PAPAMIENTO,
-               LANGUAGE_PERSIAN,
-               LANGUAGE_PUNJABI,
-               LANGUAGE_PUSHTU,
-               LANGUAGE_QUECHUA,
-               LANGUAGE_RUSSIAN,
-               LANGUAGE_RUTHENIAN,
-               LANGUAGE_SERBO_CROAT,
-               LANGUAGE_SHONA,
-               LANGUAGE_SINHALESE,
-               LANGUAGE_SOMALI,
-               LANGUAGE_SRANAN_TONGO,
-               LANGUAGE_SWAHILI,
-               LANGUAGE_TADZHIK,
-               LANGUAGE_TAMIL,
-               LANGUAGE_TATAR,
-               LANGUAGE_TELUGU,
-               LANGUAGE_THAI,
-               LANGUAGE_UKRANIAN,
-               LANGUAGE_URDU,
-               LANGUAGE_UZBEK,
-               LANGUAGE_VIETNAMESE,
-               LANGUAGE_ZULU
-       };
-
-       enum TimecodeStatus {
-               TIMECODE_STATUS_NOT_INTENDED_FOR_USE,
-               TIMECODE_STATUS_INTENDED_FOR_USE
-       };
-
-       enum CumulativeStatus {
-               CUMULATIVE_STATUS_NOT_CUMULATIVE,
-               CUMULATIVE_STATUS_FIRST,
-               CUMULATIVE_STATUS_INTERMEDIATE,
-               CUMULATIVE_STATUS_LAST
-       };
-
-       enum Justification {
-               JUSTIFICATION_NONE,
-               JUSTIFICATION_LEFT,
-               JUSTIFICATION_CENTRE,
-               JUSTIFICATION_RIGHT
-       };
-
-       enum Comment {
-               COMMENT_NO,
-               COMMENT_YES
-       };
-
        int code_page_number;
        int frame_rate;
        DisplayStandard display_standard;
@@ -226,17 +65,8 @@ private:
        std::string get_string (int, int) const;
        int get_int (int, int) const;
        FrameTime get_timecode (int) const;
-       
-       void create_tables ();
-       
-       std::map<std::string, STLCode<DisplayStandard> > _display_standard_map;
-       std::map<std::string, STLCode<LanguageGroup> > _language_group_map;
-       std::map<std::string, STLCode<Language> > _language_map;
-       std::map<std::string, STLCode<TimecodeStatus> > _timecode_status_map;
-       std::map<int, STLCode<CumulativeStatus> > _cumulative_status_map;
-       std::map<int, STLCode<Justification> > _justification_map;
-       std::map<int, STLCode<Comment> > _comment_map;
 
+       STLBinaryTables _tables;
        unsigned char* _buffer;
 };
 
diff --git a/src/stl_binary_tables.cc b/src/stl_binary_tables.cc
new file mode 100644 (file)
index 0000000..664921d
--- /dev/null
@@ -0,0 +1,298 @@
+/*
+    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "stl_binary_tables.h"
+#include "exceptions.h"
+#include "compose.hpp"
+#include <cassert>
+
+using std::map;
+using std::string;
+using namespace sub;
+
+template <class E, class F>
+void
+code (map<F, STLBinaryCode<E> >& m, F k, E v, string d)
+{
+       m[k] = STLBinaryCode<E> (v, d);
+}
+
+
+template <class E, class F>
+E
+file_to_enum (F k, map<F, STLBinaryCode<E> > m, string name)
+{
+       typename map<F, STLBinaryCode<E> >::const_iterator i = m.find (k);
+       if (i == m.end ()) {
+               throw STLError (String::compose ("Unknown %1 %2 in binary STL file", name, k));
+       }
+
+       return i->second.value;
+}
+
+template <class E, class F>
+F
+enum_to_file (E k, map<F, STLBinaryCode<E> > m)
+{
+       for (typename map<F, STLBinaryCode<E> >::const_iterator i = m.begin(); i != m.end(); ++i) {
+               if (i->second.value == k) {
+                       return i->first;
+               }
+       }
+
+       assert (false);
+       return F ();
+}
+
+template <class E, class F>
+string
+enum_to_description (E v, map<F, STLBinaryCode<E> > const & m)
+{
+       for (typename map<F, STLBinaryCode<E> >::const_iterator i = m.begin(); i != m.end(); ++i) {
+               if (i->second.value == v) {
+                       return i->second.description;
+               }
+       }
+
+       return "";
+}
+             
+DisplayStandard
+STLBinaryTables::display_standard_file_to_enum (string s) const
+{
+       return file_to_enum (s, _display_standard_map, "display standard code");
+}
+
+LanguageGroup
+STLBinaryTables::language_group_file_to_enum (string s) const
+{
+       return file_to_enum (s, _language_group_map, "language group code");
+}
+
+Language
+STLBinaryTables::language_file_to_enum (string s) const
+{
+       return file_to_enum (s, _language_map, "language code");
+}
+
+TimecodeStatus
+STLBinaryTables::timecode_status_file_to_enum (string s) const
+{
+       return file_to_enum (s, _timecode_status_map, "timecode status code");
+}
+
+CumulativeStatus
+STLBinaryTables::cumulative_status_file_to_enum (int s) const
+{
+       return file_to_enum (s, _cumulative_status_map, "cumulative status code");
+}
+
+Justification
+STLBinaryTables::justification_file_to_enum (int s) const
+{
+       return file_to_enum (s, _justification_map, "justification code");
+}
+
+Comment
+STLBinaryTables::comment_file_to_enum (int s) const
+{
+       return file_to_enum (s, _comment_map, "comment code");
+}
+
+string
+STLBinaryTables::language_enum_to_file (Language e) const
+{
+       return enum_to_file (e, _language_map);
+}
+
+string
+STLBinaryTables::display_standard_enum_to_description (DisplayStandard v) const
+{
+       return enum_to_description (v, _display_standard_map);
+}
+       
+string
+STLBinaryTables::language_group_enum_to_description (LanguageGroup v) const
+{
+       return enum_to_description (v, _language_group_map);
+}
+
+string
+STLBinaryTables::language_enum_to_description (Language v) const
+{
+       return enum_to_description (v, _language_map);
+}
+
+string
+STLBinaryTables::timecode_status_enum_to_description (TimecodeStatus v) const
+{
+       return enum_to_description (v, _timecode_status_map);
+}
+
+string
+STLBinaryTables::cumulative_status_enum_to_description (CumulativeStatus v) const
+{
+       return enum_to_description (v, _cumulative_status_map);
+}
+
+string
+STLBinaryTables::justification_enum_to_description (Justification v) const
+{
+       return enum_to_description (v, _justification_map);
+}
+
+string
+STLBinaryTables::comment_enum_to_description (Comment v) const
+{
+       return enum_to_description (v, _comment_map);
+}
+             
+STLBinaryTables::STLBinaryTables ()
+{
+       code<DisplayStandard, string> (_display_standard_map, " ", DISPLAY_STANDARD_UNDEFINED, "Undefined");
+       code<DisplayStandard, string> (_display_standard_map, "0", DISPLAY_STANDARD_OPEN_SUBTITLING, "Open subtitling");
+       code<DisplayStandard, string> (_display_standard_map, "1", DISPLAY_STANDARD_LEVEL_1_TELETEXT, "Level 1 teletext");
+       code<DisplayStandard, string> (_display_standard_map, "2", DISPLAY_STANDARD_LEVEL_2_TELETEXT, "Level 2 teletext");
+       
+       code<LanguageGroup, string> (_language_group_map, "00", LANGUAGE_GROUP_LATIN, "Latin");
+       code<LanguageGroup, string> (_language_group_map, "01", LANGUAGE_GROUP_LATIN_CYRILLIC, "Latin/Cyrillic");
+       code<LanguageGroup, string> (_language_group_map, "02", LANGUAGE_GROUP_LATIN_ARABIC, "Latin/Arabic");
+       code<LanguageGroup, string> (_language_group_map, "03", LANGUAGE_GROUP_LATIN_GREEK, "Latin/Greek");
+       code<LanguageGroup, string> (_language_group_map, "04", LANGUAGE_GROUP_LATIN_HEBREW, "Latin/Hebrew");
+       
+       code<Language, string> (_language_map, "00", LANGUAGE_UNKNOWN, "Unknown");
+       code<Language, string> (_language_map, "01", LANGUAGE_ALBANIAN, "Albanian");
+       code<Language, string> (_language_map, "02", LANGUAGE_BRETON, "Breton");
+       code<Language, string> (_language_map, "03", LANGUAGE_CATALAN, "Catalan");
+       code<Language, string> (_language_map, "04", LANGUAGE_CROATIAN, "Croatian");
+       code<Language, string> (_language_map, "05", LANGUAGE_WELSH, "Welsh");
+       code<Language, string> (_language_map, "06", LANGUAGE_CZECH, "Czech");
+       code<Language, string> (_language_map, "07", LANGUAGE_DANISH, "Danish");
+       code<Language, string> (_language_map, "08", LANGUAGE_GERMAN, "German");
+       code<Language, string> (_language_map, "09", LANGUAGE_ENGLISH, "English");
+       code<Language, string> (_language_map, "0A", LANGUAGE_SPANISH, "Spanish");
+       code<Language, string> (_language_map, "0B", LANGUAGE_ESPERANTO, "Esperanto");
+       code<Language, string> (_language_map, "0C", LANGUAGE_ESTONIAN, "Estonian");
+       code<Language, string> (_language_map, "0D", LANGUAGE_BASQUE, "Basque");
+       code<Language, string> (_language_map, "0E", LANGUAGE_FAROESE, "Faroese");
+       code<Language, string> (_language_map, "0F", LANGUAGE_FRENCH, "French");
+       code<Language, string> (_language_map, "10", LANGUAGE_FRISIAN, "Frisian");
+       code<Language, string> (_language_map, "11", LANGUAGE_IRISH, "Irish");
+       code<Language, string> (_language_map, "12", LANGUAGE_GAELIC, "Gaelic");
+       code<Language, string> (_language_map, "13", LANGUAGE_GALACIAN, "Galacian");
+       code<Language, string> (_language_map, "14", LANGUAGE_ICELANDIC, "Icelandic");
+       code<Language, string> (_language_map, "15", LANGUAGE_ITALIAN, "Italian");
+       code<Language, string> (_language_map, "16", LANGUAGE_LAPPISH, "Lappish");
+       code<Language, string> (_language_map, "17", LANGUAGE_LATIN, "Latin");
+       code<Language, string> (_language_map, "18", LANGUAGE_LATVIAN, "Latvian");
+       code<Language, string> (_language_map, "19", LANGUAGE_LUXEMBORGIAN, "Luxemborgian");
+       code<Language, string> (_language_map, "1A", LANGUAGE_LITHUANIAN, "Lithuanian");
+       code<Language, string> (_language_map, "1B", LANGUAGE_HUNGARIAN, "Hungarian");
+       code<Language, string> (_language_map, "1C", LANGUAGE_MALTESE, "Maltese");
+       code<Language, string> (_language_map, "1D", LANGUAGE_DUTCH, "Dutch");
+       code<Language, string> (_language_map, "1E", LANGUAGE_NORWEGIAN, "Norwegian");
+       code<Language, string> (_language_map, "1F", LANGUAGE_OCCITAN, "Occitan");
+       code<Language, string> (_language_map, "20", LANGUAGE_POLISH, "Polish");
+       code<Language, string> (_language_map, "21", LANGUAGE_PORTUGESE, "Portugese");
+       code<Language, string> (_language_map, "22", LANGUAGE_ROMANIAN, "Romanian");
+       code<Language, string> (_language_map, "23", LANGUAGE_ROMANSH, "Romansh");
+       code<Language, string> (_language_map, "24", LANGUAGE_SERBIAN, "Serbian");
+       code<Language, string> (_language_map, "25", LANGUAGE_SLOVAK, "Slovak");
+       code<Language, string> (_language_map, "26", LANGUAGE_SLOVENIAN, "Slovenian");
+       code<Language, string> (_language_map, "27", LANGUAGE_FINNISH, "Finnish");
+       code<Language, string> (_language_map, "28", LANGUAGE_SWEDISH, "Swedish");
+       code<Language, string> (_language_map, "29", LANGUAGE_TURKISH, "Turkish");
+       code<Language, string> (_language_map, "2A", LANGUAGE_FLEMISH, "Flemish");
+       code<Language, string> (_language_map, "2B", LANGUAGE_WALLON, "Wallon");
+       code<Language, string> (_language_map, "7F", LANGUAGE_AMHARIC, "Amharic");
+       code<Language, string> (_language_map, "7E", LANGUAGE_ARABIC, "Arabic");
+       code<Language, string> (_language_map, "7D", LANGUAGE_ARMENIAN, "Armenian");
+       code<Language, string> (_language_map, "7C", LANGUAGE_ASSAMESE, "Assamese");
+       code<Language, string> (_language_map, "7B", LANGUAGE_AZERBAIJANI, "Azerbaijani");
+       code<Language, string> (_language_map, "7A", LANGUAGE_BAMBORA, "Bambora");
+       code<Language, string> (_language_map, "79", LANGUAGE_BIELORUSSIAN, "Bielorussian");
+       code<Language, string> (_language_map, "78", LANGUAGE_BENGALI, "Bengali");
+       code<Language, string> (_language_map, "77", LANGUAGE_BULGARIAN, "Bulgarian");
+       code<Language, string> (_language_map, "76", LANGUAGE_BURMESE, "Burmese");
+       code<Language, string> (_language_map, "75", LANGUAGE_CHINESE, "Chinese");
+       code<Language, string> (_language_map, "74", LANGUAGE_CHURASH, "Churash");
+       code<Language, string> (_language_map, "73", LANGUAGE_DARI, "Dari");
+       code<Language, string> (_language_map, "72", LANGUAGE_FULANI, "Fulani");
+       code<Language, string> (_language_map, "71", LANGUAGE_GEORGIAN, "Georgian");
+       code<Language, string> (_language_map, "70", LANGUAGE_GREEK, "Greek");
+       code<Language, string> (_language_map, "6F", LANGUAGE_GUJURATI, "Gujarati");
+       code<Language, string> (_language_map, "6E", LANGUAGE_GURANI, "Gurani");
+       code<Language, string> (_language_map, "6D", LANGUAGE_HAUSA, "Hausa");
+       code<Language, string> (_language_map, "6C", LANGUAGE_HEBREW, "Hebrew");
+       code<Language, string> (_language_map, "6B", LANGUAGE_HINDI, "Hindi");
+       code<Language, string> (_language_map, "6A", LANGUAGE_INDONESIAN, "Indonesian");
+       code<Language, string> (_language_map, "69", LANGUAGE_JAPANESE, "Japanese");
+       code<Language, string> (_language_map, "68", LANGUAGE_KANNADA, "Kannada");
+       code<Language, string> (_language_map, "67", LANGUAGE_KAZAKH, "Kazakh");
+       code<Language, string> (_language_map, "66", LANGUAGE_KHMER, "Khmer");
+       code<Language, string> (_language_map, "65", LANGUAGE_KOREAN, "Korean");
+       code<Language, string> (_language_map, "64", LANGUAGE_LAOTIAN, "Laotian");
+       code<Language, string> (_language_map, "63", LANGUAGE_MACEDONIAN, "Macedonian");
+       code<Language, string> (_language_map, "62", LANGUAGE_MALAGASAY, "Malagasay");
+       code<Language, string> (_language_map, "61", LANGUAGE_MALAYSIAN, "Malaysian");
+       code<Language, string> (_language_map, "60", LANGUAGE_MOLDAVIAN, "Moldavian");
+       code<Language, string> (_language_map, "5F", LANGUAGE_MARATHI, "Marathi");
+       code<Language, string> (_language_map, "5E", LANGUAGE_NDEBELE, "Ndebele");
+       code<Language, string> (_language_map, "5D", LANGUAGE_NEPALI, "Nepali");
+       code<Language, string> (_language_map, "5C", LANGUAGE_ORIYA, "Oriya");
+       code<Language, string> (_language_map, "5B", LANGUAGE_PAPAMIENTO, "Papamiento");
+       code<Language, string> (_language_map, "5A", LANGUAGE_PERSIAN, "Persian");
+       code<Language, string> (_language_map, "59", LANGUAGE_PUNJABI, "Punjabi");
+       code<Language, string> (_language_map, "58", LANGUAGE_PUSHTU, "Pushtu");
+       code<Language, string> (_language_map, "57", LANGUAGE_QUECHUA, "Quechua");
+       code<Language, string> (_language_map, "56", LANGUAGE_RUSSIAN, "Russian");
+       code<Language, string> (_language_map, "55", LANGUAGE_RUTHENIAN, "Ruthenian");
+       code<Language, string> (_language_map, "54", LANGUAGE_SERBO_CROAT, "Serbo Croat");
+       code<Language, string> (_language_map, "53", LANGUAGE_SHONA, "Shona");
+       code<Language, string> (_language_map, "52", LANGUAGE_SINHALESE, "Sinhalese");
+       code<Language, string> (_language_map, "51", LANGUAGE_SOMALI, "Somali");
+       code<Language, string> (_language_map, "50", LANGUAGE_SRANAN_TONGO, "Sranan Tongo");
+       code<Language, string> (_language_map, "4F", LANGUAGE_SWAHILI, "Swahili");
+       code<Language, string> (_language_map, "4E", LANGUAGE_TADZHIK, "Tadzhik");
+       code<Language, string> (_language_map, "4D", LANGUAGE_TAMIL, "Tamil");
+       code<Language, string> (_language_map, "4C", LANGUAGE_TATAR, "Tatar");
+       code<Language, string> (_language_map, "4B", LANGUAGE_TELUGU, "Telugu");
+       code<Language, string> (_language_map, "4A", LANGUAGE_THAI, "Thai");
+       code<Language, string> (_language_map, "49", LANGUAGE_UKRANIAN, "Ukranian");
+       code<Language, string> (_language_map, "48", LANGUAGE_URDU, "Urdu");
+       code<Language, string> (_language_map, "47", LANGUAGE_UZBEK, "Uzbek");
+       code<Language, string> (_language_map, "46", LANGUAGE_VIETNAMESE, "Vietnamese");
+       code<Language, string> (_language_map, "45", LANGUAGE_ZULU, "Zulu");
+
+       code<TimecodeStatus, string> (_timecode_status_map, "0", TIMECODE_STATUS_NOT_INTENDED_FOR_USE, "Not intended for use");
+       code<TimecodeStatus, string> (_timecode_status_map, "1", TIMECODE_STATUS_INTENDED_FOR_USE, "Intended for use");
+
+       code<CumulativeStatus, int> (_cumulative_status_map, 0, CUMULATIVE_STATUS_NOT_CUMULATIVE, "Not part of a cumulative set");
+       code<CumulativeStatus, int> (_cumulative_status_map, 1, CUMULATIVE_STATUS_FIRST, "First subtitle of a cumulative set");
+       code<CumulativeStatus, int> (_cumulative_status_map, 2, CUMULATIVE_STATUS_INTERMEDIATE, "Intermediate subtitle of a cumulative set");
+       code<CumulativeStatus, int> (_cumulative_status_map, 3, CUMULATIVE_STATUS_LAST, "Last subtitle of a cumulative set");
+
+       code<Justification, int> (_justification_map, 0, JUSTIFICATION_NONE, "No justification");
+       code<Justification, int> (_justification_map, 1, JUSTIFICATION_LEFT, "Left justification");
+       code<Justification, int> (_justification_map, 2, JUSTIFICATION_CENTRE, "Centre justification");
+       code<Justification, int> (_justification_map, 3, JUSTIFICATION_CENTRE, "Right justification");
+
+       code<Comment, int> (_comment_map, 0, COMMENT_NO, "Not a comment");
+       code<Comment, int> (_comment_map, 1, COMMENT_YES, "Is a comment");
+}
diff --git a/src/stl_binary_tables.h b/src/stl_binary_tables.h
new file mode 100644 (file)
index 0000000..0a85dd8
--- /dev/null
@@ -0,0 +1,220 @@
+/*
+    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <string>
+#include <map>
+
+namespace sub {
+
+enum DisplayStandard {
+       DISPLAY_STANDARD_UNDEFINED,
+       DISPLAY_STANDARD_OPEN_SUBTITLING,
+       DISPLAY_STANDARD_LEVEL_1_TELETEXT,
+       DISPLAY_STANDARD_LEVEL_2_TELETEXT
+};
+       
+enum LanguageGroup {
+       LANGUAGE_GROUP_LATIN,
+       LANGUAGE_GROUP_LATIN_CYRILLIC,
+       LANGUAGE_GROUP_LATIN_ARABIC,
+       LANGUAGE_GROUP_LATIN_GREEK,
+       LANGUAGE_GROUP_LATIN_HEBREW
+};
+
+enum Language {
+       LANGUAGE_UNKNOWN,
+       LANGUAGE_ALBANIAN,
+       LANGUAGE_BRETON,
+       LANGUAGE_CATALAN,
+       LANGUAGE_CROATIAN,
+       LANGUAGE_WELSH,
+       LANGUAGE_CZECH,
+       LANGUAGE_DANISH,
+       LANGUAGE_GERMAN,
+       LANGUAGE_ENGLISH,
+       LANGUAGE_SPANISH,
+       LANGUAGE_ESPERANTO,
+       LANGUAGE_ESTONIAN,
+       LANGUAGE_BASQUE,
+       LANGUAGE_FAROESE,
+       LANGUAGE_FRENCH,
+       LANGUAGE_FRISIAN,
+       LANGUAGE_IRISH,
+       LANGUAGE_GAELIC,
+       LANGUAGE_GALACIAN,
+       LANGUAGE_ICELANDIC,
+       LANGUAGE_ITALIAN,
+       LANGUAGE_LAPPISH,
+       LANGUAGE_LATIN,
+       LANGUAGE_LATVIAN,
+       LANGUAGE_LUXEMBORGIAN,
+       LANGUAGE_LITHUANIAN,
+       LANGUAGE_HUNGARIAN,
+       LANGUAGE_MALTESE,
+       LANGUAGE_DUTCH,
+       LANGUAGE_NORWEGIAN,
+       LANGUAGE_OCCITAN,
+       LANGUAGE_POLISH,
+       LANGUAGE_PORTUGESE,
+       LANGUAGE_ROMANIAN,
+       LANGUAGE_ROMANSH,
+       LANGUAGE_SERBIAN,
+       LANGUAGE_SLOVAK,
+       LANGUAGE_SLOVENIAN,
+       LANGUAGE_FINNISH,
+       LANGUAGE_SWEDISH,
+       LANGUAGE_TURKISH,
+       LANGUAGE_FLEMISH,
+       LANGUAGE_WALLON,
+       LANGUAGE_AMHARIC,
+       LANGUAGE_ARABIC,
+       LANGUAGE_ARMENIAN,
+       LANGUAGE_ASSAMESE,
+       LANGUAGE_AZERBAIJANI,
+       LANGUAGE_BAMBORA,
+       LANGUAGE_BIELORUSSIAN,
+       LANGUAGE_BENGALI,
+       LANGUAGE_BULGARIAN,
+       LANGUAGE_BURMESE,
+       LANGUAGE_CHINESE,
+       LANGUAGE_CHURASH,
+       LANGUAGE_DARI,
+       LANGUAGE_FULANI,
+       LANGUAGE_GEORGIAN,
+       LANGUAGE_GREEK,
+       LANGUAGE_GUJURATI,
+       LANGUAGE_GURANI,
+       LANGUAGE_HAUSA,
+       LANGUAGE_HEBREW,
+       LANGUAGE_HINDI,
+       LANGUAGE_INDONESIAN,
+       LANGUAGE_JAPANESE,
+       LANGUAGE_KANNADA,
+       LANGUAGE_KAZAKH,
+       LANGUAGE_KHMER,
+       LANGUAGE_KOREAN,
+       LANGUAGE_LAOTIAN,
+       LANGUAGE_MACEDONIAN,
+       LANGUAGE_MALAGASAY,
+       LANGUAGE_MALAYSIAN,
+       LANGUAGE_MOLDAVIAN,
+       LANGUAGE_MARATHI,
+       LANGUAGE_NDEBELE,
+       LANGUAGE_NEPALI,
+       LANGUAGE_ORIYA,
+       LANGUAGE_PAPAMIENTO,
+       LANGUAGE_PERSIAN,
+       LANGUAGE_PUNJABI,
+       LANGUAGE_PUSHTU,
+       LANGUAGE_QUECHUA,
+       LANGUAGE_RUSSIAN,
+       LANGUAGE_RUTHENIAN,
+       LANGUAGE_SERBO_CROAT,
+       LANGUAGE_SHONA,
+       LANGUAGE_SINHALESE,
+       LANGUAGE_SOMALI,
+       LANGUAGE_SRANAN_TONGO,
+       LANGUAGE_SWAHILI,
+       LANGUAGE_TADZHIK,
+       LANGUAGE_TAMIL,
+       LANGUAGE_TATAR,
+       LANGUAGE_TELUGU,
+       LANGUAGE_THAI,
+       LANGUAGE_UKRANIAN,
+       LANGUAGE_URDU,
+       LANGUAGE_UZBEK,
+       LANGUAGE_VIETNAMESE,
+       LANGUAGE_ZULU
+};
+
+enum TimecodeStatus {
+       TIMECODE_STATUS_NOT_INTENDED_FOR_USE,
+       TIMECODE_STATUS_INTENDED_FOR_USE
+};
+
+enum CumulativeStatus {
+       CUMULATIVE_STATUS_NOT_CUMULATIVE,
+       CUMULATIVE_STATUS_FIRST,
+       CUMULATIVE_STATUS_INTERMEDIATE,
+       CUMULATIVE_STATUS_LAST
+};
+
+enum Justification {
+       JUSTIFICATION_NONE,
+       JUSTIFICATION_LEFT,
+       JUSTIFICATION_CENTRE,
+       JUSTIFICATION_RIGHT
+};
+
+enum Comment {
+       COMMENT_NO,
+       COMMENT_YES
+};
+
+template<class T>
+class STLBinaryCode
+{
+public:
+       STLBinaryCode ()
+               : value ((T) 0)
+       {}
+
+       STLBinaryCode (T v, std::string d)
+               : value (v)
+               , description (d)
+       {}
+       
+       T value;
+       std::string description;
+};
+
+class STLBinaryTables
+{
+public:
+       STLBinaryTables ();
+
+       DisplayStandard display_standard_file_to_enum (std::string) const;
+       LanguageGroup language_group_file_to_enum (std::string) const;
+       Language language_file_to_enum (std::string) const;
+       TimecodeStatus timecode_status_file_to_enum (std::string) const;
+       CumulativeStatus cumulative_status_file_to_enum (int) const;
+       Justification justification_file_to_enum (int) const;
+       Comment comment_file_to_enum (int) const;
+
+       std::string language_enum_to_file (Language) const;
+
+       std::string display_standard_enum_to_description (DisplayStandard) const;
+       std::string language_group_enum_to_description (LanguageGroup) const;
+       std::string language_enum_to_description (Language) const;
+       std::string timecode_status_enum_to_description (TimecodeStatus) const;
+       std::string cumulative_status_enum_to_description (CumulativeStatus) const;
+       std::string justification_enum_to_description (Justification) const;
+       std::string comment_enum_to_description (Comment) const;
+
+private:       
+       std::map<std::string, STLBinaryCode<DisplayStandard> > _display_standard_map;
+       std::map<std::string, STLBinaryCode<LanguageGroup> > _language_group_map;
+       std::map<std::string, STLBinaryCode<Language> > _language_map;
+       std::map<std::string, STLBinaryCode<TimecodeStatus> > _timecode_status_map;
+       std::map<int, STLBinaryCode<CumulativeStatus> > _cumulative_status_map;
+       std::map<int, STLBinaryCode<Justification> > _justification_map;
+       std::map<int, STLBinaryCode<Comment> > _comment_map;
+};
+
+}
index 34e4d73c1ecef2922ab1d43b5692b35fa7cde8fd..8ec8c678207de166820b3bbb87e8f1001cba5aa7 100644 (file)
 
 */
 
+#include "stl_binary_writer.h"
+#include "compose.hpp"
 #include <list>
 #include <cmath>
 #include <fstream>
-#include "stl_binary_writer.h"
-#include "compose.hpp"
+#include <iomanip>
 
 using std::list;
 using std::ofstream;
 using std::string;
+using std::setw;
+using std::setfill;
 using namespace sub;
 
 static void
@@ -35,10 +38,24 @@ put_string (char* p, string s)
 }
 
 static void
-put_string (char* p, int n, string s)
+put_string (char* p, unsigned int n, string s)
 {
+       assert (s.length() <= n);
+       
        memcpy (p, s.c_str (), s.length ());
-       memset (p + s.length(), ' ', s.length () - n);
+       memset (p + s.length(), ' ', n - s.length ());
+}
+
+static void
+put_int (char* p, int v, unsigned int n)
+{
+       std::stringstream s;
+       /* Be careful to ensure we get no thousands separators */
+       s.imbue (std::locale::classic ());
+       s << setw (n) << setfill ('0');
+       s << v;
+       assert (s.str().length() == n);
+       put_string (p, s.str ());
 }
 
 /** @param language ISO 3-character country code for the language of the subtitles */
@@ -46,7 +63,7 @@ void
 sub::write_stl_binary (
        list<Subtitle> subtitles,
        float frames_per_second,
-       string language,
+       Language language,
        string original_programme_title,
        string original_episode_title,
        string translated_programme_title,
@@ -63,7 +80,6 @@ sub::write_stl_binary (
        boost::filesystem::path file_name
        )
 {
-       assert (language.size() == 3);
        assert (original_programme_title.size() <= 32);
        assert (original_episode_title.size() <= 32);
        assert (translated_programme_title.size() <= 32);
@@ -80,6 +96,7 @@ sub::write_stl_binary (
        
        char* buffer = new char[1024];
        ofstream output (file_name.string().c_str ());
+       STLBinaryTables tables;
        
        /* Code page: 850 */
        put_string (buffer + 0, "850");
@@ -89,7 +106,7 @@ sub::write_stl_binary (
        put_string (buffer + 11, "0");
        /* Character code table: Latin (ISO 6937) */
        put_string (buffer + 12, "00");
-       put_string (buffer + 14, language);
+       put_string (buffer + 14, tables.language_enum_to_file (language));
        put_string (buffer + 16, 32, original_programme_title);
        put_string (buffer + 48, 32, original_episode_title);
        put_string (buffer + 80, 32, translated_programme_title);
@@ -100,11 +117,11 @@ sub::write_stl_binary (
        put_string (buffer + 208, "0000000000000000");
        put_string (buffer + 224, creation_date);
        put_string (buffer + 230, revision_date);
-       put_string (buffer + 236, String::compose ("%02d", revision_number));
+       put_int (buffer + 236, revision_number, 2);
        /* TTI blocks */
-       put_string (buffer + 238, String::compose ("%05d", subtitles.size ()));
+       put_int (buffer + 238, subtitles.size (), 5);
        /* Total number of subtitles */
-       put_string (buffer + 243, String::compose ("%05d", subtitles.size ()));
+       put_int (buffer + 243, subtitles.size (), 5);
        /* Total number of subtitle groups */
        put_string (buffer + 248, "000");
        /* Maximum number of displayable characters in any text row */
@@ -123,10 +140,10 @@ sub::write_stl_binary (
        put_string (buffer + 272, "1");
        /* Disk sequence number */
        put_string (buffer + 273, "1");
-       put_string (buffer + 274, country_of_origin);
-       put_string (buffer + 277, publisher);
-       put_string (buffer + 309, editor_name);
-       put_string (buffer + 341, editor_contact_details);
+       put_string (buffer + 274, 32, country_of_origin);
+       put_string (buffer + 277, 32, publisher);
+       put_string (buffer + 309, 32, editor_name);
+       put_string (buffer + 341, 32, editor_contact_details);
 
        output.write (buffer, 1024);
 
index 7dbf5a5cd724b88d7a7f3528030111e11270a35c..2494d17c75ad9a8f22a9ae407a12d3c7f5f43cc9 100644 (file)
@@ -17,6 +17,7 @@
 
 */
 
+#include "stl_binary_tables.h"
 #include <string>
 #include <boost/filesystem.hpp>
 
@@ -27,7 +28,7 @@ class Subtitle;
 extern void write_stl_binary (
        std::list<Subtitle> subtitles,
        float frames_per_second,
-       std::string language,
+       Language language,
        std::string original_programme_title,
        std::string original_episode_title,
        std::string translated_programme_title,
diff --git a/src/time_pair.h b/src/time_pair.h
new file mode 100644 (file)
index 0000000..0ed039d
--- /dev/null
@@ -0,0 +1,57 @@
+/*
+    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "frame_time.h"
+#include "metric_time.h"
+#include <boost/optional.hpp>
+
+namespace sub {
+
+class TimePair
+{
+public:
+       void set_frame (FrameTime t) {
+               _frame = t;
+               _metric = boost::optional<MetricTime> ();
+       }
+
+       void set_metric (MetricTime t) {
+               _metric = t;
+               _frame = boost::optional<FrameTime> ();
+       }
+
+       boost::optional<FrameTime> frame () const {
+               return _frame;
+       }
+       
+       boost::optional<MetricTime> metric () const {
+               return _metric;
+       }
+       
+       FrameTime  frame  (float frames_per_second) const;
+       MetricTime metric (float frames_per_second) const;
+
+       bool operator== (TimePair const & other) const;
+       
+private:
+       boost::optional<FrameTime> _frame;
+       boost::optional<MetricTime> _metric;
+};
+
+}
index dd04aa90f4ba6f2a143847fe4e2cae03ac673299..dc954c98144a236abae66d136100b7c130bb1e19 100644 (file)
@@ -21,6 +21,8 @@ def build(bld):
                  reader.cc
                  reader_factory.cc
                  stl_binary_reader.cc
+                 stl_binary_tables.cc
+                 stl_binary_writer.cc
                  stl_text_reader.cc
                  time_pair.cc
                  subtitle.cc
diff --git a/test/stl_binary_writer_test.cc b/test/stl_binary_writer_test.cc
new file mode 100644 (file)
index 0000000..3960ea2
--- /dev/null
@@ -0,0 +1,52 @@
+/*
+    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "stl_binary_writer.h"
+#include "subtitle.h"
+#include <boost/test/unit_test.hpp>
+
+using std::list;
+
+/** Test writing of a binary STL file */
+BOOST_AUTO_TEST_CASE (stl_binary_writer_test)
+{
+       list<sub::Subtitle> subs;
+       
+       sub::write_stl_binary (
+               subs,
+               25,
+               sub::LANGUAGE_GERMAN,
+               "Original programme title",
+               "Original episode title",
+               "TX program title",
+               "TX episode title",
+               "TX name",
+               "TX contact",
+               "140212",
+               "140213",
+               0,
+               "GBR",
+               "Publisher",
+               "Editor name",
+               "Editor contact",
+               "build/test/test.stl"
+               );
+               
+}
+
index d9ea72772cef733968b6aca56b048ac6919f96c1..cbc3dd1f360854ed8e13a4dbccdc857c2ca28f24 100644 (file)
@@ -19,6 +19,7 @@ def build(bld):
                  dcp_reader_test.cc
                  iso6937_test.cc
                  stl_binary_reader_test.cc
+                 stl_binary_writer_test.cc
                  stl_text_reader_test.cc
                  time_test.cc
                  test.cc