Merge pull request #4 from m5stack/dev

Dev

Author: dianjixz

projects/llm_framework/include/sherpa/sherpa-onnx/csrc/keyword-spotter.h

@@ -69,6 +69,11 @@ struct KeywordSpotterConfig {
 
   std::string keywords_file;
 
+  /// if keywords_buf is non-empty,
+  /// the keywords will be loaded from the buffer instead of from the
+  /// "keywrods_file"
+  std::string keywords_buf;
+
   KeywordSpotterConfig() = default;
 
   KeywordSpotterConfig(const FeatureExtractorConfig &feat_config,

projects/llm_framework/include/sherpa/sherpa-onnx/csrc/lexicon.h

@@ -6,17 +6,13 @@
 #define SHERPA_ONNX_CSRC_LEXICON_H_
 
 #include <cstdint>
+#include <istream>
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
-#if __ANDROID_API__ >= 9
-#include "android/asset_manager.h"
-#include "android/asset_manager_jni.h"
-#endif
-
 #include "sherpa-onnx/csrc/offline-tts-frontend.h"
 
 namespace sherpa_onnx {
@@ -30,11 +26,10 @@ class Lexicon : public OfflineTtsFrontend {
           const std::string &punctuations, const std::string &language,
           bool debug = false);
 
-#if __ANDROID_API__ >= 9
-  Lexicon(AAssetManager *mgr, const std::string &lexicon,
-          const std::string &tokens, const std::string &punctuations,
-          const std::string &language, bool debug = false);
-#endif
+  template <typename Manager>
+  Lexicon(Manager *mgr, const std::string &lexicon, const std::string &tokens,
+          const std::string &punctuations, const std::string &language,
+          bool debug = false);
 
   std::vector<TokenIDs> ConvertTextToTokenIds(
       const std::string &text, const std::string &voice = "") const override;