Fix for matcha models from icefall

Author: csukuangfj

sherpa-onnx/csrc/jieba-lexicon.cc

@@ -83,7 +83,6 @@ class JiebaLexicon::Impl {
     std::vector<TokenIDs> ans;
     std::vector<int64_t> this_sentence;
 
-    int32_t blank = token2id_.at(" ");
     for (const auto &w : words) {
       auto ids = ConvertWordToIds(w);
       if (ids.empty()) {
@@ -92,7 +91,6 @@ class JiebaLexicon::Impl {
       }
 
       this_sentence.insert(this_sentence.end(), ids.begin(), ids.end());
-      // this_sentence.push_back(blank);
 
       if (w == "。" || w == "！" || w == "？" || w == "，") {
         ans.emplace_back(std::move(this_sentence));
@@ -134,7 +132,9 @@ class JiebaLexicon::Impl {
     token2id_ = ReadTokens(is);
 
     std::vector<std::pair<std::string, std::string>> puncts = {
-        {",", "，"}, {".", "。"}, {"!", "！"}, {"?", "？"}};
+        {",", "，"}, {".", "。"}, {"!", "！"}, {"?", "？"}, {":", "："},
+        {"\"", "“"}, {"\"", "”"}, {"'", "‘"},  {"'", "’"},
+    };
 
     for (const auto &p : puncts) {
       if (token2id_.count(p.first) && !token2id_.count(p.second)) {

sherpa-onnx/csrc/offline-tts-matcha-impl.h

@@ -248,28 +248,8 @@ class OfflineTtsMatchaImpl : public OfflineTtsImpl {
       SHERPA_ONNX_LOGE("%s", os.str().c_str());
     }
 
-    if (meta_data.add_blank) {
-      for (auto &k : x) {
-        k = AddBlank(k);
-      }
-
-      if (config_.model.debug) {
-        std::ostringstream os;
-        os << "\n";
-        for (const auto &k : x) {
-          for (int32_t i : k) {
-            os << i << " ";
-          }
-          os << "\n";
-        }
-        os << "\n";
-        SHERPA_ONNX_LOGE("%s", os.str().c_str());
-      }
-
-      for (auto &k : x) {
-        // TODO(fangjun): Fix it!
-        k = AddBlank(k, 62);
-      }
+    for (auto &k : x) {
+      k = AddBlank(k, meta_data.pad_id);
     }
 
     if (config_.model.debug) {

sherpa-onnx/csrc/offline-tts-matcha-model-metadata.h

@@ -15,9 +15,12 @@ namespace sherpa_onnx {
 // you have downloaded.
 struct OfflineTtsMatchaModelMetaData {
   int32_t sample_rate = 0;
-  int32_t add_blank = 0;
   int32_t num_speakers = 0;
   int32_t version = 1;
+  int32_t jieba = 0;
+  int32_t espeak = 0;
+  int32_t use_eos_bos = 0;
+  int32_t pad_id = 0;
 };
 
 }  // namespace sherpa_onnx

sherpa-onnx/csrc/offline-tts-matcha-model.cc

@@ -139,11 +139,12 @@ class OfflineTtsMatchaModel::Impl {
 
     Ort::AllocatorWithDefaultOptions allocator;  // used in the macro below
     SHERPA_ONNX_READ_META_DATA(meta_data_.sample_rate, "sample_rate");
-    SHERPA_ONNX_READ_META_DATA_WITH_DEFAULT(meta_data_.add_blank, "add_blank",
-                                            1);
-
     SHERPA_ONNX_READ_META_DATA_WITH_DEFAULT(meta_data_.version, "version", 1);
     SHERPA_ONNX_READ_META_DATA(meta_data_.num_speakers, "n_speakers");
+    SHERPA_ONNX_READ_META_DATA(meta_data_.jieba, "jieba");
+    SHERPA_ONNX_READ_META_DATA(meta_data_.espeak, "has_espeak");
+    SHERPA_ONNX_READ_META_DATA(meta_data_.use_eos_bos, "use_eos_bos");
+    SHERPA_ONNX_READ_META_DATA(meta_data_.pad_id, "pad_id");
   }
 
  private:

sherpa-onnx/csrc/offline-tts-vits-model.cc

@@ -174,7 +174,7 @@ class OfflineTtsVitsModel::Impl {
     SHERPA_ONNX_READ_META_DATA_WITH_DEFAULT(meta_data_.bos_id, "bos_id", 0);
     SHERPA_ONNX_READ_META_DATA_WITH_DEFAULT(meta_data_.eos_id, "eos_id", 0);
     SHERPA_ONNX_READ_META_DATA_WITH_DEFAULT(meta_data_.use_eos_bos,
-                                            "use_eos_bos", 0);
+                                            "use_eos_bos", 1);
     SHERPA_ONNX_READ_META_DATA_WITH_DEFAULT(meta_data_.pad_id, "pad_id", 0);
 
     std::string comment;