csukuangfj commited on
Commit
eab1758
·
1 Parent(s): fca37a4

update model

Browse files
sherpa-onnx-tts.js CHANGED
@@ -264,15 +264,14 @@ function initSherpaOnnxOfflineTtsKittenModelConfig(config, Module) {
264
 
265
  function initSherpaOnnxOfflineTtsZipVoiceModelConfig(config, Module) {
266
  const tokensLen = Module.lengthBytesUTF8(config.tokens || '') + 1;
267
- const textModelLen = Module.lengthBytesUTF8(config.textModel || '') + 1;
268
- const flowMatchingModelLen =
269
- Module.lengthBytesUTF8(config.flowMatchingModel || '') + 1;
270
  const vocoderLen = Module.lengthBytesUTF8(config.vocoder || '') + 1;
271
  const dataDirLen = Module.lengthBytesUTF8(config.dataDir || '') + 1;
272
- const pinyinDictLen = Module.lengthBytesUTF8(config.pinyinDict || '') + 1;
273
 
274
- const n = tokensLen + textModelLen + flowMatchingModelLen + vocoderLen +
275
- dataDirLen + pinyinDictLen;
276
 
277
  const buffer = Module._malloc(n);
278
 
@@ -283,12 +282,11 @@ function initSherpaOnnxOfflineTtsZipVoiceModelConfig(config, Module) {
283
  Module.stringToUTF8(config.tokens || '', buffer + offset, tokensLen);
284
  offset += tokensLen;
285
 
286
- Module.stringToUTF8(config.textModel || '', buffer + offset, textModelLen);
287
- offset += textModelLen;
288
 
289
- Module.stringToUTF8(
290
- config.flowMatchingModel || '', buffer + offset, flowMatchingModelLen);
291
- offset += flowMatchingModelLen;
292
 
293
  Module.stringToUTF8(config.vocoder || '', buffer + offset, vocoderLen);
294
  offset += vocoderLen;
@@ -296,18 +294,18 @@ function initSherpaOnnxOfflineTtsZipVoiceModelConfig(config, Module) {
296
  Module.stringToUTF8(config.dataDir || '', buffer + offset, dataDirLen);
297
  offset += dataDirLen;
298
 
299
- Module.stringToUTF8(config.pinyinDict || '', buffer + offset, pinyinDictLen);
300
- offset += pinyinDictLen;
301
 
302
  offset = 0;
303
  Module.setValue(ptr, buffer + offset, 'i8*');
304
  offset += tokensLen;
305
 
306
  Module.setValue(ptr + 4, buffer + offset, 'i8*');
307
- offset += textModelLen;
308
 
309
  Module.setValue(ptr + 8, buffer + offset, 'i8*');
310
- offset += flowMatchingModelLen;
311
 
312
  Module.setValue(ptr + 12, buffer + offset, 'i8*');
313
  offset += vocoderLen;
@@ -316,7 +314,7 @@ function initSherpaOnnxOfflineTtsZipVoiceModelConfig(config, Module) {
316
  offset += dataDirLen;
317
 
318
  Module.setValue(ptr + 20, buffer + offset, 'i8*');
319
- offset += pinyinDictLen;
320
 
321
  Module.setValue(ptr + 24, config.featScale || 0.1, 'float');
322
  Module.setValue(ptr + 28, config.tShift || 0.5, 'float');
@@ -377,11 +375,11 @@ function initSherpaOnnxOfflineTtsModelConfig(config, Module) {
377
  if (!('offlineTtsZipVoiceModelConfig' in config)) {
378
  config.offlineTtsZipVoiceModelConfig = {
379
  tokens: '',
380
- textModel: '',
381
- flowMatchingModel: '',
382
  vocoder: '',
383
  dataDir: '',
384
- pinyinDict: '',
385
  featScale: 0.1,
386
  tShift: 0.5,
387
  targetRMS: 0.1,
 
264
 
265
  function initSherpaOnnxOfflineTtsZipVoiceModelConfig(config, Module) {
266
  const tokensLen = Module.lengthBytesUTF8(config.tokens || '') + 1;
267
+ const encoderLen = Module.lengthBytesUTF8(config.encoder || '') + 1;
268
+ const decoderLen = Module.lengthBytesUTF8(config.decoder || '') + 1;
 
269
  const vocoderLen = Module.lengthBytesUTF8(config.vocoder || '') + 1;
270
  const dataDirLen = Module.lengthBytesUTF8(config.dataDir || '') + 1;
271
+ const lexiconLen = Module.lengthBytesUTF8(config.lexicon || '') + 1;
272
 
273
+ const n = tokensLen + encoderLen + decoderLen + vocoderLen + dataDirLen +
274
+ lexiconLen;
275
 
276
  const buffer = Module._malloc(n);
277
 
 
282
  Module.stringToUTF8(config.tokens || '', buffer + offset, tokensLen);
283
  offset += tokensLen;
284
 
285
+ Module.stringToUTF8(config.encoder || '', buffer + offset, encoderLen);
286
+ offset += encoderLen;
287
 
288
+ Module.stringToUTF8(config.decoder || '', buffer + offset, decoderLen);
289
+ offset += decoderLen;
 
290
 
291
  Module.stringToUTF8(config.vocoder || '', buffer + offset, vocoderLen);
292
  offset += vocoderLen;
 
294
  Module.stringToUTF8(config.dataDir || '', buffer + offset, dataDirLen);
295
  offset += dataDirLen;
296
 
297
+ Module.stringToUTF8(config.lexicon || '', buffer + offset, lexiconLen);
298
+ offset += lexiconLen;
299
 
300
  offset = 0;
301
  Module.setValue(ptr, buffer + offset, 'i8*');
302
  offset += tokensLen;
303
 
304
  Module.setValue(ptr + 4, buffer + offset, 'i8*');
305
+ offset += encoderLen;
306
 
307
  Module.setValue(ptr + 8, buffer + offset, 'i8*');
308
+ offset += decoderLen;
309
 
310
  Module.setValue(ptr + 12, buffer + offset, 'i8*');
311
  offset += vocoderLen;
 
314
  offset += dataDirLen;
315
 
316
  Module.setValue(ptr + 20, buffer + offset, 'i8*');
317
+ offset += lexiconLen;
318
 
319
  Module.setValue(ptr + 24, config.featScale || 0.1, 'float');
320
  Module.setValue(ptr + 28, config.tShift || 0.5, 'float');
 
375
  if (!('offlineTtsZipVoiceModelConfig' in config)) {
376
  config.offlineTtsZipVoiceModelConfig = {
377
  tokens: '',
378
+ encoder: '',
379
+ decoder: '',
380
  vocoder: '',
381
  dataDir: '',
382
+ lexicon: '',
383
  featScale: 0.1,
384
  tShift: 0.5,
385
  targetRMS: 0.1,
sherpa-onnx-wasm-main-tts.js CHANGED
The diff for this file is too large to render. See raw diff
 
sherpa-onnx-wasm-main-tts.wasm CHANGED
@@ -1,3 +1,3 @@
1
  version https://git-lfs.github.com/spec/v1
2
- oid sha256:233699986f1bcae0b6b53a8866e31bf6465bfee805417ddd19ab3c13f7478bb7
3
- size 11906463
 
1
  version https://git-lfs.github.com/spec/v1
2
+ oid sha256:0a5bf6725492cfc2427df374ed7164e64a7655bcf2362470c79460b288cde4fc
3
+ size 11779250