Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
xuning
/
sherpaonnx
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
Fangjun Kuang
2024-06-25 10:52:59 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Committed by
GitHub
2024-06-25 10:52:59 +0800
Commit
5cce159cf3647b944c55cd1452a0d883265a8427
5cce159c
1 parent
a3bac19c
Fix passing C# string to C++ (#1055)
隐藏空白字符变更
内嵌
并排对比
正在显示
16 个修改的文件
包含
46 行增加
和
29 行删除
.github/workflows/linux-jni.yaml
CMakeLists.txt
dart-api-examples/non-streaming-asr/pubspec.yaml
dart-api-examples/streaming-asr/pubspec.yaml
dart-api-examples/tts/pubspec.yaml
dart-api-examples/vad/pubspec.yaml
dotnet-examples/Common/Common.csproj
dotnet-examples/offline-punctuation/run.sh
nodejs-addon-examples/package.json
scripts/dotnet/.gitignore
scripts/dotnet/OfflinePunctuation.cs
scripts/dotnet/OfflineTts.cs
scripts/dotnet/OfflineTtsGeneratedAudio.cs
scripts/dotnet/SpeakerEmbeddingManager.cs
scripts/dotnet/examples/Common.csproj
sherpa-onnx/flutter/CHANGELOG.md
.github/workflows/linux-jni.yaml
查看文件 @
5cce159
...
...
@@ -71,7 +71,7 @@ jobs:
mkdir build
cd build
cmake -DSHERPA_ONNX_ENABLE_TTS=ON -D CMAKE_BUILD_TYPE=
${{ matrix.build_type }}
-D BUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=./install -DSHERPA_ONNX_ENABLE_JNI=ON ..
cmake -DSHERPA_ONNX_ENABLE_TTS=ON -D CMAKE_BUILD_TYPE=
Release
-D BUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=./install -DSHERPA_ONNX_ENABLE_JNI=ON ..
make -j2
make install
...
...
@@ -153,7 +153,7 @@ jobs:
git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-libs main
-
name
:
Release pre-compiled binaries and libs for linux x64
if
:
(github.repository_owner == 'csukuangfj' || github.repository_owner == 'k2-fsa') && github.event_name == 'push' && contains(github.ref, 'refs/tags/')
&& matrix.build_type == 'Release'
if
:
(github.repository_owner == 'csukuangfj' || github.repository_owner == 'k2-fsa') && github.event_name == 'push' && contains(github.ref, 'refs/tags/')
uses
:
svenstaro/upload-release-action@v2
with
:
file_glob
:
true
...
...
CMakeLists.txt
查看文件 @
5cce159
...
...
@@ -8,7 +8,7 @@ project(sherpa-onnx)
# ./nodejs-addon-examples
# ./dart-api-examples/
# ./sherpa-onnx/flutter/CHANGELOG.md
set
(
SHERPA_ONNX_VERSION
"1.10.
1
"
)
set
(
SHERPA_ONNX_VERSION
"1.10.
2
"
)
# Disable warning about
#
...
...
dart-api-examples/non-streaming-asr/pubspec.yaml
查看文件 @
5cce159
...
...
@@ -10,7 +10,7 @@ environment:
# Add regular dependencies here.
dependencies
:
sherpa_onnx
:
^1.10.
1
sherpa_onnx
:
^1.10.
2
path
:
^1.9.0
args
:
^2.5.0
...
...
dart-api-examples/streaming-asr/pubspec.yaml
查看文件 @
5cce159
...
...
@@ -11,7 +11,7 @@ environment:
# Add regular dependencies here.
dependencies
:
sherpa_onnx
:
^1.10.
1
sherpa_onnx
:
^1.10.
2
path
:
^1.9.0
args
:
^2.5.0
...
...
dart-api-examples/tts/pubspec.yaml
查看文件 @
5cce159
...
...
@@ -8,7 +8,7 @@ environment:
# Add regular dependencies here.
dependencies
:
sherpa_onnx
:
^1.10.
1
sherpa_onnx
:
^1.10.
2
path
:
^1.9.0
args
:
^2.5.0
...
...
dart-api-examples/vad/pubspec.yaml
查看文件 @
5cce159
...
...
@@ -9,7 +9,7 @@ environment:
sdk
:
^3.4.0
dependencies
:
sherpa_onnx
:
^1.10.
1
sherpa_onnx
:
^1.10.
2
path
:
^1.9.0
args
:
^2.5.0
...
...
dotnet-examples/Common/Common.csproj
查看文件 @
5cce159
...
...
@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="org.k2fsa.sherpa.onnx" Version="
1.10.1
" />
<PackageReference Include="org.k2fsa.sherpa.onnx" Version="
*
" />
</ItemGroup>
</Project>
...
...
dotnet-examples/offline-punctuation/run.sh
100644 → 100755
查看文件 @
5cce159
nodejs-addon-examples/package.json
查看文件 @
5cce159
{
"dependencies"
:
{
"sherpa-onnx-node"
:
"^1.10.
1
"
"sherpa-onnx-node"
:
"^1.10.
2
"
}
}
...
...
scripts/dotnet/.gitignore
查看文件 @
5cce159
all
macos
macos-arm64
macos-x64
linux
windows
windows-x64
...
...
scripts/dotnet/OfflinePunctuation.cs
查看文件 @
5cce159
...
...
@@ -16,7 +16,9 @@ namespace SherpaOnnx
public
String
AddPunct
(
String
text
)
{
IntPtr
p
=
SherpaOfflinePunctuationAddPunct
(
_handle
.
Handle
,
text
);
byte
[]
utf8Bytes
=
Encoding
.
UTF8
.
GetBytes
(
text
);
IntPtr
p
=
SherpaOfflinePunctuationAddPunct
(
_handle
.
Handle
,
utf8Bytes
);
string
s
=
""
;
int
length
=
0
;
...
...
@@ -77,7 +79,7 @@ namespace SherpaOnnx
private
static
extern
void
SherpaOnnxDestroyOfflinePunctuation
(
IntPtr
handle
);
[
DllImport
(
Dll
.
Filename
)]
private
static
extern
IntPtr
SherpaOfflinePunctuationAddPunct
(
IntPtr
handle
,
[
MarshalAs
(
UnmanagedType
.
LP
Str
)]
string
t
ext
);
private
static
extern
IntPtr
SherpaOfflinePunctuationAddPunct
(
IntPtr
handle
,
[
MarshalAs
(
UnmanagedType
.
LP
Array
,
ArraySubType
=
UnmanagedType
.
I1
)]
byte
[]
utf8T
ext
);
[
DllImport
(
Dll
.
Filename
)]
private
static
extern
void
SherpaOfflinePunctuationFreeText
(
IntPtr
p
);
...
...
scripts/dotnet/OfflineTts.cs
查看文件 @
5cce159
/// Copyright (c) 2024.5 by 东风破
using
System
;
using
System.Runtime.InteropServices
;
using
System.Text
;
namespace
SherpaOnnx
{
...
...
@@ -17,13 +18,15 @@ namespace SherpaOnnx
public
OfflineTtsGeneratedAudio
Generate
(
String
text
,
float
speed
,
int
speakerId
)
{
IntPtr
p
=
SherpaOnnxOfflineTtsGenerate
(
_handle
.
Handle
,
text
,
speakerId
,
speed
);
byte
[]
utf8Bytes
=
Encoding
.
UTF8
.
GetBytes
(
text
);
IntPtr
p
=
SherpaOnnxOfflineTtsGenerate
(
_handle
.
Handle
,
utf8Bytes
,
speakerId
,
speed
);
return
new
OfflineTtsGeneratedAudio
(
p
);
}
public
OfflineTtsGeneratedAudio
GenerateWithCallback
(
String
text
,
float
speed
,
int
speakerId
,
OfflineTtsCallback
callback
)
{
IntPtr
p
=
SherpaOnnxOfflineTtsGenerateWithCallback
(
_handle
.
Handle
,
text
,
speakerId
,
speed
,
callback
);
byte
[]
utf8Bytes
=
Encoding
.
UTF8
.
GetBytes
(
text
);
IntPtr
p
=
SherpaOnnxOfflineTtsGenerateWithCallback
(
_handle
.
Handle
,
utf8Bytes
,
speakerId
,
speed
,
callback
);
return
new
OfflineTtsGeneratedAudio
(
p
);
}
...
...
@@ -79,9 +82,9 @@ namespace SherpaOnnx
private
static
extern
int
SherpaOnnxOfflineTtsNumSpeakers
(
IntPtr
handle
);
[
DllImport
(
Dll
.
Filename
)]
private
static
extern
IntPtr
SherpaOnnxOfflineTtsGenerate
(
IntPtr
handle
,
[
MarshalAs
(
UnmanagedType
.
LP
Str
)]
string
t
ext
,
int
sid
,
float
speed
);
private
static
extern
IntPtr
SherpaOnnxOfflineTtsGenerate
(
IntPtr
handle
,
[
MarshalAs
(
UnmanagedType
.
LP
Array
,
ArraySubType
=
UnmanagedType
.
I1
)]
byte
[]
utf8T
ext
,
int
sid
,
float
speed
);
[
DllImport
(
Dll
.
Filename
,
CallingConvention
=
CallingConvention
.
Cdecl
)]
private
static
extern
IntPtr
SherpaOnnxOfflineTtsGenerateWithCallback
(
IntPtr
handle
,
[
MarshalAs
(
UnmanagedType
.
LP
Str
)]
string
t
ext
,
int
sid
,
float
speed
,
OfflineTtsCallback
callback
);
private
static
extern
IntPtr
SherpaOnnxOfflineTtsGenerateWithCallback
(
IntPtr
handle
,
[
MarshalAs
(
UnmanagedType
.
LP
Array
,
ArraySubType
=
UnmanagedType
.
I1
)]
byte
[]
utf8T
ext
,
int
sid
,
float
speed
,
OfflineTtsCallback
callback
);
}
}
...
...
scripts/dotnet/OfflineTtsGeneratedAudio.cs
查看文件 @
5cce159
/// Copyright (c) 2024.5 by 东风破
using
System
;
using
System.Runtime.InteropServices
;
using
System.Text
;
namespace
SherpaOnnx
{
...
...
@@ -14,7 +15,8 @@ namespace SherpaOnnx
public
bool
SaveToWaveFile
(
String
filename
)
{
Impl
impl
=
(
Impl
)
Marshal
.
PtrToStructure
(
Handle
,
typeof
(
Impl
));
int
status
=
SherpaOnnxWriteWave
(
impl
.
Samples
,
impl
.
NumSamples
,
impl
.
SampleRate
,
filename
);
byte
[]
utf8Filename
=
Encoding
.
UTF8
.
GetBytes
(
filename
);
int
status
=
SherpaOnnxWriteWave
(
impl
.
Samples
,
impl
.
NumSamples
,
impl
.
SampleRate
,
utf8Filename
);
return
status
==
1
;
}
...
...
@@ -84,6 +86,6 @@ namespace SherpaOnnx
private
static
extern
void
SherpaOnnxDestroyOfflineTtsGeneratedAudio
(
IntPtr
handle
);
[
DllImport
(
Dll
.
Filename
)]
private
static
extern
int
SherpaOnnxWriteWave
(
IntPtr
samples
,
int
n
,
int
sample_rate
,
[
MarshalAs
(
UnmanagedType
.
LP
Str
)]
string
f
ilename
);
private
static
extern
int
SherpaOnnxWriteWave
(
IntPtr
samples
,
int
n
,
int
sample_rate
,
[
MarshalAs
(
UnmanagedType
.
LP
Array
,
ArraySubType
=
UnmanagedType
.
I1
)]
byte
[]
utf8F
ilename
);
}
}
...
...
scripts/dotnet/SpeakerEmbeddingManager.cs
查看文件 @
5cce159
...
...
@@ -17,7 +17,8 @@ namespace SherpaOnnx
public
bool
Add
(
string
name
,
float
[]
v
)
{
return
SherpaOnnxSpeakerEmbeddingManagerAdd
(
_handle
.
Handle
,
name
,
v
)
==
1
;
byte
[]
utf8Name
=
Encoding
.
UTF8
.
GetBytes
(
name
);
return
SherpaOnnxSpeakerEmbeddingManagerAdd
(
_handle
.
Handle
,
utf8Name
,
v
)
==
1
;
}
public
bool
Add
(
string
name
,
ICollection
<
float
[
]>
v_list
)
...
...
@@ -31,12 +32,14 @@ namespace SherpaOnnx
i
+=
_dim
;
}
return
SherpaOnnxSpeakerEmbeddingManagerAddListFlattened
(
_handle
.
Handle
,
name
,
v
,
n
)
==
1
;
byte
[]
utf8Name
=
Encoding
.
UTF8
.
GetBytes
(
name
);
return
SherpaOnnxSpeakerEmbeddingManagerAddListFlattened
(
_handle
.
Handle
,
utf8Name
,
v
,
n
)
==
1
;
}
public
bool
Remove
(
string
name
)
{
return
SherpaOnnxSpeakerEmbeddingManagerRemove
(
_handle
.
Handle
,
name
)
==
1
;
byte
[]
utf8Name
=
Encoding
.
UTF8
.
GetBytes
(
name
);
return
SherpaOnnxSpeakerEmbeddingManagerRemove
(
_handle
.
Handle
,
utf8Name
)
==
1
;
}
public
string
Search
(
float
[]
v
,
float
threshold
)
...
...
@@ -73,12 +76,14 @@ namespace SherpaOnnx
public
bool
Verify
(
string
name
,
float
[]
v
,
float
threshold
)
{
return
SherpaOnnxSpeakerEmbeddingManagerVerify
(
_handle
.
Handle
,
name
,
v
,
threshold
)
==
1
;
byte
[]
utf8Name
=
Encoding
.
UTF8
.
GetBytes
(
name
);
return
SherpaOnnxSpeakerEmbeddingManagerVerify
(
_handle
.
Handle
,
utf8Name
,
v
,
threshold
)
==
1
;
}
public
bool
Contains
(
string
name
)
{
return
SherpaOnnxSpeakerEmbeddingManagerContains
(
_handle
.
Handle
,
name
)
==
1
;
byte
[]
utf8Name
=
Encoding
.
UTF8
.
GetBytes
(
name
);
return
SherpaOnnxSpeakerEmbeddingManagerContains
(
_handle
.
Handle
,
utf8Name
)
==
1
;
}
public
string
[]
GetAllSpeakers
()
...
...
@@ -155,13 +160,13 @@ namespace SherpaOnnx
private
static
extern
void
SherpaOnnxDestroySpeakerEmbeddingManager
(
IntPtr
handle
);
[
DllImport
(
Dll
.
Filename
)]
private
static
extern
int
SherpaOnnxSpeakerEmbeddingManagerAdd
(
IntPtr
handle
,
[
MarshalAs
(
UnmanagedType
.
LP
Str
)]
string
n
ame
,
float
[]
v
);
private
static
extern
int
SherpaOnnxSpeakerEmbeddingManagerAdd
(
IntPtr
handle
,
[
MarshalAs
(
UnmanagedType
.
LP
Array
,
ArraySubType
=
UnmanagedType
.
I1
)]
byte
[]
utf8N
ame
,
float
[]
v
);
[
DllImport
(
Dll
.
Filename
)]
private
static
extern
int
SherpaOnnxSpeakerEmbeddingManagerAddListFlattened
(
IntPtr
handle
,
[
MarshalAs
(
UnmanagedType
.
LP
Str
)]
string
n
ame
,
float
[]
v
,
int
n
);
private
static
extern
int
SherpaOnnxSpeakerEmbeddingManagerAddListFlattened
(
IntPtr
handle
,
[
MarshalAs
(
UnmanagedType
.
LP
Array
,
ArraySubType
=
UnmanagedType
.
I1
)]
byte
[]
utf8N
ame
,
float
[]
v
,
int
n
);
[
DllImport
(
Dll
.
Filename
)]
private
static
extern
int
SherpaOnnxSpeakerEmbeddingManagerRemove
(
IntPtr
handle
,
[
MarshalAs
(
UnmanagedType
.
LP
Str
)]
string
n
ame
);
private
static
extern
int
SherpaOnnxSpeakerEmbeddingManagerRemove
(
IntPtr
handle
,
[
MarshalAs
(
UnmanagedType
.
LP
Array
,
ArraySubType
=
UnmanagedType
.
I1
)]
byte
[]
utf8N
ame
);
[
DllImport
(
Dll
.
Filename
)]
private
static
extern
IntPtr
SherpaOnnxSpeakerEmbeddingManagerSearch
(
IntPtr
handle
,
float
[]
v
,
float
threshold
);
...
...
@@ -170,10 +175,10 @@ namespace SherpaOnnx
private
static
extern
void
SherpaOnnxSpeakerEmbeddingManagerFreeSearch
(
IntPtr
p
);
[
DllImport
(
Dll
.
Filename
)]
private
static
extern
int
SherpaOnnxSpeakerEmbeddingManagerVerify
(
IntPtr
handle
,
[
MarshalAs
(
UnmanagedType
.
LP
Str
)]
string
n
ame
,
float
[]
v
,
float
threshold
);
private
static
extern
int
SherpaOnnxSpeakerEmbeddingManagerVerify
(
IntPtr
handle
,
[
MarshalAs
(
UnmanagedType
.
LP
Array
,
ArraySubType
=
UnmanagedType
.
I1
)]
byte
[]
utf8N
ame
,
float
[]
v
,
float
threshold
);
[
DllImport
(
Dll
.
Filename
)]
private
static
extern
int
SherpaOnnxSpeakerEmbeddingManagerContains
(
IntPtr
handle
,
[
MarshalAs
(
UnmanagedType
.
LP
Str
)]
string
n
ame
);
private
static
extern
int
SherpaOnnxSpeakerEmbeddingManagerContains
(
IntPtr
handle
,
[
MarshalAs
(
UnmanagedType
.
LP
Array
,
ArraySubType
=
UnmanagedType
.
I1
)]
byte
[]
utf8N
ame
);
[
DllImport
(
Dll
.
Filename
)]
private
static
extern
int
SherpaOnnxSpeakerEmbeddingManagerNumSpeakers
(
IntPtr
handle
);
...
...
scripts/dotnet/examples/Common.csproj
查看文件 @
5cce159
...
...
@@ -7,7 +7,7 @@
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="org.k2fsa.sherpa.onnx" Version="
1.10.1
" />
<PackageReference Include="org.k2fsa.sherpa.onnx" Version="
*
" />
</ItemGroup>
</Project>
...
...
sherpa-onnx/flutter/CHANGELOG.md
查看文件 @
5cce159
## 1.10.2
*
Fix passing C# string to C++
## 1.10.1
*
Enable to stop TTS generation
...
...
请
注册
或
登录
后发表评论