Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sherpa-onnx/csrc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@ if(SHERPA_ONNX_ENABLE_TTS)
offline-tts-character-frontend.cc
offline-tts-frontend.cc
offline-tts-impl.cc
offline-tts-kitten-model-config.cc
offline-tts-kitten-model.cc
offline-tts-kokoro-model-config.cc
offline-tts-kokoro-model.cc
offline-tts-matcha-model-config.cc
Expand Down
2 changes: 1 addition & 1 deletion sherpa-onnx/csrc/kokoro-multi-lang-lexicon.cc
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ class KokoroMultiLangLexicon::Impl {

std::vector<std::vector<int32_t>> ConvertTextToTokenIDsWithEspeak(
const std::string &text, const std::string &voice) const {
auto temp = ConvertTextToTokenIdsKokoro(
auto temp = ConvertTextToTokenIdsKokoroOrKitten(
phoneme2id_, meta_data_.max_token_len, text, voice);
std::vector<std::vector<int32_t>> ans;
ans.reserve(temp.size());
Expand Down
2 changes: 1 addition & 1 deletion sherpa-onnx/csrc/offline-tts-frontend.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class OfflineTtsFrontend {
void InitEspeak(const std::string &data_dir);

// implementation in ./piper-phonemize-lexicon.cc
std::vector<TokenIDs> ConvertTextToTokenIdsKokoro(
std::vector<TokenIDs> ConvertTextToTokenIdsKokoroOrKitten(
const std::unordered_map<char32_t, int32_t> &token2id,
int32_t max_token_len, const std::string &text,
const std::string &voice = "");
Expand Down
16 changes: 14 additions & 2 deletions sherpa-onnx/csrc/offline-tts-impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "rawfile/raw_file_manager.h"
#endif

#include "sherpa-onnx/csrc/offline-tts-kitten-impl.h"
#include "sherpa-onnx/csrc/offline-tts-kokoro-impl.h"
#include "sherpa-onnx/csrc/offline-tts-matcha-impl.h"
#include "sherpa-onnx/csrc/offline-tts-vits-impl.h"
Expand All @@ -40,9 +41,15 @@ std::unique_ptr<OfflineTtsImpl> OfflineTtsImpl::Create(
return std::make_unique<OfflineTtsVitsImpl>(config);
} else if (!config.model.matcha.acoustic_model.empty()) {
return std::make_unique<OfflineTtsMatchaImpl>(config);
} else if (!config.model.kokoro.model.empty()) {
return std::make_unique<OfflineTtsKokoroImpl>(config);
} else if (!config.model.kitten.model.empty()) {
return std::make_unique<OfflineTtsKittenImpl>(config);
}

return std::make_unique<OfflineTtsKokoroImpl>(config);
SHERPA_ONNX_LOGE("Please provide a tts model.");

return {};
}

template <typename Manager>
Expand All @@ -52,9 +59,14 @@ std::unique_ptr<OfflineTtsImpl> OfflineTtsImpl::Create(
return std::make_unique<OfflineTtsVitsImpl>(mgr, config);
} else if (!config.model.matcha.acoustic_model.empty()) {
return std::make_unique<OfflineTtsMatchaImpl>(mgr, config);
} else if (!config.model.kokoro.model.empty()) {
return std::make_unique<OfflineTtsKokoroImpl>(mgr, config);
} else if (!config.model.kitten.model.empty()) {
return std::make_unique<OfflineTtsKittenImpl>(mgr, config);
}

return std::make_unique<OfflineTtsKokoroImpl>(mgr, config);
SHERPA_ONNX_LOGE("Please provide a tts model.");
return {};
}

#if __ANDROID_API__ >= 9
Expand Down
Loading