Merge remote-tracking branch 'upstream/master'

1 files changed, 55 insertions, 8 deletions

diff --git a/kaldi_io/src/init.c b/kaldi_io/src/init.c
index 413452c..529895b 100644
--- a/kaldi_io/src/init.c
+++ b/kaldi_io/src/init.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 
 const char *nerv_kaldi_feat_repo_tname = "nerv.KaldiFeatureRepo";
+const char *nerv_kaldi_lookup_feat_repo_tname = "nerv.KaldiLookupFeatureRepo";
 const char *nerv_kaldi_label_repo_tname = "nerv.KaldiLabelRepo";
 const char *nerv_matrix_host_float_tname = "nerv.MMatrixFloat";
 
@@ -42,10 +43,51 @@ static int feat_repo_is_end(lua_State *L) {
     return 1;
 }
 
+static int feat_repo_key(lua_State *L) {
+    KaldiFeatureRepo *repo = luaT_checkudata(L, 1, nerv_kaldi_feat_repo_tname);
+    lua_pushstring(L, kaldi_feature_repo_key(repo));
+    return 1;
+}
+
 static const luaL_Reg feat_repo_methods[] = {
     {"cur_utter", feat_repo_current_utterance},
     {"next", feat_repo_next},
     {"is_end", feat_repo_is_end},
+    {"key", feat_repo_key},
+    {NULL, NULL}
+};
+
+static int lookup_feat_repo_new(lua_State *L) {
+    const char *feature_rsepcifier = luaL_checkstring(L, 1);
+    const char *map_rspecifier = luaL_checkstring(L, 2);
+    KaldiLookupFeatureRepo *repo = kaldi_lookup_feature_repo_new(feature_rsepcifier, map_rspecifier);
+    luaT_pushudata(L, repo, nerv_kaldi_lookup_feat_repo_tname);
+    return 1;
+}
+
+static int lookup_feat_repo_destroy(lua_State *L) {
+    KaldiLookupFeatureRepo *repo = luaT_checkudata(L, 1, nerv_kaldi_lookup_feat_repo_tname);
+    kaldi_lookup_feature_repo_destroy(repo);
+    return 0;
+}
+
+static int lookup_feat_repo_read_utterance(lua_State *L) {
+    KaldiLookupFeatureRepo *repo = luaT_checkudata(L, 1, nerv_kaldi_lookup_feat_repo_tname);
+    KaldiFeatureRepo *feat_repo = luaT_checkudata(L, 2, nerv_kaldi_feat_repo_tname);
+    int nframes, debug;
+    if (!lua_isnumber(L, 3))
+        nerv_error(L, "nframes should be a number");
+    nframes = lua_tonumber(L, 3);
+    if (!lua_isboolean(L, 4))
+        nerv_error(L, "debug flag should be a boolean");
+    debug = lua_toboolean(L, 4);
+    Matrix *utter = kaldi_lookup_feature_repo_read_utterance(repo, feat_repo, nframes, L, debug);
+    luaT_pushudata(L, utter, nerv_matrix_host_float_tname);
+    return 1;
+}
+
+static const luaL_Reg lookup_feat_repo_methods[] = {
+    {"get_utter", lookup_feat_repo_read_utterance},
     {NULL, NULL}
 };
 
@@ -60,17 +102,14 @@ static int label_repo_new(lua_State *L) {
 static int label_repo_read_utterance(lua_State *L) {
     KaldiLabelRepo *repo = luaT_checkudata(L, 1, nerv_kaldi_label_repo_tname);
     KaldiFeatureRepo *feat_repo = luaT_checkudata(L, 2, nerv_kaldi_feat_repo_tname);
-    int frm_ext, nframes, debug;
+    int nframes, debug;
     if (!lua_isnumber(L, 3))
-        nerv_error(L, "frm_ext should be a number");
-    frm_ext = lua_tonumber(L, 3);
-    if (!lua_isnumber(L, 4))
         nerv_error(L, "nframes should be a number");
-    nframes = lua_tonumber(L, 4);
-    if (!lua_isboolean(L, 5))
+    nframes = lua_tonumber(L, 3);
+    if (!lua_isboolean(L, 4))
         nerv_error(L, "debug flag should be a boolean");
-    debug = lua_toboolean(L, 5);
-    Matrix *utter = kaldi_label_repo_read_utterance(repo, feat_repo, frm_ext, nframes, L, debug);
+    debug = lua_toboolean(L, 4);
+    Matrix *utter = kaldi_label_repo_read_utterance(repo, feat_repo, nframes, L, debug);
     luaT_pushudata(L, utter, nerv_matrix_host_float_tname);
     return 1;
 }
@@ -93,6 +132,13 @@ static void feat_repo_init(lua_State *L) {
     lua_pop(L, 1);
 }
 
+static void lookup_feat_repo_init(lua_State *L) {
+    luaT_newmetatable(L, nerv_kaldi_lookup_feat_repo_tname, NULL,
+                        lookup_feat_repo_new, lookup_feat_repo_destroy, NULL);
+    luaL_register(L, NULL, lookup_feat_repo_methods);
+    lua_pop(L, 1);
+}
+
 static void label_repo_init(lua_State *L) {
     luaT_newmetatable(L, nerv_kaldi_label_repo_tname, NULL,
                         label_repo_new, label_repo_destroy, NULL);
@@ -102,5 +148,6 @@ static void label_repo_init(lua_State *L) {
 
 void kaldi_io_init(lua_State *L) {
     feat_repo_init(L);
+    lookup_feat_repo_init(L);
     label_repo_init(L);
 }