sumom****@users*****
sumom****@users*****
2013年 12月 4日 (水) 19:15:06 JST
Index: julius4/libjulius/src/instance.c
diff -u julius4/libjulius/src/instance.c:1.9 julius4/libjulius/src/instance.c:1.10
--- julius4/libjulius/src/instance.c:1.9 Fri Jun 21 02:14:20 2013
+++ julius4/libjulius/src/instance.c Wed Dec 4 19:15:06 2013
@@ -12,7 +12,7 @@
* @author Akinobu Lee
* @date Sun Oct 28 18:06:20 2007
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
*/
/*
@@ -58,7 +58,7 @@
mfcc->htk_loaded = (amconf->analysis.para_htk.loaded == 1) ? TRUE : FALSE;
mfcc->wrk = WMP_work_new(mfcc->para);
if (mfcc->wrk == NULL) {
- jlog("ERROR: j_mfcccalc_new: failed to initialize MFCC computation\n");
+ jlog("ERROR: j_mfcccalc_new: failed to initialize feature computation\n");
return NULL;
}
mfcc->cmn.load_filename = amconf->analysis.cmnload_filename;
Index: julius4/libjulius/src/m_fusion.c
diff -u julius4/libjulius/src/m_fusion.c:1.26 julius4/libjulius/src/m_fusion.c:1.27
--- julius4/libjulius/src/m_fusion.c:1.26 Fri Jun 21 02:14:20 2013
+++ julius4/libjulius/src/m_fusion.c Wed Dec 4 19:15:06 2013
@@ -20,7 +20,7 @@
* @author Akinobu Lee
* @date Thu May 12 13:31:47 2005
*
- * $Revision: 1.26 $
+ * $Revision: 1.27 $
*
*/
/*
@@ -104,8 +104,13 @@
if (jconf->input.type == INPUT_WAVEFORM) {
/* Decode parameter extraction type according to the training
parameter type in the header of the given acoustic HMM */
- if ((hmminfo->opt.param_type & F_BASEMASK) != F_MFCC) {
- jlog("ERROR: m_fusion: for direct speech input, only HMM trained by MFCC is supported\n");
+ switch(hmminfo->opt.param_type & F_BASEMASK) {
+ case F_MFCC:
+ case F_FBANK:
+ case F_MELSPEC:
+ break;
+ default:
+ jlog("ERROR: m_fusion: for direct speech input, only HMM trained by MFCC ior filterbank is supported\n");
hmminfo_free(hmminfo);
return NULL;
}
@@ -236,8 +241,13 @@
if (jconf->input.type == INPUT_WAVEFORM) {
/* Decode parameter extraction type according to the training
parameter type in the header of the given acoustic HMM */
- if ((gmm->opt.param_type & F_BASEMASK) != F_MFCC) {
- jlog("ERROR: m_fusion: for direct speech input, only GMM trained by MFCC is supported\n");
+ switch(gmm->opt.param_type & F_BASEMASK) {
+ case F_MFCC:
+ case F_FBANK:
+ case F_MELSPEC:
+ break;
+ default:
+ jlog("ERROR: m_fusion: for direct speech input, only GMM trained by MFCC ior filterbank is supported\n");
hmminfo_free(gmm);
return NULL;
}
Index: julius4/libjulius/src/m_usage.c
diff -u julius4/libjulius/src/m_usage.c:1.23 julius4/libjulius/src/m_usage.c:1.24
--- julius4/libjulius/src/m_usage.c:1.23 Fri Jun 21 02:14:20 2013
+++ julius4/libjulius/src/m_usage.c Wed Dec 4 19:15:06 2013
@@ -12,7 +12,7 @@
* @author Akinobu Lee
* @date Fri May 13 15:04:34 2005
*
- * $Revision: 1.23 $
+ * $Revision: 1.24 $
*
*/
/*
@@ -62,7 +62,7 @@
fprintf(fp, "\n--- Global Options -----------------------------------------------\n");
fprintf(fp, "\n Speech Input:\n");
- fprintf(fp, " (Can extract only MFCC based features from waveform)\n");
+ fprintf(fp, " (Can extract MFCC/FBANK/MELSPEC features from waveform)\n");
fprintf(fp, " [-input devname] input source (default = htkparam)\n");
fprintf(fp, " htkparam/mfcfile HTK parameter file\n");
fprintf(fp, " file/rawfile waveform file (%s)\n", SUPPORTED_WAVEFILE_FORMAT);
Index: julius4/libjulius/src/realtime-1stpass.c
diff -u julius4/libjulius/src/realtime-1stpass.c:1.11 julius4/libjulius/src/realtime-1stpass.c:1.12
--- julius4/libjulius/src/realtime-1stpass.c:1.11 Fri Jun 21 02:14:20 2013
+++ julius4/libjulius/src/realtime-1stpass.c Wed Dec 4 19:15:06 2013
@@ -111,7 +111,7 @@
* @author Akinobu Lee
* @date Tue Aug 23 11:44:14 2005
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
*/
/*
@@ -164,7 +164,7 @@
/* これから計算されるパラメータの型をヘッダに設定 */
/* set header types */
- mfcc->param->header.samptype = F_MFCC;
+ mfcc->param->header.samptype = para->basetype;
if (para->delta) mfcc->param->header.samptype |= F_DELTA;
if (para->acc) mfcc->param->header.samptype |= F_ACCL;
if (para->energy) mfcc->param->header.samptype |= F_ENERGY;
Index: julius4/libjulius/src/wav2mfcc.c
diff -u julius4/libjulius/src/wav2mfcc.c:1.5 julius4/libjulius/src/wav2mfcc.c:1.6
--- julius4/libjulius/src/wav2mfcc.c:1.5 Fri Jun 21 02:14:20 2013
+++ julius4/libjulius/src/wav2mfcc.c Wed Dec 4 19:15:06 2013
@@ -40,7 +40,7 @@
* @author Akinobu Lee
* @date Sun Sep 18 19:40:34 2005
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
*/
/*
@@ -143,7 +143,7 @@
/* make MFCC from speech data */
if (Wav2MFCC(speech, mfcc->param->parvec, para, speechlen, mfcc->wrk) == FALSE) {
- jlog("ERROR: failed to compute MFCC from input speech\n");
+ jlog("ERROR: failed to compute features from input speech\n");
if (mfcc->frontend.sscalc) {
free(mfcc->frontend.ssbuf);
mfcc->frontend.ssbuf = NULL;