From 6406616c2d3fd5eae0201cd4680258f7c4e937dd Mon Sep 17 00:00:00 2001
From: lyblsgo <lyblsgo@163.com>
Date: 星期一, 24 四月 2023 13:04:08 +0800
Subject: [PATCH] rename filenames
---
funasr/runtime/onnxruntime/src/libfunasrapi.cpp | 62 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/funasr/runtime/onnxruntime/src/libfunasrapi.cpp b/funasr/runtime/onnxruntime/src/libfunasrapi.cpp
index 0d77d20..a12d15e 100644
--- a/funasr/runtime/onnxruntime/src/libfunasrapi.cpp
+++ b/funasr/runtime/onnxruntime/src/libfunasrapi.cpp
@@ -4,23 +4,26 @@
extern "C" {
#endif
- // APIs for qmasr
- _FUNASRAPI FUNASR_HANDLE FunASRInit(const char* szModelDir, int nThreadNum, bool quantize)
+ // APIs for funasr
+ _FUNASRAPI FUNASR_HANDLE FunASRInit(const char* szModelDir, int nThreadNum, bool quantize, bool use_vad, bool use_punc)
{
- Model* mm = create_model(szModelDir, nThreadNum, quantize);
+ Model* mm = CreateModel(szModelDir, nThreadNum, quantize, use_vad, use_punc);
return mm;
}
- _FUNASRAPI FUNASR_RESULT FunASRRecogBuffer(FUNASR_HANDLE handle, const char* szBuf, int nLen, FUNASR_MODE Mode, QM_CALLBACK fnCallback)
+ _FUNASRAPI FUNASR_RESULT FunASRRecogBuffer(FUNASR_HANDLE handle, const char* szBuf, int nLen, FUNASR_MODE Mode, QM_CALLBACK fnCallback, bool use_vad, bool use_punc)
{
Model* pRecogObj = (Model*)handle;
if (!pRecogObj)
return nullptr;
+ int32_t sampling_rate = -1;
Audio audio(1);
- if (!audio.loadwav(szBuf, nLen))
+ if (!audio.loadwav(szBuf, nLen, &sampling_rate))
return nullptr;
- //audio.split();
+ if(use_vad){
+ audio.split(pRecogObj);
+ }
float* buff;
int len;
@@ -30,27 +33,32 @@
int nStep = 0;
int nTotal = audio.get_queue_size();
while (audio.fetch(buff, len, flag) > 0) {
- //pRecogObj->reset();
string msg = pRecogObj->forward(buff, len, flag);
pResult->msg += msg;
nStep++;
if (fnCallback)
fnCallback(nStep, nTotal);
}
+ if(use_punc){
+ string punc_res = pRecogObj->AddPunc((pResult->msg).c_str());
+ pResult->msg = punc_res;
+ }
return pResult;
}
- _FUNASRAPI FUNASR_RESULT FunASRRecogPCMBuffer(FUNASR_HANDLE handle, const char* szBuf, int nLen, FUNASR_MODE Mode, QM_CALLBACK fnCallback)
+ _FUNASRAPI FUNASR_RESULT FunASRRecogPCMBuffer(FUNASR_HANDLE handle, const char* szBuf, int nLen, int sampling_rate, FUNASR_MODE Mode, QM_CALLBACK fnCallback, bool use_vad, bool use_punc)
{
Model* pRecogObj = (Model*)handle;
if (!pRecogObj)
return nullptr;
Audio audio(1);
- if (!audio.loadpcmwav(szBuf, nLen))
+ if (!audio.loadpcmwav(szBuf, nLen, &sampling_rate))
return nullptr;
- //audio.split();
+ if(use_vad){
+ audio.split(pRecogObj);
+ }
float* buff;
int len;
@@ -60,27 +68,32 @@
int nStep = 0;
int nTotal = audio.get_queue_size();
while (audio.fetch(buff, len, flag) > 0) {
- //pRecogObj->reset();
string msg = pRecogObj->forward(buff, len, flag);
pResult->msg += msg;
nStep++;
if (fnCallback)
fnCallback(nStep, nTotal);
}
+ if(use_punc){
+ string punc_res = pRecogObj->AddPunc((pResult->msg).c_str());
+ pResult->msg = punc_res;
+ }
return pResult;
}
- _FUNASRAPI FUNASR_RESULT FunASRRecogPCMFile(FUNASR_HANDLE handle, const char* szFileName, FUNASR_MODE Mode, QM_CALLBACK fnCallback)
+ _FUNASRAPI FUNASR_RESULT FunASRRecogPCMFile(FUNASR_HANDLE handle, const char* szFileName, int sampling_rate, FUNASR_MODE Mode, QM_CALLBACK fnCallback, bool use_vad, bool use_punc)
{
Model* pRecogObj = (Model*)handle;
if (!pRecogObj)
return nullptr;
Audio audio(1);
- if (!audio.loadpcmwav(szFileName))
+ if (!audio.loadpcmwav(szFileName, &sampling_rate))
return nullptr;
- //audio.split();
+ if(use_vad){
+ audio.split(pRecogObj);
+ }
float* buff;
int len;
@@ -90,27 +103,33 @@
int nStep = 0;
int nTotal = audio.get_queue_size();
while (audio.fetch(buff, len, flag) > 0) {
- //pRecogObj->reset();
string msg = pRecogObj->forward(buff, len, flag);
pResult->msg += msg;
nStep++;
if (fnCallback)
fnCallback(nStep, nTotal);
}
+ if(use_punc){
+ string punc_res = pRecogObj->AddPunc((pResult->msg).c_str());
+ pResult->msg = punc_res;
+ }
return pResult;
}
- _FUNASRAPI FUNASR_RESULT FunASRRecogFile(FUNASR_HANDLE handle, const char* szWavfile, FUNASR_MODE Mode, QM_CALLBACK fnCallback)
+ _FUNASRAPI FUNASR_RESULT FunASRRecogFile(FUNASR_HANDLE handle, const char* szWavfile, FUNASR_MODE Mode, QM_CALLBACK fnCallback, bool use_vad, bool use_punc)
{
Model* pRecogObj = (Model*)handle;
if (!pRecogObj)
return nullptr;
-
+
+ int32_t sampling_rate = -1;
Audio audio(1);
- if(!audio.loadwav(szWavfile))
+ if(!audio.loadwav(szWavfile, &sampling_rate))
return nullptr;
- //audio.split();
+ if(use_vad){
+ audio.split(pRecogObj);
+ }
float* buff;
int len;
@@ -120,13 +139,16 @@
FUNASR_RECOG_RESULT* pResult = new FUNASR_RECOG_RESULT;
pResult->snippet_time = audio.get_time_len();
while (audio.fetch(buff, len, flag) > 0) {
- //pRecogObj->reset();
string msg = pRecogObj->forward(buff, len, flag);
pResult->msg+= msg;
nStep++;
if (fnCallback)
fnCallback(nStep, nTotal);
}
+ if(use_punc){
+ string punc_res = pRecogObj->AddPunc((pResult->msg).c_str());
+ pResult->msg = punc_res;
+ }
return pResult;
}
--
Gitblit v1.9.1