From sumomo ¡÷ users.sourceforge.jp Sun Jan 5 16:01:01 2014 From: sumomo ¡÷ users.sourceforge.jp (sumomo ¡÷ users.sourceforge.jp) Date: Sun, 05 Jan 2014 16:01:01 +0900 Subject: [Julius-cvs 913] CVS update: julius4/adintool Message-ID: <1388905261.423670.19432.nullmailer@users.sourceforge.jp> Index: julius4/adintool/adintool.c diff -u julius4/adintool/adintool.c:1.19 julius4/adintool/adintool.c:1.20 --- julius4/adintool/adintool.c:1.19 Fri Dec 20 01:26:21 2013 +++ julius4/adintool/adintool.c Sun Jan 5 16:01:00 2014 @@ -35,7 +35,7 @@ * @author Akinobu LEE * @date Wed Mar 23 20:43:32 2005 * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * */ /* @@ -886,6 +886,7 @@ mfcc->valid = TRUE; param_alloc(mfcc->param, mfcc->f + 1, mfcc->param->veclen); memcpy(mfcc->param->parvec[mfcc->f], mfcc->tmpmfcc, sizeof(VECT) * mfcc->param->veclen); +#if 0 { int i; for (i = 0; i < vecnet_veclen; i++) { @@ -893,6 +894,7 @@ } printf("\n"); } +#endif /* send 1 frame */ for (j=0;jtmpmfcc, sizeof(VECT) * vecnet_veclen); From sumomo ¡÷ users.sourceforge.jp Sun Jan 5 16:01:01 2014 From: sumomo ¡÷ users.sourceforge.jp (sumomo ¡÷ users.sourceforge.jp) Date: Sun, 05 Jan 2014 16:01:01 +0900 Subject: [Julius-cvs 914] CVS update: julius4/julius Message-ID: <1388905261.525009.19442.nullmailer@users.sourceforge.jp> Index: julius4/julius/main.c diff -u julius4/julius/main.c:1.7 julius4/julius/main.c:1.8 --- julius4/julius/main.c:1.7 Wed Dec 18 12:55:20 2013 +++ julius4/julius/main.c Sun Jan 5 16:01:01 2014 @@ -12,7 +12,7 @@ * @author Akinobu Lee * @date Wed May 18 15:02:55 2005 * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * */ /* @@ -194,7 +194,7 @@ /* initialize and standby the specified audio input source */ /* for microphone or other threaded input, ad-in thread starts here */ - if (j_adin_init(recog) == FALSE) return; + if (j_adin_init(recog) == FALSE) return -1; /* output system information to log */ j_recog_info(recog); From sumomo ¡÷ users.sourceforge.jp Sun Jan 5 16:01:01 2014 From: sumomo ¡÷ users.sourceforge.jp (sumomo ¡÷ users.sourceforge.jp) Date: Sun, 05 Jan 2014 16:01:01 +0900 Subject: [Julius-cvs 915] CVS update: julius4/libsent/src/wav2mfcc Message-ID: <1388905261.679759.19485.nullmailer@users.sourceforge.jp> Index: julius4/libsent/src/wav2mfcc/wav2mfcc-pipe.c diff -u julius4/libsent/src/wav2mfcc/wav2mfcc-pipe.c:1.10 julius4/libsent/src/wav2mfcc/wav2mfcc-pipe.c:1.11 --- julius4/libsent/src/wav2mfcc/wav2mfcc-pipe.c:1.10 Thu Dec 5 12:43:14 2013 +++ julius4/libsent/src/wav2mfcc/wav2mfcc-pipe.c Sun Jan 5 16:01:01 2014 @@ -20,7 +20,7 @@ * @author Akinobu LEE * @date Thu Feb 17 18:12:30 2005 * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * */ /* @@ -547,12 +547,13 @@ break; case 1: len = atof(p); - if (len != c->veclen) { + if (len != c->veclen && len != c->mfcc_dim) { jlog("Error: wav2mfcc-pipe: cepstral dimension mismatch\n"); - jlog("Error: wav2mfcc-pipe: process = %d, file = %d\n", c->veclen, len); + jlog("Error: wav2mfcc-pipe: process = %d (%d), file = %d\n", c->veclen, c->mfcc_dim, len); free(buf); fclose_readfile(fp); return(FALSE); } + for (d = 0; d < c->veclen; d++) c->cmean_init[d] = 0.0; d = 0; mode = 2; break; @@ -662,6 +663,7 @@ } fprintf(fp, " <>\n"); + /* unlike HTK, full mean will be written for variance estimation */ fprintf(fp, " %d\n", c->veclen); for(d=0;dveclen;d++) { fprintf(fp, " %e", c->cmean_init[d]); From sumomo ¡÷ users.sourceforge.jp Sun Jan 5 16:01:01 2014 From: sumomo ¡÷ users.sourceforge.jp (sumomo ¡÷ users.sourceforge.jp) Date: Sun, 05 Jan 2014 16:01:01 +0900 Subject: [Julius-cvs 916] CVS update: julius4/libsent/src/adin Message-ID: <1388905261.599646.19458.nullmailer@users.sourceforge.jp> Index: julius4/libsent/src/adin/adin_mic_darwin_coreaudio.c diff -u julius4/libsent/src/adin/adin_mic_darwin_coreaudio.c:1.8 julius4/libsent/src/adin/adin_mic_darwin_coreaudio.c:1.9 --- julius4/libsent/src/adin/adin_mic_darwin_coreaudio.c:1.8 Wed Dec 4 19:13:00 2013 +++ julius4/libsent/src/adin/adin_mic_darwin_coreaudio.c Sun Jan 5 16:01:01 2014 @@ -29,7 +29,7 @@ * @author Masatomo Hashimoto * @date Wed Oct 12 11:31:27 2005 * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * */ @@ -44,7 +44,7 @@ * */ -/* $Id: adin_mic_darwin_coreaudio.c,v 1.8 2013/12/04 10:13:00 sumomo Exp $ */ +/* $Id: adin_mic_darwin_coreaudio.c,v 1.9 2014/01/05 07:01:01 sumomo Exp $ */ #include #include @@ -654,16 +654,6 @@ return providedSamples; } -void adin_mic_pause() { - OSStatus status; - - if (CoreAudioHasInputDevice && CoreAudioRecordStarted) { - status = AudioOutputUnitStop(InputUnit); - CoreAudioRecordStarted = FALSE; - } - return; -} - /** * Function to pause audio input (wait for buffer flush) * @@ -672,7 +662,13 @@ boolean adin_mic_pause() { - return TRUE; + OSStatus status = 0; + + if (CoreAudioHasInputDevice && CoreAudioRecordStarted) { + status = AudioOutputUnitStop(InputUnit); + CoreAudioRecordStarted = FALSE; + } + return (status == 0) ? TRUE : FALSE; } /** From sumomo ¡÷ users.sourceforge.jp Wed Jan 15 14:31:08 2014 From: sumomo ¡÷ users.sourceforge.jp (sumomo ¡÷ users.sourceforge.jp) Date: Wed, 15 Jan 2014 14:31:08 +0900 Subject: [Julius-cvs 917] CVS update: julius4/adintool Message-ID: <1389763868.008020.20963.nullmailer@users.sourceforge.jp> Index: julius4/adintool/adintool.c diff -u julius4/adintool/adintool.c:1.20 julius4/adintool/adintool.c:1.21 --- julius4/adintool/adintool.c:1.20 Sun Jan 5 16:01:00 2014 +++ julius4/adintool/adintool.c Wed Jan 15 14:31:07 2014 @@ -35,7 +35,7 @@ * @author Akinobu LEE * @date Wed Mar 23 20:43:32 2005 * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * */ /* @@ -803,6 +803,7 @@ } if (recog->jconf->input.type == INPUT_WAVEFORM) { if (RealTimeInit(recog) == FALSE) { + fprintf(stderr, "Error: failed to initialize feature extraction module\n"); return FALSE; } } @@ -899,8 +900,8 @@ for (j=0;jtmpmfcc, sizeof(VECT) * vecnet_veclen); } + mfcc->f++; } - mfcc->f++; } /* shift window */ memmove(r->window, &(r->window[recog->jconf->input.frameshift]), sizeof(SP16) * (r->windowlen - recog->jconf->input.frameshift)); From sumomo ¡÷ users.sourceforge.jp Wed Jan 15 14:31:08 2014 From: sumomo ¡÷ users.sourceforge.jp (sumomo ¡÷ users.sourceforge.jp) Date: Wed, 15 Jan 2014 14:31:08 +0900 Subject: [Julius-cvs 918] CVS update: julius4/libsent/src/wav2mfcc Message-ID: <1389763868.264747.21009.nullmailer@users.sourceforge.jp> Index: julius4/libsent/src/wav2mfcc/wav2mfcc-pipe.c diff -u julius4/libsent/src/wav2mfcc/wav2mfcc-pipe.c:1.11 julius4/libsent/src/wav2mfcc/wav2mfcc-pipe.c:1.12 --- julius4/libsent/src/wav2mfcc/wav2mfcc-pipe.c:1.11 Sun Jan 5 16:01:01 2014 +++ julius4/libsent/src/wav2mfcc/wav2mfcc-pipe.c Wed Jan 15 14:31:08 2014 @@ -20,7 +20,7 @@ * @author Akinobu LEE * @date Thu Feb 17 18:12:30 2005 * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * */ /* @@ -47,6 +47,8 @@ #include #include +#define MAXBUFLEN 4096 ///< Maximum length of a line in the input + /***********************************************************************/ /** * Allocate a new delta cycle buffer. @@ -533,9 +535,9 @@ int d, dv, len; jlog("Stat: wav2mfcc-pipe: reading HTK-format cepstral vectors\n"); - buf = (char *)mymalloc(MAXLINELEN); + buf = (char *)mymalloc(MAXBUFLEN); mode = 0; - while(getl(buf, MAXLINELEN, fp) != NULL) { + while(getl(buf, MAXBUFLEN, fp) != NULL) { for (p = mystrtok_quote(buf, "<> \t\r\n"); p; p = mystrtok_quote(NULL, "<> \t\r\n")) { switch(mode){ case 0: @@ -666,15 +668,14 @@ /* unlike HTK, full mean will be written for variance estimation */ fprintf(fp, " %d\n", c->veclen); for(d=0;dveclen;d++) { - fprintf(fp, " %e", c->cmean_init[d]); + fprintf(fp, " %e\n", c->cmean_init[d]); } if (c->var) { - fprintf(fp, "\n %d\n", c->veclen); + fprintf(fp, " %d\n", c->veclen); for(d=0;dveclen;d++) { - fprintf(fp, " %e", c->cvar_init[d]); + fprintf(fp, " %e\n", c->cvar_init[d]); } } - fprintf(fp, "\n"); fclose_writefile(fp); From sumomo ¡÷ users.sourceforge.jp Wed Jan 15 14:31:08 2014 From: sumomo ¡÷ users.sourceforge.jp (sumomo ¡÷ users.sourceforge.jp) Date: Wed, 15 Jan 2014 14:31:08 +0900 Subject: [Julius-cvs 919] CVS update: julius4/libjulius/src Message-ID: <1389763868.174807.20991.nullmailer@users.sourceforge.jp> Index: julius4/libjulius/src/realtime-1stpass.c diff -u julius4/libjulius/src/realtime-1stpass.c:1.13 julius4/libjulius/src/realtime-1stpass.c:1.14 --- julius4/libjulius/src/realtime-1stpass.c:1.13 Wed Dec 18 12:55:20 2013 +++ julius4/libjulius/src/realtime-1stpass.c Wed Jan 15 14:31:08 2014 @@ -111,7 +111,7 @@ * @author Akinobu Lee * @date Tue Aug 23 11:44:14 2005 * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * */ /* @@ -274,7 +274,8 @@ if (mfcc->cmn.load_filename) { if (para->cmn) { if ((mfcc->cmn.loaded = CMN_load_from_file(mfcc->cmn.wrk, mfcc->cmn.load_filename))== FALSE) { - jlog("WARNING: failed to read initial cepstral mean from \"%s\", do flat start\n", mfcc->cmn.load_filename); + jlog("ERROR: failed to read initial cepstral mean from \"%s\", do flat start\n", mfcc->cmn.load_filename); + return FALSE; } } else { jlog("WARNING: CMN not required on AM, file \"%s\" ignored\n", mfcc->cmn.load_filename); From sumomo ¡÷ users.sourceforge.jp Wed Jan 15 14:45:43 2014 From: sumomo ¡÷ users.sourceforge.jp (sumomo ¡÷ users.sourceforge.jp) Date: Wed, 15 Jan 2014 14:45:43 +0900 Subject: [Julius-cvs 920] CVS update: julius4 Message-ID: <1389764743.565540.592.nullmailer@users.sourceforge.jp> Index: julius4/00readme-ja.txt diff -u julius4/00readme-ja.txt:1.21 julius4/00readme-ja.txt:1.22 --- julius4/00readme-ja.txt:1.21 Fri Dec 20 01:27:47 2013 +++ julius4/00readme-ja.txt Wed Jan 15 14:45:43 2014 @@ -4,6 +4,7 @@ Julius + (Rev 4.3.1 2014/01/15) (Rev 4.3 2013/12/25) (Rev 4.2.3 2013/06/30) (Rev 4.2.2 2012/08/01) Index: julius4/00readme.txt diff -u julius4/00readme.txt:1.19 julius4/00readme.txt:1.20 --- julius4/00readme.txt:1.19 Fri Dec 20 01:27:47 2013 +++ julius4/00readme.txt Wed Jan 15 14:45:43 2014 @@ -4,6 +4,7 @@ Julius + (Rev 4.3.1 2014/01/15) (Rev 4.3 2013/12/25) (Rev 4.2.3 2013/06/30) (Rev 4.2.2 2012/08/01) Index: julius4/Release-ja.txt diff -u julius4/Release-ja.txt:1.21 julius4/Release-ja.txt:1.22 --- julius4/Release-ja.txt:1.21 Fri Dec 20 01:27:47 2013 +++ julius4/Release-ja.txt Wed Jan 15 14:45:43 2014 @@ -1,3 +1,10 @@ +4.3.1 (2014.01.15) +=================== +?????+- OS X ?????????? +- adintool ????????????????+- "-cmnload" ?????????????????????? + 4.3 (2013.12.25) ================= ???? Index: julius4/Release.txt diff -u julius4/Release.txt:1.19 julius4/Release.txt:1.20 --- julius4/Release.txt:1.19 Fri Dec 20 01:27:47 2013 +++ julius4/Release.txt Wed Jan 15 14:45:43 2014 @@ -1,3 +1,10 @@ +4.3.1 (2014.01.15) +=================== +Fixed bugs: +- Compilation error on OS X. +- Unnecessary debug messages in adintool. +- Several bugs around reading / applying "-cmnload". + 4.3 (2013.12.25) ================= New features: From sumomo ¡÷ users.sourceforge.jp Thu Jan 16 14:41:04 2014 From: sumomo ¡÷ users.sourceforge.jp (sumomo ¡÷ users.sourceforge.jp) Date: Thu, 16 Jan 2014 14:41:04 +0900 Subject: [Julius-cvs 921] CVS update: julius4/libjulius Message-ID: <1389850864.816714.24249.nullmailer@users.sourceforge.jp> Index: julius4/libjulius/configure diff -u julius4/libjulius/configure:1.18 julius4/libjulius/configure:1.19 --- julius4/libjulius/configure:1.18 Fri Dec 20 01:28:46 2013 +++ julius4/libjulius/configure Thu Jan 16 14:41:03 2014 @@ -592,7 +592,7 @@ JULIUS_PRODUCTNAME=JuliusLib -JULIUS_VERSION=4.3 +JULIUS_VERSION=4.3.1 # Check whether --enable-pthread or --disable-pthread was given. Index: julius4/libjulius/configure.in diff -u julius4/libjulius/configure.in:1.20 julius4/libjulius/configure.in:1.21 --- julius4/libjulius/configure.in:1.20 Fri Dec 20 01:28:46 2013 +++ julius4/libjulius/configure.in Thu Jan 16 14:41:03 2014 @@ -4,7 +4,7 @@ dnl Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology dnl All rights reserved dnl -dnl $Id: configure.in,v 1.20 2013/12/19 16:28:46 sumomo Exp $ +dnl $Id: configure.in,v 1.21 2014/01/16 05:41:03 sumomo Exp $ dnl AC_INIT(src/search_bestfirst_main.c) @@ -12,7 +12,7 @@ AC_CONFIG_AUX_DIR(../support) JULIUS_PRODUCTNAME=JuliusLib -JULIUS_VERSION=4.3 +JULIUS_VERSION=4.3.1 dnl Checks for options From sumomo ¡÷ users.sourceforge.jp Thu Jan 16 14:41:06 2014 From: sumomo ¡÷ users.sourceforge.jp (sumomo ¡÷ users.sourceforge.jp) Date: Thu, 16 Jan 2014 14:41:06 +0900 Subject: [Julius-cvs 922] CVS update: julius4/support Message-ID: <1389850866.002845.24405.nullmailer@users.sourceforge.jp> Index: julius4/support/build-all.sh diff -u julius4/support/build-all.sh:1.15 julius4/support/build-all.sh:1.16 --- julius4/support/build-all.sh:1.15 Fri Dec 20 01:28:09 2013 +++ julius4/support/build-all.sh Thu Jan 16 14:41:05 2014 @@ -6,7 +6,7 @@ # # argument: any configure options except "--enable-setup=..." is allowed. # -JULIUS_VERSION=4.3 +JULIUS_VERSION=4.3.1 ###################################################################### From sumomo ¡÷ users.sourceforge.jp Thu Jan 16 14:41:05 2014 From: sumomo ¡÷ users.sourceforge.jp (sumomo ¡÷ users.sourceforge.jp) Date: Thu, 16 Jan 2014 14:41:05 +0900 Subject: [Julius-cvs 923] CVS update: julius4/libsent Message-ID: <1389850865.709329.24338.nullmailer@users.sourceforge.jp> Index: julius4/libsent/configure diff -u julius4/libsent/configure:1.36 julius4/libsent/configure:1.37 --- julius4/libsent/configure:1.36 Fri Dec 20 01:28:46 2013 +++ julius4/libsent/configure Thu Jan 16 14:41:05 2014 @@ -565,7 +565,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. -LIBSENT_VERSION=4.3 +LIBSENT_VERSION=4.3.1 # specify mic type # Check whether --with-mictype or --without-mictype was given. Index: julius4/libsent/configure.in diff -u julius4/libsent/configure.in:1.36 julius4/libsent/configure.in:1.37 --- julius4/libsent/configure.in:1.36 Fri Dec 20 01:28:46 2013 +++ julius4/libsent/configure.in Thu Jan 16 14:41:05 2014 @@ -3,7 +3,7 @@ dnl Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology dnl All rights reserved dnl -dnl $Id: configure.in,v 1.36 2013/12/19 16:28:46 sumomo Exp $ +dnl $Id: configure.in,v 1.37 2014/01/16 05:41:05 sumomo Exp $ dnl dnl Process this file with autoconf to produce a configure script. @@ -11,7 +11,7 @@ AC_CONFIG_HEADER(include/sent/config.h) AC_CONFIG_AUX_DIR(../support) -LIBSENT_VERSION=4.3 +LIBSENT_VERSION=4.3.1 dnl Checks for options # specify mic type From sumomo ¡÷ users.sourceforge.jp Fri Jan 24 01:05:51 2014 From: sumomo ¡÷ users.sourceforge.jp (sumomo ¡÷ users.sourceforge.jp) Date: Fri, 24 Jan 2014 01:05:51 +0900 Subject: [Julius-cvs 924] CVS update: julius4/adintool Message-ID: <1390493151.022092.23695.nullmailer@users.sourceforge.jp> Index: julius4/adintool/adintool.c diff -u julius4/adintool/adintool.c:1.21 julius4/adintool/adintool.c:1.22 --- julius4/adintool/adintool.c:1.21 Wed Jan 15 14:31:07 2014 +++ julius4/adintool/adintool.c Fri Jan 24 01:05:50 2014 @@ -35,7 +35,7 @@ * @author Akinobu LEE * @date Wed Mar 23 20:43:32 2005 * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * */ /* @@ -807,6 +807,8 @@ return FALSE; } } + + return TRUE; } int vecnet_send_data(int sd, void *buf, int bytes)