Menu
▾
▴
hts-engine-cvs — For CVS.
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(9) |
Aug
(4) |
Sep
(6) |
Oct
|
Nov
(1) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(1) |
Feb
(12) |
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
(3) |
Dec
(16) |
| 2010 |
Jan
(2) |
Feb
(2) |
Mar
|
Apr
(10) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
(21) |
Nov
|
Dec
(19) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(11) |
| 2012 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
(2) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(10) |
| 2013 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
(1) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(11) |
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Keiichiro O. <ur...@us...> - 2017-07-25 14:28:30
|
Update of /cvsroot/hts-engine/hts_engine_API/src/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13672/lib Modified Files: HTS_model.c Log Message: fix a self-comparison bug suggested by dcb314 Index: HTS_model.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_model.c,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** HTS_model.c 21 Dec 2015 01:19:28 -0000 1.29 --- HTS_model.c 25 Jul 2017 14:28:28 -0000 1.30 *************** *** 1166,1170 **** error = TRUE; for (j = 0; j < ms->num_streams; j++) ! if (is_msd[j] != is_msd[j]) error = TRUE; for (j = 0; j < ms->num_streams; j++) --- 1166,1170 ---- error = TRUE; for (j = 0; j < ms->num_streams; j++) ! if (is_msd[j] != temp_is_msd[j]) error = TRUE; for (j = 0; j < ms->num_streams; j++) |
|
From: Keiichiro O. <ur...@us...> - 2015-12-23 08:18:39
|
Update of /cvsroot/hts-engine/hts_engine_API/src/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4592/lib Modified Files: HTS_sstream.c Log Message: add label file checker. Index: HTS_sstream.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_sstream.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** HTS_sstream.c 21 Dec 2015 01:19:28 -0000 1.25 --- HTS_sstream.c 23 Dec 2015 08:18:37 -0000 1.26 *************** *** 182,185 **** --- 182,188 ---- size_t next_state; + if (HTS_Label_get_size(label) == 0) + return FALSE; + /* check interpolation weights */ for (i = 0, temp = 0.0; i < HTS_ModelSet_get_nvoices(ms); i++) |
|
From: Keiichiro O. <ur...@us...> - 2015-12-21 01:19:30
|
Update of /cvsroot/hts-engine/hts_engine_API/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3981 Modified Files: COPYING NEWS README configure.ac Log Message: update to version 1.10 Index: README =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/README,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** README 1 Dec 2014 02:05:25 -0000 1.22 --- README 21 Dec 2015 01:19:27 -0000 1.23 *************** *** 1,5 **** =============================================================================== ! The HMM-Based Speech Synthesis Engine "hts_engine API" version 1.09 ! release December 25, 2014 --- 1,5 ---- =============================================================================== ! The HMM-Based Speech Synthesis Engine "hts_engine API" version 1.10 ! release December 25, 2015 *************** *** 26,30 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 26,30 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 116,120 **** (Design and Development, Main Maintainer) Kei Hashimoto http://www.sp.nitech.ac.jp/~bonanza/ - Sayaka Shiota http://www.sp.nitech.ac.jp/~sayaka/ Shinji Takaki http://www.sp.nitech.ac.jp/~k-prr44/ Heiga Zen --- 116,119 ---- Index: NEWS =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/NEWS,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** NEWS 2 Dec 2014 03:42:43 -0000 1.12 --- NEWS 21 Dec 2015 01:19:27 -0000 1.13 *************** *** 1,2 **** --- 1,5 ---- + Version 1.10: + * bug fixes. + Version 1.09: * add '-g' option to change volume. Index: configure.ac =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/configure.ac,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** configure.ac 11 Dec 2014 10:01:10 -0000 1.17 --- configure.ac 21 Dec 2015 01:19:27 -0000 1.18 *************** *** 3,9 **** AC_PREREQ(2.59) ! AC_INIT(hts_engine_API, 1.09, hts...@li..., hts_engine_API) AC_CONFIG_AUX_DIR([config]) ! AC_COPYRIGHT(Copyright 2001-2014 Nagoya Institute of Technology) AC_COPYRIGHT(Copyright 2001-2008 Tokyo Institute of Technology) AM_INIT_AUTOMAKE --- 3,9 ---- AC_PREREQ(2.59) ! AC_INIT(hts_engine_API, 1.10, hts...@li..., hts_engine_API) AC_CONFIG_AUX_DIR([config]) ! AC_COPYRIGHT(Copyright 2001-2015 Nagoya Institute of Technology) AC_COPYRIGHT(Copyright 2001-2008 Tokyo Institute of Technology) AM_INIT_AUTOMAKE Index: COPYING =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/COPYING,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** COPYING 1 Dec 2014 02:05:25 -0000 1.9 --- COPYING 21 Dec 2015 01:19:27 -0000 1.10 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2015 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ |
|
From: Keiichiro O. <ur...@us...> - 2015-08-26 02:22:49
|
Update of /cvsroot/hts-engine/hts_engine_API/src/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6299/lib Modified Files: HTS_engine.c HTS_hidden.h HTS_model.c HTS_sstream.c Log Message: fix a bug of interpolation weights: reported by Martin Sulir. Index: HTS_model.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_model.c,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** HTS_model.c 1 Dec 2014 02:05:26 -0000 1.27 --- HTS_model.c 26 Aug 2015 02:22:46 -0000 1.28 *************** *** 1641,1645 **** /* HTS_ModelSet_get_parameter: get parameter using interpolation weight */ ! void HTS_ModelSet_get_parameter(HTS_ModelSet * ms, size_t stream_index, size_t state_index, const char *string, const double *iw, double *mean, double *vari, double *msd) { size_t i; --- 1641,1645 ---- /* HTS_ModelSet_get_parameter: get parameter using interpolation weight */ ! void HTS_ModelSet_get_parameter(HTS_ModelSet * ms, size_t stream_index, size_t state_index, const char *string, const double *const *iw, double *mean, double *vari, double *msd) { size_t i; *************** *** 1654,1659 **** for (i = 0; i < ms->num_voices; i++) ! if (iw[i] != 0.0) ! HTS_Model_add_parameter(&ms->stream[i][stream_index], state_index, string, mean, vari, msd, iw[i]); } --- 1654,1659 ---- for (i = 0; i < ms->num_voices; i++) ! if (iw[i][stream_index] != 0.0) ! HTS_Model_add_parameter(&ms->stream[i][stream_index], state_index, string, mean, vari, msd, iw[i][stream_index]); } *************** *** 1665,1669 **** /* HTS_ModelSet_get_gv: get GV using interpolation weight */ ! void HTS_ModelSet_get_gv(HTS_ModelSet * ms, size_t stream_index, const char *string, const double *iw, double *mean, double *vari) { size_t i; --- 1665,1669 ---- /* HTS_ModelSet_get_gv: get GV using interpolation weight */ ! void HTS_ModelSet_get_gv(HTS_ModelSet * ms, size_t stream_index, const char *string, const double *const *iw, double *mean, double *vari) { size_t i; *************** *** 1675,1680 **** } for (i = 0; i < ms->num_voices; i++) ! if (iw[i] != 0.0) ! HTS_Model_add_parameter(&ms->gv[i][stream_index], 2, string, mean, vari, NULL, iw[i]); } --- 1675,1680 ---- } for (i = 0; i < ms->num_voices; i++) ! if (iw[i][stream_index] != 0.0) ! HTS_Model_add_parameter(&ms->gv[i][stream_index], 2, string, mean, vari, NULL, iw[i][stream_index]); } Index: HTS_hidden.h =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_hidden.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** HTS_hidden.h 1 Dec 2014 02:05:26 -0000 1.23 --- HTS_hidden.h 26 Aug 2015 02:22:46 -0000 1.24 *************** *** 236,245 **** /* HTS_ModelSet_get_parameter: get parameter using interpolation weight */ ! void HTS_ModelSet_get_parameter(HTS_ModelSet * ms, size_t stream_index, size_t state_index, const char *string, const double *iw, double *mean, double *vari, double *msd); void HTS_ModelSet_get_gv_index(HTS_ModelSet * ms, size_t voice_index, size_t stream_index, const char *string, size_t * tree_index, size_t * pdf_index); /* HTS_ModelSet_get_gv: get GV using interpolation weight */ ! void HTS_ModelSet_get_gv(HTS_ModelSet * ms, size_t stream_index, const char *string, const double *iw, double *mean, double *vari); /* HTS_ModelSet_clear: free model set */ --- 236,245 ---- /* HTS_ModelSet_get_parameter: get parameter using interpolation weight */ ! void HTS_ModelSet_get_parameter(HTS_ModelSet * ms, size_t stream_index, size_t state_index, const char *string, const double *const *iw, double *mean, double *vari, double *msd); void HTS_ModelSet_get_gv_index(HTS_ModelSet * ms, size_t voice_index, size_t stream_index, const char *string, size_t * tree_index, size_t * pdf_index); /* HTS_ModelSet_get_gv: get GV using interpolation weight */ ! void HTS_ModelSet_get_gv(HTS_ModelSet * ms, size_t stream_index, const char *string, const double *const *iw, double *mean, double *vari); /* HTS_ModelSet_clear: free model set */ Index: HTS_sstream.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_sstream.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** HTS_sstream.c 1 Dec 2014 02:05:26 -0000 1.23 --- HTS_sstream.c 26 Aug 2015 02:22:47 -0000 1.24 *************** *** 195,215 **** for (i = 0; i < HTS_ModelSet_get_nstream(ms); i++) { for (j = 0, temp = 0.0; j < HTS_ModelSet_get_nvoices(ms); j++) ! temp += parameter_iw[i][j]; if (temp == 0.0) { return FALSE; } else if (temp != 1.0) { for (j = 0; j < HTS_ModelSet_get_nvoices(ms); j++) ! if (parameter_iw[i][j] != 0.0) ! parameter_iw[i][j] /= temp; } if (HTS_ModelSet_use_gv(ms, i)) { for (j = 0, temp = 0.0; j < HTS_ModelSet_get_nvoices(ms); j++) ! temp += gv_iw[i][j]; if (temp == 0.0) return FALSE; else if (temp != 1.0) for (j = 0; j < HTS_ModelSet_get_nvoices(ms); j++) ! if (gv_iw[i][j] != 0.0) ! gv_iw[i][j] /= temp; } } --- 195,215 ---- for (i = 0; i < HTS_ModelSet_get_nstream(ms); i++) { for (j = 0, temp = 0.0; j < HTS_ModelSet_get_nvoices(ms); j++) ! temp += parameter_iw[j][i]; if (temp == 0.0) { return FALSE; } else if (temp != 1.0) { for (j = 0; j < HTS_ModelSet_get_nvoices(ms); j++) ! if (parameter_iw[j][i] != 0.0) ! parameter_iw[j][i] /= temp; } if (HTS_ModelSet_use_gv(ms, i)) { for (j = 0, temp = 0.0; j < HTS_ModelSet_get_nvoices(ms); j++) ! temp += gv_iw[j][i]; if (temp == 0.0) return FALSE; else if (temp != 1.0) for (j = 0; j < HTS_ModelSet_get_nvoices(ms); j++) ! if (gv_iw[j][i] != 0.0) ! gv_iw[j][i] /= temp; } } *************** *** 288,294 **** sst = &sss->sstream[k]; if (sst->msd) ! HTS_ModelSet_get_parameter(ms, k, j, HTS_Label_get_string(label, i), parameter_iw[k], sst->mean[state], sst->vari[state], &sst->msd[state]); else ! HTS_ModelSet_get_parameter(ms, k, j, HTS_Label_get_string(label, i), parameter_iw[k], sst->mean[state], sst->vari[state], NULL); } state++; --- 288,294 ---- sst = &sss->sstream[k]; if (sst->msd) ! HTS_ModelSet_get_parameter(ms, k, j, HTS_Label_get_string(label, i), (const double *const *) parameter_iw, sst->mean[state], sst->vari[state], &sst->msd[state]); else ! HTS_ModelSet_get_parameter(ms, k, j, HTS_Label_get_string(label, i), (const double *const *) parameter_iw, sst->mean[state], sst->vari[state], NULL); } state++; *************** *** 323,327 **** sst->gv_mean = (double *) HTS_calloc(sst->vector_length, sizeof(double)); sst->gv_vari = (double *) HTS_calloc(sst->vector_length, sizeof(double)); ! HTS_ModelSet_get_gv(ms, i, HTS_Label_get_string(label, 0), gv_iw[i], sst->gv_mean, sst->gv_vari); } else { sst->gv_mean = NULL; --- 323,327 ---- sst->gv_mean = (double *) HTS_calloc(sst->vector_length, sizeof(double)); sst->gv_vari = (double *) HTS_calloc(sst->vector_length, sizeof(double)); ! HTS_ModelSet_get_gv(ms, i, HTS_Label_get_string(label, 0), (const double *const *) gv_iw, sst->gv_mean, sst->gv_vari); } else { sst->gv_mean = NULL; Index: HTS_engine.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_engine.c,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** HTS_engine.c 1 Dec 2014 02:05:26 -0000 1.34 --- HTS_engine.c 26 Aug 2015 02:22:46 -0000 1.35 *************** *** 152,165 **** for (i = 0; i < num_voices; i++) engine->condition.duration_iw[i] = average_weight; ! engine->condition.parameter_iw = (double **) HTS_calloc(nstream, sizeof(double *)); ! for (i = 0; i < nstream; i++) { ! engine->condition.parameter_iw[i] = (double *) HTS_calloc(num_voices, sizeof(double)); ! for (j = 0; j < num_voices; j++) engine->condition.parameter_iw[i][j] = average_weight; } ! engine->condition.gv_iw = (double **) HTS_calloc(nstream, sizeof(double *)); ! for (i = 0; i < nstream; i++) { ! engine->condition.gv_iw[i] = (double *) HTS_calloc(num_voices, sizeof(double)); ! for (j = 0; j < num_voices; j++) engine->condition.gv_iw[i][j] = average_weight; } --- 152,165 ---- for (i = 0; i < num_voices; i++) engine->condition.duration_iw[i] = average_weight; ! engine->condition.parameter_iw = (double **) HTS_calloc(num_voices, sizeof(double *)); ! for (i = 0; i < num_voices; i++) { ! engine->condition.parameter_iw[i] = (double *) HTS_calloc(nstream, sizeof(double)); ! for (j = 0; j < nstream; j++) engine->condition.parameter_iw[i][j] = average_weight; } ! engine->condition.gv_iw = (double **) HTS_calloc(num_voices, sizeof(double *)); ! for (i = 0; i < num_voices; i++) { ! engine->condition.gv_iw[i] = (double *) HTS_calloc(nstream, sizeof(double)); ! for (j = 0; j < nstream; j++) engine->condition.gv_iw[i][j] = average_weight; } *************** *** 573,582 **** fprintf(fp, " Interpolation size -> %8lu\n", (unsigned long) HTS_ModelSet_get_nvoices(ms)); for (j = 0, temp = 0.0; j < HTS_ModelSet_get_nvoices(ms); j++) ! temp += condition->parameter_iw[i][j]; for (j = 0; j < HTS_ModelSet_get_nvoices(ms); j++) ! if (condition->parameter_iw[i][j] != 0.0) ! condition->parameter_iw[i][j] /= temp; for (j = 0; j < HTS_ModelSet_get_nvoices(ms); j++) ! fprintf(fp, " Interpolation weight[%2lu] -> %8.0f(%%)\n", (unsigned long) j, (float) (100 * condition->parameter_iw[i][j])); /* MSD */ if (HTS_ModelSet_is_msd(ms, i)) { /* for MSD */ --- 573,582 ---- fprintf(fp, " Interpolation size -> %8lu\n", (unsigned long) HTS_ModelSet_get_nvoices(ms)); for (j = 0, temp = 0.0; j < HTS_ModelSet_get_nvoices(ms); j++) ! temp += condition->parameter_iw[j][i]; for (j = 0; j < HTS_ModelSet_get_nvoices(ms); j++) ! if (condition->parameter_iw[j][i] != 0.0) ! condition->parameter_iw[j][i] /= temp; for (j = 0; j < HTS_ModelSet_get_nvoices(ms); j++) ! fprintf(fp, " Interpolation weight[%2lu] -> %8.0f(%%)\n", (unsigned long) j, (float) (100 * condition->parameter_iw[j][i])); /* MSD */ if (HTS_ModelSet_is_msd(ms, i)) { /* for MSD */ *************** *** 593,602 **** /* interpolation */ for (j = 0, temp = 0.0; j < HTS_ModelSet_get_nvoices(ms); j++) ! temp += condition->gv_iw[i][j]; for (j = 0; j < HTS_ModelSet_get_nvoices(ms); j++) ! if (condition->gv_iw[i][j] != 0.0) ! condition->gv_iw[i][j] /= temp; for (j = 0; j < HTS_ModelSet_get_nvoices(ms); j++) ! fprintf(fp, " GV interpolation weight[%2lu] -> %8.0f(%%)\n", (unsigned long) j, (float) (100 * condition->gv_iw[i][j])); } else { fprintf(fp, " GV flag -> FALSE\n"); --- 593,602 ---- /* interpolation */ for (j = 0, temp = 0.0; j < HTS_ModelSet_get_nvoices(ms); j++) ! temp += condition->gv_iw[j][i]; for (j = 0; j < HTS_ModelSet_get_nvoices(ms); j++) ! if (condition->gv_iw[j][i] != 0.0) ! condition->gv_iw[j][i] /= temp; for (j = 0; j < HTS_ModelSet_get_nvoices(ms); j++) ! fprintf(fp, " GV interpolation weight[%2lu] -> %8.0f(%%)\n", (unsigned long) j, (float) (100 * condition->gv_iw[j][i])); } else { fprintf(fp, " GV flag -> FALSE\n"); *************** *** 773,782 **** HTS_free(engine->condition.gv_weight); if (engine->condition.parameter_iw != NULL) { ! for (i = 0; i < HTS_ModelSet_get_nstream(&engine->ms); i++) HTS_free(engine->condition.parameter_iw[i]); HTS_free(engine->condition.parameter_iw); } if (engine->condition.gv_iw != NULL) { ! for (i = 0; i < HTS_ModelSet_get_nstream(&engine->ms); i++) HTS_free(engine->condition.gv_iw[i]); HTS_free(engine->condition.gv_iw); --- 773,782 ---- HTS_free(engine->condition.gv_weight); if (engine->condition.parameter_iw != NULL) { ! for (i = 0; i < HTS_ModelSet_get_nvoices(&engine->ms); i++) HTS_free(engine->condition.parameter_iw[i]); HTS_free(engine->condition.parameter_iw); } if (engine->condition.gv_iw != NULL) { ! for (i = 0; i < HTS_ModelSet_get_nvoices(&engine->ms); i++) HTS_free(engine->condition.gv_iw[i]); HTS_free(engine->condition.gv_iw); |
|
From: Keiichiro O. <ur...@us...> - 2014-12-11 10:01:13
|
Update of /cvsroot/hts-engine/hts_engine_API/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30667 Modified Files: configure.ac Log Message: update autoconf setting Index: configure.ac =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/configure.ac,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** configure.ac 2 Dec 2014 02:54:07 -0000 1.16 --- configure.ac 11 Dec 2014 10:01:10 -0000 1.17 *************** *** 3,7 **** AC_PREREQ(2.59) ! AC_INIT(hts_engine_API, 1.09, hts...@li...) AC_CONFIG_AUX_DIR([config]) AC_COPYRIGHT(Copyright 2001-2014 Nagoya Institute of Technology) --- 3,7 ---- AC_PREREQ(2.59) ! AC_INIT(hts_engine_API, 1.09, hts...@li..., hts_engine_API) AC_CONFIG_AUX_DIR([config]) AC_COPYRIGHT(Copyright 2001-2014 Nagoya Institute of Technology) |
|
From: Keiichiro O. <ur...@us...> - 2014-12-02 03:42:46
|
Update of /cvsroot/hts-engine/hts_engine_API/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7126 Modified Files: NEWS Log Message: update news. Index: NEWS =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/NEWS,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** NEWS 10 Dec 2013 10:35:17 -0000 1.11 --- NEWS 2 Dec 2014 03:42:43 -0000 1.12 *************** *** 1,2 **** --- 1,8 ---- + Version 1.09: + * add '-g' option to change volume. + * add some functions to get fullcontext label format and version defined in HTS voice. + * support 64-bit Windows audio. + * bug fixes. + Version 1.08: * support 64-bit machine. |
|
From: Keiichiro O. <ur...@us...> - 2014-12-02 02:56:06
|
Update of /cvsroot/hts-engine/hts_engine_API/src/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4458/lib Modified Files: Makefile.am Log Message: modify makefiles for latest automake Index: Makefile.am =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 2 Dec 2014 02:54:08 -0000 1.4 --- Makefile.am 2 Dec 2014 02:56:04 -0000 1.5 *************** *** 2,6 **** EXTRA_DIST = Makefile.mak ! AM_CPPFLAGS = -I@top_srcdir@/include lib_LIBRARIES = libHTSEngine.a --- 2,6 ---- EXTRA_DIST = Makefile.mak ! AM_CPPFLAGS = -I @top_srcdir@/include lib_LIBRARIES = libHTSEngine.a |
|
From: Keiichiro O. <ur...@us...> - 2014-12-02 02:54:10
|
Update of /cvsroot/hts-engine/hts_engine_API/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4349 Modified Files: configure.ac Log Message: modify makefiles for latest automake Index: configure.ac =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/configure.ac,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** configure.ac 1 Dec 2014 02:05:25 -0000 1.15 --- configure.ac 2 Dec 2014 02:54:07 -0000 1.16 *************** *** 7,11 **** AC_COPYRIGHT(Copyright 2001-2014 Nagoya Institute of Technology) AC_COPYRIGHT(Copyright 2001-2008 Tokyo Institute of Technology) ! AM_INIT_AUTOMAKE(hts_engine_API, 1.09, nostdinc no-installinfo no-installman) # Checks for C compiler --- 7,11 ---- AC_COPYRIGHT(Copyright 2001-2014 Nagoya Institute of Technology) AC_COPYRIGHT(Copyright 2001-2008 Tokyo Institute of Technology) ! AM_INIT_AUTOMAKE # Checks for C compiler |
|
From: Keiichiro O. <ur...@us...> - 2014-12-01 02:05:28
|
Update of /cvsroot/hts-engine/hts_engine_API/src/include In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21715/include Modified Files: HTS_engine.h Log Message: update documents to ver 1.09 Index: HTS_engine.h =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/include/HTS_engine.h,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** HTS_engine.h 12 Nov 2014 02:31:24 -0000 1.42 --- HTS_engine.h 1 Dec 2014 02:05:25 -0000 1.43 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2014 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 76,80 **** /* copyright ------------------------------------------------------- */ ! #define HTS_COPYRIGHT "The HMM-Based Speech Synthesis Engine \"hts_engine API\"\nVersion 1.08 (http://hts-engine.sourceforge.net/)\nCopyright (C) 2001-2013 Nagoya Institute of Technology\n 2001-2008 Tokyo Institute of Technology\nAll rights reserved.\n" /* audio ----------------------------------------------------------- */ --- 76,80 ---- /* copyright ------------------------------------------------------- */ ! #define HTS_COPYRIGHT "The HMM-Based Speech Synthesis Engine \"hts_engine API\"\nVersion 1.09 (http://hts-engine.sourceforge.net/)\nCopyright (C) 2001-2014 Nagoya Institute of Technology\n 2001-2008 Tokyo Institute of Technology\nAll rights reserved.\n" /* audio ----------------------------------------------------------- */ |
|
From: Keiichiro O. <ur...@us...> - 2014-11-12 02:31:27
|
Update of /cvsroot/hts-engine/hts_engine_API/src/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29829/lib Modified Files: HTS_engine.c HTS_hidden.h HTS_model.c Log Message: add label-check functions. Index: HTS_engine.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_engine.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** HTS_engine.c 10 Dec 2013 10:31:29 -0000 1.32 --- HTS_engine.c 12 Nov 2014 02:31:25 -0000 1.33 *************** *** 394,397 **** --- 394,409 ---- } + /* HTS_Engine_get_fullcontext_label_format: get full context label format */ + const char *HTS_Engine_get_fullcontext_label_format(HTS_Engine * engine) + { + return HTS_ModelSet_get_fullcontext_label_format(&engine->ms); + } + + /* HTS_Engine_get_fullcontext_label_version: get full context label version */ + const char *HTS_Engine_get_fullcontext_label_version(HTS_Engine * engine) + { + return HTS_ModelSet_get_fullcontext_label_version(&engine->ms); + } + /* HTS_Engine_get_total_frame: get total number of frame */ size_t HTS_Engine_get_total_frame(HTS_Engine * engine) Index: HTS_hidden.h =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_hidden.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** HTS_hidden.h 12 Nov 2014 02:24:31 -0000 1.21 --- HTS_hidden.h 12 Nov 2014 02:31:25 -0000 1.22 *************** *** 190,193 **** --- 190,199 ---- size_t HTS_ModelSet_get_nstate(HTS_ModelSet * ms); + /* HTS_Engine_get_fullcontext_label_format: get full-context label format */ + const char *HTS_ModelSet_get_fullcontext_label_format(HTS_ModelSet * ms); + + /* HTS_Engine_get_fullcontext_label_version: get full-context label version */ + const char *HTS_ModelSet_get_fullcontext_label_version(HTS_ModelSet * ms); + /* HTS_ModelSet_get_nstream: get number of stream */ size_t HTS_ModelSet_get_nstream(HTS_ModelSet * ms); Index: HTS_model.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_model.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** HTS_model.c 12 Nov 2014 02:28:09 -0000 1.25 --- HTS_model.c 12 Nov 2014 02:31:25 -0000 1.26 *************** *** 1522,1525 **** --- 1522,1537 ---- } + /* HTS_Engine_get_fullcontext_label_format: get full-context label format */ + const char *HTS_ModelSet_get_fullcontext_label_format(HTS_ModelSet * ms) + { + return ms->fullcontext_format; + } + + /* HTS_Engine_get_fullcontext_label_version: get full-context label version */ + const char *HTS_ModelSet_get_fullcontext_label_version(HTS_ModelSet * ms) + { + return ms->fullcontext_version; + } + /* HTS_ModelSet_get_nstream: get number of stream */ size_t HTS_ModelSet_get_nstream(HTS_ModelSet * ms) |
|
From: Keiichiro O. <ur...@us...> - 2014-11-12 02:28:12
|
Update of /cvsroot/hts-engine/hts_engine_API/src/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29368/lib Modified Files: HTS_model.c Log Message: fix 64bit problem in model loader Index: HTS_model.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_model.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** HTS_model.c 10 Dec 2013 10:21:26 -0000 1.24 --- HTS_model.c 12 Nov 2014 02:28:09 -0000 1.25 *************** *** 63,66 **** --- 63,72 ---- #include "HTS_hidden.h" + #ifdef WIN32 + typedef unsigned __int32 uint32_t; + #else + #include <stdint.h> + #endif /* WIN32 */ + /* HTS_dp_match: recursive matching */ static HTS_Boolean HTS_dp_match(const char *string, const char *pattern, size_t pos, size_t max) *************** *** 137,141 **** size_t i; ! for (i = strlen(buff) - 1; '0' <= buff[i] && buff[i] <= '9' && i >= 0; i--); i++; --- 143,147 ---- size_t i; ! for (i = strlen(buff) - 1; '0' <= buff[i] && buff[i] <= '9'; i--); i++; *************** *** 146,150 **** static size_t HTS_get_state_num(const char *string) { ! char *left, *right; left = strchr(string, '['); --- 152,156 ---- static size_t HTS_get_state_num(const char *string) { ! const char *left, *right; left = strchr(string, '['); *************** *** 659,663 **** static HTS_Boolean HTS_Model_load_pdf(HTS_Model * model, HTS_File * fp, size_t vector_length, size_t num_windows, HTS_Boolean is_msd) { ! unsigned int i; size_t j, k; HTS_Boolean result = TRUE; --- 665,669 ---- static HTS_Boolean HTS_Model_load_pdf(HTS_Model * model, HTS_File * fp, size_t vector_length, size_t num_windows, HTS_Boolean is_msd) { ! uint32_t i; size_t j, k; HTS_Boolean result = TRUE; *************** *** 678,682 **** /* read the number of pdfs */ for (j = 2; j <= model->ntree + 1; j++) { ! if (HTS_fread_little_endian(&i, sizeof(unsigned int), 1, fp) != 1) { result = FALSE; break; --- 684,688 ---- /* read the number of pdfs */ for (j = 2; j <= model->ntree + 1; j++) { ! if (HTS_fread_little_endian(&i, sizeof(i), 1, fp) != 1) { result = FALSE; break; |
|
From: Keiichiro O. <ur...@us...> - 2014-11-12 02:26:22
|
Update of /cvsroot/hts-engine/hts_engine_API/src/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29127/lib Modified Files: HTS_misc.c Log Message: add null check for calloc func Index: HTS_misc.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_misc.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** HTS_misc.c 24 Dec 2013 03:34:51 -0000 1.19 --- HTS_misc.c 12 Nov 2014 02:26:19 -0000 1.20 *************** *** 251,254 **** --- 251,257 ---- return (size_t) pos.__pos; #endif /* _WIN32 || __CYGWIN__ || __APPLE__ || __ANDROID__ */ + } else if (fp->type == HTS_DATA) { + HTS_Data *d = (HTS_Data *) fp->pointer; + return d->index; } HTS_error(0, "HTS_ftell: Unknown file type.\n"); *************** *** 261,265 **** if (fp == NULL || size == 0 || n == 0) { return 0; ! } else if (fp->type == HTS_FILE) { return fread(buf, size, n, (FILE *) fp->pointer); } else if (fp->type == HTS_DATA) { --- 264,269 ---- if (fp == NULL || size == 0 || n == 0) { return 0; ! } ! if (fp->type == HTS_FILE) { return fread(buf, size, n, (FILE *) fp->pointer); } else if (fp->type == HTS_DATA) { *************** *** 515,522 **** { size_t n = num * size; #ifdef FESTIVAL ! void *mem = (void *) safe_wcalloc(n); #else ! void *mem = (void *) malloc(n); #endif /* FESTIVAL */ --- 519,531 ---- { size_t n = num * size; + void *mem; + + if (n == 0) + return NULL; + #ifdef FESTIVAL ! mem = (void *) safe_wcalloc(n); #else ! mem = (void *) malloc(n); #endif /* FESTIVAL */ *************** *** 555,559 **** { size_t i; ! double **p = (double **) HTS_calloc(x, sizeof(double *)); for (i = 0; i < x; i++) --- 564,573 ---- { size_t i; ! double **p; ! ! if (x == 0 || y == 0) ! return NULL; ! ! p = (double **) HTS_calloc(x, sizeof(double *)); for (i = 0; i < x; i++) |
|
From: Keiichiro O. <ur...@us...> - 2014-11-12 02:24:52
|
Update of /cvsroot/hts-engine/hts_engine_API/src/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28875/lib Modified Files: HTS_hidden.h Log Message: fix typo Index: HTS_hidden.h =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_hidden.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** HTS_hidden.h 10 Dec 2013 10:35:17 -0000 1.20 --- HTS_hidden.h 12 Nov 2014 02:24:31 -0000 1.21 *************** *** 108,115 **** size_t HTS_ftell(HTS_File * fp); ! /* HTS_fread_big_endiana: fread with byteswap */ size_t HTS_fread_big_endian(void *buf, size_t size, size_t n, HTS_File * fp); ! /* HTS_fread_little_endiana: fread with byteswap */ size_t HTS_fread_little_endian(void *buf, size_t size, size_t n, HTS_File * fp); --- 108,115 ---- size_t HTS_ftell(HTS_File * fp); ! /* HTS_fread_big_endian: fread with byteswap */ size_t HTS_fread_big_endian(void *buf, size_t size, size_t n, HTS_File * fp); ! /* HTS_fread_little_endian: fread with byteswap */ size_t HTS_fread_little_endian(void *buf, size_t size, size_t n, HTS_File * fp); |
|
From: Keiichiro O. <ur...@us...> - 2014-11-12 02:21:37
|
Update of /cvsroot/hts-engine/hts_engine_API/src/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28485/lib Modified Files: HTS_audio.c Log Message: support 64bit windows audio Index: HTS_audio.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_audio.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** HTS_audio.c 24 Dec 2013 03:34:51 -0000 1.15 --- HTS_audio.c 12 Nov 2014 02:21:35 -0000 1.16 *************** *** 72,76 **** #include <mmsystem.h> #define AUDIO_WAIT_BUFF_MS 10 /* wait time (0.01 sec) */ ! #define AUDIO_CHANNEL 1 /* monoral */ /* HTS_Audio: audio interface for Windows */ --- 72,81 ---- #include <mmsystem.h> #define AUDIO_WAIT_BUFF_MS 10 /* wait time (0.01 sec) */ ! #define AUDIO_CHANNEL 1 /* monaural */ ! #ifdef _M_X64 ! #define AUDIO_POINTER_TYPE DWORD_PTR ! #else ! #define AUDIO_POINTER_TYPE DWORD ! #endif /* HTS_Audio: audio interface for Windows */ *************** *** 86,90 **** /* HTS_AudioInterface_callback_function: callback function from audio device */ ! static void CALLBACK HTS_AudioInterface_callback_function(HWAVEOUT hwaveout, UINT msg, DWORD user_data, DWORD param1, DWORD param2) { WAVEHDR *wavehdr = (WAVEHDR *) param1; --- 91,95 ---- /* HTS_AudioInterface_callback_function: callback function from audio device */ ! static void CALLBACK HTS_AudioInterface_callback_function(HWAVEOUT hwaveout, UINT msg, AUDIO_POINTER_TYPE user_data, AUDIO_POINTER_TYPE param1, AUDIO_POINTER_TYPE param2) { WAVEHDR *wavehdr = (WAVEHDR *) param1; *************** *** 111,115 **** audio_interface->which_buff = 2; memcpy(audio_interface->buff_1.lpData, buff, buff_size * sizeof(short)); ! audio_interface->buff_1.dwBufferLength = buff_size * sizeof(short); result = waveOutWrite(audio_interface->hwaveout, &(audio_interface->buff_1), sizeof(WAVEHDR)); } else { --- 116,120 ---- audio_interface->which_buff = 2; memcpy(audio_interface->buff_1.lpData, buff, buff_size * sizeof(short)); ! audio_interface->buff_1.dwBufferLength = (DWORD) buff_size *sizeof(short); result = waveOutWrite(audio_interface->hwaveout, &(audio_interface->buff_1), sizeof(WAVEHDR)); } else { *************** *** 119,123 **** audio_interface->which_buff = 1; memcpy(audio_interface->buff_2.lpData, buff, buff_size * sizeof(short)); ! audio_interface->buff_2.dwBufferLength = buff_size * sizeof(short); result = waveOutWrite(audio_interface->hwaveout, &(audio_interface->buff_2), sizeof(WAVEHDR)); } --- 124,128 ---- audio_interface->which_buff = 1; memcpy(audio_interface->buff_2.lpData, buff, buff_size * sizeof(short)); ! audio_interface->buff_2.dwBufferLength = (DWORD) buff_size *sizeof(short); result = waveOutWrite(audio_interface->hwaveout, &(audio_interface->buff_2), sizeof(WAVEHDR)); } *************** *** 173,182 **** audio_interface->waveformatex.wFormatTag = WAVE_FORMAT_PCM; audio_interface->waveformatex.nChannels = AUDIO_CHANNEL; ! audio_interface->waveformatex.nSamplesPerSec = sampling_frequency; audio_interface->waveformatex.wBitsPerSample = sizeof(short) * 8; audio_interface->waveformatex.nBlockAlign = AUDIO_CHANNEL * audio_interface->waveformatex.wBitsPerSample / 8; ! audio_interface->waveformatex.nAvgBytesPerSec = sampling_frequency * audio_interface->waveformatex.nBlockAlign; /* open */ ! result = waveOutOpen(&audio_interface->hwaveout, WAVE_MAPPER, &audio_interface->waveformatex, (DWORD) HTS_AudioInterface_callback_function, (DWORD) audio_interface, CALLBACK_FUNCTION); if (result != MMSYSERR_NOERROR) { HTS_error(0, "hts_engine: Failed to open your output audio_interface device to play waveform.\n"); --- 178,187 ---- audio_interface->waveformatex.wFormatTag = WAVE_FORMAT_PCM; audio_interface->waveformatex.nChannels = AUDIO_CHANNEL; ! audio_interface->waveformatex.nSamplesPerSec = (DWORD) sampling_frequency; audio_interface->waveformatex.wBitsPerSample = sizeof(short) * 8; audio_interface->waveformatex.nBlockAlign = AUDIO_CHANNEL * audio_interface->waveformatex.wBitsPerSample / 8; ! audio_interface->waveformatex.nAvgBytesPerSec = (DWORD) sampling_frequency *audio_interface->waveformatex.nBlockAlign; /* open */ ! result = waveOutOpen(&audio_interface->hwaveout, WAVE_MAPPER, &audio_interface->waveformatex, (AUDIO_POINTER_TYPE) HTS_AudioInterface_callback_function, (AUDIO_POINTER_TYPE) audio_interface, CALLBACK_FUNCTION); if (result != MMSYSERR_NOERROR) { HTS_error(0, "hts_engine: Failed to open your output audio_interface device to play waveform.\n"); *************** *** 187,191 **** /* prepare */ audio_interface->buff_1.lpData = (LPSTR) HTS_calloc(max_buff_size, sizeof(short)); ! audio_interface->buff_1.dwBufferLength = max_buff_size * sizeof(short); audio_interface->buff_1.dwFlags = WHDR_BEGINLOOP | WHDR_ENDLOOP; audio_interface->buff_1.dwLoops = 1; --- 192,196 ---- /* prepare */ audio_interface->buff_1.lpData = (LPSTR) HTS_calloc(max_buff_size, sizeof(short)); ! audio_interface->buff_1.dwBufferLength = (DWORD) max_buff_size *sizeof(short); audio_interface->buff_1.dwFlags = WHDR_BEGINLOOP | WHDR_ENDLOOP; audio_interface->buff_1.dwLoops = 1; *************** *** 200,204 **** } audio_interface->buff_2.lpData = (LPSTR) HTS_calloc(max_buff_size, sizeof(short)); ! audio_interface->buff_2.dwBufferLength = max_buff_size * sizeof(short); audio_interface->buff_2.dwFlags = WHDR_BEGINLOOP | WHDR_ENDLOOP; audio_interface->buff_2.dwLoops = 1; --- 205,209 ---- } audio_interface->buff_2.lpData = (LPSTR) HTS_calloc(max_buff_size, sizeof(short)); ! audio_interface->buff_2.dwBufferLength = (DWORD) max_buff_size *sizeof(short); audio_interface->buff_2.dwFlags = WHDR_BEGINLOOP | WHDR_ENDLOOP; audio_interface->buff_2.dwLoops = 1; |
|
From: Keiichiro O. <ur...@us...> - 2014-11-12 02:20:22
|
Update of /cvsroot/hts-engine/hts_engine_API/src/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28357/lib Modified Files: HTS_pstream.c Log Message: remove waring message from compiler. Index: HTS_pstream.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_pstream.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** HTS_pstream.c 10 Dec 2013 10:29:03 -0000 1.19 --- HTS_pstream.c 12 Nov 2014 02:20:20 -0000 1.20 *************** *** 92,96 **** for (i = 0; i < pst->win_size; i++) for (shift = pst->win_l_width[i]; shift <= pst->win_r_width[i]; shift++) ! if ((t + shift >= 0) && (t + shift < pst->length) && (pst->win_coefficient[i][-shift] != 0.0)) { wu = pst->win_coefficient[i][-shift] * pst->sm.ivar[t + shift][i * pst->vector_length + m]; pst->sm.wum[t] += wu * pst->sm.mean[t + shift][i * pst->vector_length + m]; --- 92,96 ---- for (i = 0; i < pst->win_size; i++) for (shift = pst->win_l_width[i]; shift <= pst->win_r_width[i]; shift++) ! if (((int) t + shift >= 0) && ((int) t + shift < pst->length) && (pst->win_coefficient[i][-shift] != 0.0)) { wu = pst->win_coefficient[i][-shift] * pst->sm.ivar[t + shift][i * pst->vector_length + m]; pst->sm.wum[t] += wu * pst->sm.mean[t + shift][i * pst->vector_length + m]; *************** *** 316,325 **** pst->width = HTS_SStreamSet_get_window_max_width(sss, i) * 2 + 1; /* band width of R */ pst->win_size = HTS_SStreamSet_get_window_size(sss, i); ! pst->sm.mean = HTS_alloc_matrix(pst->length, pst->vector_length * pst->win_size); ! pst->sm.ivar = HTS_alloc_matrix(pst->length, pst->vector_length * pst->win_size); ! pst->sm.wum = (double *) HTS_calloc(pst->length, sizeof(double)); ! pst->sm.wuw = HTS_alloc_matrix(pst->length, pst->width); ! pst->sm.g = (double *) HTS_calloc(pst->length, sizeof(double)); ! pst->par = HTS_alloc_matrix(pst->length, pst->vector_length); /* copy dynamic window */ pst->win_l_width = (int *) HTS_calloc(pst->win_size, sizeof(int)); --- 316,327 ---- pst->width = HTS_SStreamSet_get_window_max_width(sss, i) * 2 + 1; /* band width of R */ pst->win_size = HTS_SStreamSet_get_window_size(sss, i); ! if (pst->length > 0) { ! pst->sm.mean = HTS_alloc_matrix(pst->length, pst->vector_length * pst->win_size); ! pst->sm.ivar = HTS_alloc_matrix(pst->length, pst->vector_length * pst->win_size); ! pst->sm.wum = (double *) HTS_calloc(pst->length, sizeof(double)); ! pst->sm.wuw = HTS_alloc_matrix(pst->length, pst->width); ! pst->sm.g = (double *) HTS_calloc(pst->length, sizeof(double)); ! pst->par = HTS_alloc_matrix(pst->length, pst->vector_length); ! } /* copy dynamic window */ pst->win_l_width = (int *) HTS_calloc(pst->win_size, sizeof(int)); *************** *** 376,380 **** not_bound = TRUE; for (shift = pst->win_l_width[k]; shift <= pst->win_r_width[k]; shift++) ! if (frame + shift < 0 || pss->total_frame <= frame + shift || !pst->msd_flag[frame + shift]) { not_bound = FALSE; break; --- 378,382 ---- not_bound = TRUE; for (shift = pst->win_l_width[k]; shift <= pst->win_r_width[k]; shift++) ! if ((int) frame + shift < 0 || (int) pss->total_frame <= (int) frame + shift || !pst->msd_flag[frame + shift]) { not_bound = FALSE; break; *************** *** 400,404 **** not_bound = TRUE; for (shift = pst->win_l_width[k]; shift <= pst->win_r_width[k]; shift++) ! if (frame + shift < 0 || pss->total_frame <= frame + shift) { not_bound = FALSE; break; --- 402,406 ---- not_bound = TRUE; for (shift = pst->win_l_width[k]; shift <= pst->win_r_width[k]; shift++) ! if ((int) frame + shift < 0 || (int) pss->total_frame <= (int) frame + shift) { not_bound = FALSE; break; |
|
From: Keiichiro O. <ur...@us...> - 2014-11-10 16:00:00
|
Update of /cvsroot/hts-engine/hts_engine_API/src/bin In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28512/bin Modified Files: hts_engine.c Log Message: add -g option to change volume. Index: hts_engine.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/bin/hts_engine.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** hts_engine.c 26 Dec 2013 08:06:36 -0000 1.26 --- hts_engine.c 10 Nov 2014 15:59:57 -0000 1.27 *************** *** 88,91 **** --- 88,92 ---- fprintf(stderr, " -jm f : weight of GV for spectrum [ 1.0][ 0.0-- ]\n"); fprintf(stderr, " -jf f : weight of GV for log F0 [ 1.0][ 0.0-- ]\n"); + fprintf(stderr, " -g f : volume (dB) [ 0.0][ -- ]\n"); fprintf(stderr, " -z i : audio buffer size (if i==0, turn off) [ 0][ 0-- ]\n"); fprintf(stderr, " infile:\n"); *************** *** 273,276 **** --- 274,281 ---- --argc; break; + case 'g': + HTS_Engine_set_volume(&engine, atof(*++argv)); + --argc; + break; case 'z': HTS_Engine_set_audio_buff_size(&engine, (size_t) atoi(*++argv)); |
|
From: Keiichiro O. <ur...@us...> - 2013-12-26 08:06:38
|
Update of /cvsroot/hts-engine/hts_engine_API/src/bin In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11865/bin Modified Files: hts_engine.c Log Message: Add audio buffer size option suggested by Nicholas Volk. Index: hts_engine.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/bin/hts_engine.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** hts_engine.c 10 Dec 2013 10:35:17 -0000 1.25 --- hts_engine.c 26 Dec 2013 08:06:36 -0000 1.26 *************** *** 273,276 **** --- 273,280 ---- --argc; break; + case 'z': + HTS_Engine_set_audio_buff_size(&engine, (size_t) atoi(*++argv)); + --argc; + break; default: fprintf(stderr, "Error: Invalid option '-%c'.\n", *(*argv + 1)); |
|
From: Keiichiro O. <ur...@us...> - 2013-12-24 03:34:54
|
Update of /cvsroot/hts-engine/hts_engine_API/src/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9192/lib Modified Files: HTS_audio.c HTS_misc.c Log Message: Remove gcc warning message. Index: HTS_misc.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_misc.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** HTS_misc.c 11 Dec 2013 14:58:07 -0000 1.18 --- HTS_misc.c 24 Dec 2013 03:34:51 -0000 1.19 *************** *** 481,485 **** { char c; - size_t start; size_t len = 0; --- 481,484 ---- *************** *** 496,500 **** c = str[(*index)]; } - start = (*index); while (c != separator && c != '\0') { buff[len++] = c; --- 495,498 ---- Index: HTS_audio.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_audio.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** HTS_audio.c 10 Dec 2013 10:18:21 -0000 1.14 --- HTS_audio.c 24 Dec 2013 03:34:51 -0000 1.15 *************** *** 447,451 **** audio_interface = (HTS_AudioInterface *) audio->audio_interface; if (audio->buff_size > 0) { ! HTS_AudioInterface_write((HTS_AudioInterface *) audio->audio_interface, audio->buff, audio->buff_size); audio->buff_size = 0; } --- 447,451 ---- audio_interface = (HTS_AudioInterface *) audio->audio_interface; if (audio->buff_size > 0) { ! HTS_AudioInterface_write(audio_interface, audio->buff, audio->buff_size); audio->buff_size = 0; } |
|
From: Keiichiro O. <ur...@us...> - 2013-12-11 14:58:10
|
Update of /cvsroot/hts-engine/hts_engine_API/src/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16557/lib Modified Files: HTS_misc.c Log Message: Make android gcc happy. Index: HTS_misc.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_misc.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** HTS_misc.c 11 Dec 2013 09:29:44 -0000 1.17 --- HTS_misc.c 11 Dec 2013 14:58:07 -0000 1.18 *************** *** 246,254 **** fpos_t pos; fgetpos((FILE *) fp->pointer, &pos); ! #if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) return (size_t) pos; #else return (size_t) pos.__pos; ! #endif /* _WIN32 || __APPLE__ */ } HTS_error(0, "HTS_ftell: Unknown file type.\n"); --- 246,254 ---- fpos_t pos; fgetpos((FILE *) fp->pointer, &pos); ! #if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) return (size_t) pos; #else return (size_t) pos.__pos; ! #endif /* _WIN32 || __CYGWIN__ || __APPLE__ || __ANDROID__ */ } HTS_error(0, "HTS_ftell: Unknown file type.\n"); |
|
From: Keiichiro O. <ur...@us...> - 2013-12-11 09:29:47
|
Update of /cvsroot/hts-engine/hts_engine_API/src/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27433/lib Modified Files: HTS_misc.c Log Message: Make cygwin gcc happy. Index: HTS_misc.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_misc.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** HTS_misc.c 10 Dec 2013 10:35:17 -0000 1.16 --- HTS_misc.c 11 Dec 2013 09:29:44 -0000 1.17 *************** *** 246,250 **** fpos_t pos; fgetpos((FILE *) fp->pointer, &pos); ! #if defined(_WIN32) || defined(__APPLE__) return (size_t) pos; #else --- 246,250 ---- fpos_t pos; fgetpos((FILE *) fp->pointer, &pos); ! #if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) return (size_t) pos; #else |
|
From: Keiichiro O. <ur...@us...> - 2013-12-10 10:35:19
|
Update of /cvsroot/hts-engine/hts_engine_API/src/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17481/lib Modified Files: HTS_hidden.h HTS_label.c HTS_misc.c HTS_vocoder.c Log Message: Update documents to version 1.08. Index: HTS_misc.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_misc.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** HTS_misc.c 8 Feb 2013 04:13:19 -0000 1.15 --- HTS_misc.c 10 Dec 2013 10:35:17 -0000 1.16 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2012 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ Index: HTS_vocoder.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_vocoder.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** HTS_vocoder.c 7 May 2013 03:51:59 -0000 1.25 --- HTS_vocoder.c 10 Dec 2013 10:35:17 -0000 1.26 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2012 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ Index: HTS_hidden.h =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_hidden.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** HTS_hidden.h 7 May 2013 03:51:59 -0000 1.19 --- HTS_hidden.h 10 Dec 2013 10:35:17 -0000 1.20 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2012 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ Index: HTS_label.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_label.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** HTS_label.c 15 Dec 2012 07:40:51 -0000 1.17 --- HTS_label.c 10 Dec 2013 10:35:17 -0000 1.18 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2012 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ |
|
From: Keiichiro O. <ur...@us...> - 2013-12-10 10:32:13
|
Update of /cvsroot/hts-engine/hts_engine_API/src/include In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17240/include Modified Files: HTS_engine.h Log Message: Change HTS_Boolean from int to char. Index: HTS_engine.h =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/include/HTS_engine.h,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** HTS_engine.h 10 Dec 2013 10:31:29 -0000 1.39 --- HTS_engine.h 10 Dec 2013 10:32:10 -0000 1.40 *************** *** 60,64 **** /* common ---------------------------------------------------------- */ ! typedef int HTS_Boolean; #ifndef TRUE --- 60,64 ---- /* common ---------------------------------------------------------- */ ! typedef char HTS_Boolean; #ifndef TRUE |
|
From: Keiichiro O. <ur...@us...> - 2013-12-10 10:31:31
|
Update of /cvsroot/hts-engine/hts_engine_API/src/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17114/lib Modified Files: HTS_engine.c Log Message: Add some functions for separating synthesis step. Index: HTS_engine.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_engine.c,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** HTS_engine.c 8 Feb 2013 04:13:19 -0000 1.31 --- HTS_engine.c 10 Dec 2013 10:31:29 -0000 1.32 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2012 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 418,422 **** } ! static HTS_Boolean HTS_Engine_synthesize(HTS_Engine * engine) { size_t i, state_index, model_index; --- 418,423 ---- } ! /* HTS_Engine_generate_state_sequence: genereate state sequence (1st synthesis step) */ ! static HTS_Boolean HTS_Engine_generate_state_sequence(HTS_Engine * engine) { size_t i, state_index, model_index; *************** *** 445,459 **** } } ! if (HTS_PStreamSet_create(&engine->pss, &engine->sss, engine->condition.msd_threshold, engine->condition.gv_weight) != TRUE) { HTS_Engine_refresh(engine); return FALSE; } ! ! if (HTS_GStreamSet_create(&engine->gss, &engine->pss, engine->condition.stage, engine->condition.use_log_gain, engine->condition.sampling_frequency, engine->condition.fperiod, engine->condition.alpha, engine->condition.beta, &engine->condition.stop, engine->condition.volume, engine->condition.audio_buff_size > 0 ? &engine->audio : NULL) != TRUE) { HTS_Engine_refresh(engine); return FALSE; } - return TRUE; } --- 446,495 ---- } } + return TRUE; + } ! /* HTS_Engine_generate_state_sequence_from_fn: genereate state sequence from file name (1st synthesis step) */ ! HTS_Boolean HTS_Engine_generate_state_sequence_from_fn(HTS_Engine * engine, const char *fn) ! { ! HTS_Engine_refresh(engine); ! HTS_Label_load_from_fn(&engine->label, engine->condition.sampling_frequency, engine->condition.fperiod, fn); ! return HTS_Engine_generate_state_sequence(engine); ! } ! ! /* HTS_Engine_generate_state_sequence_from_strings: generate state sequence from strings (1st synthesis step) */ ! HTS_Boolean HTS_Engine_generate_state_sequence_from_strings(HTS_Engine * engine, char **lines, size_t num_lines) ! { ! HTS_Engine_refresh(engine); ! HTS_Label_load_from_strings(&engine->label, engine->condition.sampling_frequency, engine->condition.fperiod, lines, num_lines); ! return HTS_Engine_generate_state_sequence(engine); ! } ! ! /* HTS_Engine_generate_parameter_sequence: generate parameter sequence (2nd synthesis step) */ ! HTS_Boolean HTS_Engine_generate_parameter_sequence(HTS_Engine * engine) ! { ! return HTS_PStreamSet_create(&engine->pss, &engine->sss, engine->condition.msd_threshold, engine->condition.gv_weight); ! } ! ! /* HTS_Engine_generate_sample_sequence: generate sample sequence (3rd synthesis step) */ ! HTS_Boolean HTS_Engine_generate_sample_sequence(HTS_Engine * engine) ! { ! return HTS_GStreamSet_create(&engine->gss, &engine->pss, engine->condition.stage, engine->condition.use_log_gain, engine->condition.sampling_frequency, engine->condition.fperiod, engine->condition.alpha, engine->condition.beta, &engine->condition.stop, engine->condition.volume, engine->condition.audio_buff_size > 0 ? &engine->audio : NULL); ! } ! ! /* HTS_Engine_synthesize: synthesize speech */ ! static HTS_Boolean HTS_Engine_synthesize(HTS_Engine * engine) ! { ! if (HTS_Engine_generate_state_sequence(engine) != TRUE) { HTS_Engine_refresh(engine); return FALSE; } ! if (HTS_Engine_generate_parameter_sequence(engine) != TRUE) { ! HTS_Engine_refresh(engine); ! return FALSE; ! } ! if (HTS_Engine_generate_sample_sequence(engine) != TRUE) { HTS_Engine_refresh(engine); return FALSE; } return TRUE; } |
|
From: Keiichiro O. <ur...@us...> - 2013-12-10 10:29:05
|
Update of /cvsroot/hts-engine/hts_engine_API/src/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16948/lib Modified Files: HTS_gstream.c HTS_pstream.c Log Message: Check memory allocation in end of parameter generation. Index: HTS_gstream.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_gstream.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** HTS_gstream.c 7 May 2013 03:51:59 -0000 1.18 --- HTS_gstream.c 10 Dec 2013 10:29:03 -0000 1.19 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2012 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 186,192 **** if (gss->gstream) { for (i = 0; i < gss->nstream; i++) { ! for (j = 0; j < gss->total_frame; j++) ! HTS_free(gss->gstream[i].par[j]); ! HTS_free(gss->gstream[i].par); } HTS_free(gss->gstream); --- 186,194 ---- if (gss->gstream) { for (i = 0; i < gss->nstream; i++) { ! if (gss->gstream[i].par != NULL) { ! for (j = 0; j < gss->total_frame; j++) ! HTS_free(gss->gstream[i].par[j]); ! HTS_free(gss->gstream[i].par); ! } } HTS_free(gss->gstream); Index: HTS_pstream.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_pstream.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** HTS_pstream.c 8 Feb 2013 04:13:19 -0000 1.18 --- HTS_pstream.c 10 Dec 2013 10:29:03 -0000 1.19 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2012 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 475,489 **** for (i = 0; i < pss->nstream; i++) { pstream = &pss->pstream[i]; ! HTS_free(pstream->sm.wum); ! HTS_free(pstream->sm.g); ! HTS_free_matrix(pstream->sm.wuw, pstream->length); ! HTS_free_matrix(pstream->sm.ivar, pstream->length); ! HTS_free_matrix(pstream->sm.mean, pstream->length); ! HTS_free_matrix(pstream->par, pstream->length); if (pstream->msd_flag) HTS_free(pstream->msd_flag); ! for (j = 0; j < pstream->win_size; j++) { ! pstream->win_coefficient[j] += pstream->win_l_width[j]; ! HTS_free(pstream->win_coefficient[j]); } if (pstream->gv_mean) --- 475,497 ---- for (i = 0; i < pss->nstream; i++) { pstream = &pss->pstream[i]; ! if (pstream->sm.wum) ! HTS_free(pstream->sm.wum); ! if (pstream->sm.g) ! HTS_free(pstream->sm.g); ! if (pstream->sm.wuw) ! HTS_free_matrix(pstream->sm.wuw, pstream->length); ! if (pstream->sm.ivar) ! HTS_free_matrix(pstream->sm.ivar, pstream->length); ! if (pstream->sm.mean) ! HTS_free_matrix(pstream->sm.mean, pstream->length); ! if (pstream->par) ! HTS_free_matrix(pstream->par, pstream->length); if (pstream->msd_flag) HTS_free(pstream->msd_flag); ! if (pstream->win_coefficient) { ! for (j = 0; j < pstream->win_size; j++) { ! pstream->win_coefficient[j] += pstream->win_l_width[j]; ! HTS_free(pstream->win_coefficient[j]); ! } } if (pstream->gv_mean) *************** *** 491,497 **** if (pstream->gv_vari) HTS_free(pstream->gv_vari); ! HTS_free(pstream->win_coefficient); ! HTS_free(pstream->win_l_width); ! HTS_free(pstream->win_r_width); if (pstream->gv_switch) HTS_free(pstream->gv_switch); --- 499,508 ---- if (pstream->gv_vari) HTS_free(pstream->gv_vari); ! if (pstream->win_coefficient) ! HTS_free(pstream->win_coefficient); ! if (pstream->win_l_width) ! HTS_free(pstream->win_l_width); ! if (pstream->win_r_width) ! HTS_free(pstream->win_r_width); if (pstream->gv_switch) HTS_free(pstream->gv_switch); |
|
From: Keiichiro O. <ur...@us...> - 2013-12-10 10:26:47
|
Update of /cvsroot/hts-engine/hts_engine_API/src/lib In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16774/lib Modified Files: HTS_sstream.c Log Message: Fix a small bug: When model duration specified by label is zero, shortest duration should be used. Index: HTS_sstream.c =================================================================== RCS file: /cvsroot/hts-engine/hts_engine_API/src/lib/HTS_sstream.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** HTS_sstream.c 15 Dec 2012 07:40:51 -0000 1.21 --- HTS_sstream.c 10 Dec 2013 10:26:45 -0000 1.22 *************** *** 5,9 **** /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2012 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ --- 5,9 ---- /* ----------------------------------------------------------------- */ /* */ ! /* Copyright (c) 2001-2013 Nagoya Institute of Technology */ /* Department of Computer Science */ /* */ *************** *** 62,67 **** #include "HTS_hidden.h" ! /* HTS_set_duration: set duration from state duration probability distribution */ ! static double HTS_set_duration(size_t * duration, double *mean, double *vari, size_t size, double frame_length) { size_t i; --- 62,86 ---- #include "HTS_hidden.h" ! /* HTS_set_default_duration: set default duration from state duration probability distribution */ ! static double HTS_set_default_duration(size_t * duration, double *mean, double *vari, size_t size) ! { ! size_t i; ! double temp; ! size_t sum = 0; ! ! for (i = 0; i < size; i++) { ! temp = mean[i] + 0.5; ! if (temp < 1.0) ! duration[i] = 1; ! else ! duration[i] = (size_t) temp; ! sum += duration[i]; ! } ! ! return (double) sum; ! } ! ! /* HTS_set_specified_duration: set duration from state duration probability distribution and specified frame length */ ! static double HTS_set_specified_duration(size_t * duration, double *mean, double *vari, size_t size, double frame_length) { size_t i; *************** *** 72,88 **** size_t target_length; - /* if the frame length is not specified, only the mean vector is used */ - if (frame_length == 0.0) { - for (i = 0; i < size; i++) { - temp1 = (mean[i] + 0.5); - if (temp1 < 1.0) - duration[i] = 1; - else - duration[i] = (size_t) temp1; - sum += duration[i]; - } - return (double) sum; - } - /* get the target frame length */ if (frame_length + 0.5 < 1.0) --- 91,94 ---- *************** *** 94,98 **** if (target_length <= size) { if (target_length < size) ! HTS_error(-1, "HTS_set_duration: Specified frame length is too short.\n"); for (i = 0; i < size; i++) duration[i] = 1; --- 100,104 ---- if (target_length <= size) { if (target_length < size) ! HTS_error(-1, "HTS_set_specified_duration: Specified frame length is too short.\n"); for (i = 0; i < size; i++) duration[i] = 1; *************** *** 229,235 **** sst->vari[j] = (double *) HTS_calloc(sst->vector_length * HTS_ModelSet_get_window_size(ms, i), sizeof(double)); } ! sst->gv_switch = (HTS_Boolean *) HTS_calloc(sss->total_state, sizeof(HTS_Boolean)); ! for (j = 0; j < sss->total_state; j++) ! sst->gv_switch[j] = TRUE; } --- 235,245 ---- sst->vari[j] = (double *) HTS_calloc(sst->vector_length * HTS_ModelSet_get_window_size(ms, i), sizeof(double)); } ! if (HTS_ModelSet_use_gv(ms, i)) { ! sst->gv_switch = (HTS_Boolean *) HTS_calloc(sss->total_state, sizeof(HTS_Boolean)); ! for (j = 0; j < sss->total_state; j++) ! sst->gv_switch[j] = TRUE; ! } else { ! sst->gv_switch = NULL; ! } } *************** *** 247,255 **** temp = HTS_Label_get_end_frame(label, i); if (temp >= 0) { ! next_time += (size_t) HTS_set_duration(&sss->duration[next_state], &duration_mean[next_state], &duration_vari[next_state], state + sss->nstate - next_state, temp - next_time); next_state = state + sss->nstate; } else if (i + 1 == HTS_Label_get_size(label)) { HTS_error(-1, "HTS_SStreamSet_create: The time of final label is not specified.\n"); ! HTS_set_duration(&sss->duration[next_state], &duration_mean[next_state], &duration_vari[next_state], state + sss->nstate - next_state, 0.0); } state += sss->nstate; --- 257,265 ---- temp = HTS_Label_get_end_frame(label, i); if (temp >= 0) { ! next_time += (size_t) HTS_set_specified_duration(&sss->duration[next_state], &duration_mean[next_state], &duration_vari[next_state], state + sss->nstate - next_state, temp - next_time); next_state = state + sss->nstate; } else if (i + 1 == HTS_Label_get_size(label)) { HTS_error(-1, "HTS_SStreamSet_create: The time of final label is not specified.\n"); ! HTS_set_default_duration(&sss->duration[next_state], &duration_mean[next_state], &duration_vari[next_state], state + sss->nstate - next_state); } state += sss->nstate; *************** *** 263,271 **** } frame_length = temp / speed; } else { ! frame_length = 0.0; } - /* set state duration */ - HTS_set_duration(sss->duration, duration_mean, duration_vari, sss->total_state, frame_length); } HTS_free(duration_mean); --- 273,280 ---- } frame_length = temp / speed; + HTS_set_specified_duration(sss->duration, duration_mean, duration_vari, sss->total_state, frame_length); } else { ! HTS_set_default_duration(sss->duration, duration_mean, duration_vari, sss->total_state); } } HTS_free(duration_mean); *************** *** 485,489 **** if (sst->gv_vari) HTS_free(sst->gv_vari); ! HTS_free(sst->gv_switch); } HTS_free(sss->sstream); --- 494,499 ---- if (sst->gv_vari) HTS_free(sst->gv_vari); ! if (sst->gv_switch) ! HTS_free(sst->gv_switch); } HTS_free(sss->sstream); |
