[Julius-cvs 873] CVS update: julius4/libsent/include/sent

アーカイブの一覧に戻る

sumom****@users***** sumom****@users*****
2013年 12月 18日 (水) 12:55:21 JST


Index: julius4/libsent/include/sent/adin.h
diff -u julius4/libsent/include/sent/adin.h:1.14 julius4/libsent/include/sent/adin.h:1.15
--- julius4/libsent/include/sent/adin.h:1.14	Wed Dec  4 19:13:00 2013
+++ julius4/libsent/include/sent/adin.h	Wed Dec 18 12:55:21 2013
@@ -19,7 +19,7 @@
  * @author Akinobu LEE
  * @date   Thu Feb 10 17:22:36 2005
  *
- * $Revision: 1.14 $ 
+ * $Revision: 1.15 $ 
  */
 /*
  * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University
@@ -48,7 +48,8 @@
   SP_MFCFILE,			///< HTK parameter file
   SP_NETAUDIO,			///< Live NetAudio/DatLink input
   SP_STDIN,			///< Standard input
-  SP_MFCMODULE			///< parameter module
+  SP_MFCMODULE,			///< parameter module
+  SP_OUTPROBFILE
 };
 
 /// Input device
Index: julius4/libsent/include/sent/hmm.h
diff -u julius4/libsent/include/sent/hmm.h:1.6 julius4/libsent/include/sent/hmm.h:1.7
--- julius4/libsent/include/sent/hmm.h:1.6	Fri Jun 21 02:14:20 2013
+++ julius4/libsent/include/sent/hmm.h	Wed Dec 18 12:55:21 2013
@@ -21,7 +21,7 @@
  * @author Akinobu LEE
  * @date   Thu Feb 10 14:54:06 2005
  *
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  *
  */
 /*
@@ -111,6 +111,7 @@
 
 /* hmminfo/outprob.c */
 LOGPROB outprob(HMMWork *wrk, int t, HMM_STATE *hmmstate, HTK_Param *param);
+
 /* hmminfo/put_htkdata_info */
 void put_hmm_arc(FILE *fp, HMM *d);
 void put_hmm_outprob(FILE *fp, HMM *d);
Index: julius4/libsent/include/sent/hmm_calc.h
diff -u julius4/libsent/include/sent/hmm_calc.h:1.10 julius4/libsent/include/sent/hmm_calc.h:1.11
--- julius4/libsent/include/sent/hmm_calc.h:1.10	Fri Jun 21 02:14:20 2013
+++ julius4/libsent/include/sent/hmm_calc.h	Wed Dec 18 12:55:21 2013
@@ -13,7 +13,7 @@
  * @author Akinobu LEE
  * @date   Thu Feb 10 14:54:06 2005
  *
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
  *
  */
 /*
@@ -154,6 +154,8 @@
   /* GMS gprune local cache */
   int **gms_last_max_id_list;	///< maximum mixture id of last call for each states
 
+  boolean batch_computation;
+
 } HMMWork;  
 
 
@@ -174,6 +176,7 @@
 	     );
 boolean outprob_prepare(HMMWork *wrk, int framenum);
 void outprob_free(HMMWork *wrk);
+void outprob_set_batch_computation(HMMWork *wrk, boolean flag);
 /* outprob.c */
 boolean outprob_cache_init(HMMWork *wrk);
 boolean outprob_cache_prepare(HMMWork *wrk);
@@ -182,6 +185,8 @@
 void outprob_cd_nbest_init(HMMWork *wrk, int num);
 void outprob_cd_nbest_free(HMMWork *wrk);
 LOGPROB outprob_cd(HMMWork *wrk, int t, CD_State_Set *lset, HTK_Param *param);
+boolean outprob_cache_output(FILE *fp, HMMWork *wrk, int framenum);
+
 /* gms.c */
 boolean gms_init(HMMWork *wrk);
 boolean gms_prepare(HMMWork *wrk, int framelen);
Index: julius4/libsent/include/sent/htk_hmm.h
diff -u julius4/libsent/include/sent/htk_hmm.h:1.11 julius4/libsent/include/sent/htk_hmm.h:1.12
--- julius4/libsent/include/sent/htk_hmm.h:1.11	Fri Jun 21 02:14:20 2013
+++ julius4/libsent/include/sent/htk_hmm.h	Wed Dec 18 12:55:21 2013
@@ -16,7 +16,7 @@
  * @author Akinobu LEE
  * @date   Thu Feb 10 19:36:47 2005
  *
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
  * 
  */
 /*
@@ -40,7 +40,7 @@
 #define NoTokErr(S)      if (!rdhmmdef_token) rderr(S)
 
 /// Delimiter string for parsing %HMM definition file
-#define HMMDEF_DELM " \t\n<>"
+#define HMMDEF_DELM " \t\r\n<>"
 
 /**
  * @defgroup hmminfo HTK HMM definition
@@ -433,6 +433,7 @@
 #ifdef ENABLE_MSD
 void htk_hmm_check_msd(HTK_HMM_INFO *hmm);
 #endif
+boolean htk_hmm_check_sid(HTK_HMM_INFO *hmm);
 /* rdhmmdef_options.c */
 boolean set_global_opt(FILE *fp, HTK_HMM_INFO *hmm);
 char *get_cov_str(short covtype);
Index: julius4/libsent/include/sent/htk_param.h
diff -u julius4/libsent/include/sent/htk_param.h:1.6 julius4/libsent/include/sent/htk_param.h:1.7
--- julius4/libsent/include/sent/htk_param.h:1.6	Fri Jun 21 02:14:20 2013
+++ julius4/libsent/include/sent/htk_param.h	Wed Dec 18 12:55:21 2013
@@ -48,7 +48,7 @@
  * @author Akinobu LEE
  * @date   Fri Feb 11 02:52:52 2005
  *
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  * 
  */
 /*
@@ -81,6 +81,7 @@
   short veclen_alloc;		///< Allocated vector length of a sample
   unsigned int samplenum_alloc;	///< Alllocated number of samples
   BMALLOC_BASE *mroot;		///< Pointer for block memory allocation
+  boolean is_outprob;		///< TRUE if this is outprob vector
 } HTK_Param;
 
 /**
Index: julius4/libsent/include/sent/tcpip.h
diff -u julius4/libsent/include/sent/tcpip.h:1.6 julius4/libsent/include/sent/tcpip.h:1.7
--- julius4/libsent/include/sent/tcpip.h:1.6	Fri Jun 21 02:14:20 2013
+++ julius4/libsent/include/sent/tcpip.h	Wed Dec 18 12:55:21 2013
@@ -11,7 +11,7 @@
  * @author Akinobu LEE
  * @date   Sat Feb 12 12:26:15 2005
  *
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  * 
  */
 /*
@@ -45,6 +45,9 @@
 /// Default port number of A/D-in server (adinnet)
 #define         ADINNET_PORT 5530
 
+/// Default port number of feature server (vecin_net)
+#define         VECINNET_PORT 5531
+
 /// Default Host/unit name for NetAudio/DatLink input
 #define         NETAUDIO_DEVNAME "localhost:0"
 
@@ -69,6 +72,17 @@
 int close_socket(int sd);
 void cleanup_socket();
 
+/* vecin_net.c */
+boolean vecin_standby();
+boolean vecin_open();
+int vecin_get_configuration(int opcode);
+int vecin_read(float *vecbuf, int veclen);
+boolean vecin_close();
+boolean vecin_terminate();
+boolean vecin_pause();
+boolean vecin_resume();
+char *vecin_input_name();
+
 #ifdef __cplusplus
 }
 #endif



Julius-cvs メーリングリストの案内
アーカイブの一覧に戻る