pull/3026/head
Hui Zhang 3 years ago
parent 77a3ceaa08
commit ffe84c6656

@ -17,8 +17,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <string>
#include <iostream> #include <iostream>
#include <string>
namespace wav { namespace wav {

@ -14,8 +14,8 @@
#include "vad/interface/vad_interface.h" #include "vad/interface/vad_interface.h"
#include "common/base/log.h"
#include "common/base/config.h" #include "common/base/config.h"
#include "common/base/log.h"
#include "vad/nnet/vad.h" #include "vad/nnet/vad.h"
@ -25,7 +25,8 @@ PPSHandle_t PPSVadCreateInstance(const char* conf_path) {
nnet_conf.sr = conf.Read("sr", 16000); nnet_conf.sr = conf.Read("sr", 16000);
nnet_conf.frame_ms = conf.Read("frame_ms", 32); nnet_conf.frame_ms = conf.Read("frame_ms", 32);
nnet_conf.threshold = conf.Read("threshold", 0.45f); nnet_conf.threshold = conf.Read("threshold", 0.45f);
nnet_conf.min_silence_duration_ms = conf.Read("min_silence_duration_ms", 200); nnet_conf.min_silence_duration_ms =
conf.Read("min_silence_duration_ms", 200);
nnet_conf.speech_pad_left_ms = conf.Read("speech_pad_left_ms", 0); nnet_conf.speech_pad_left_ms = conf.Read("speech_pad_left_ms", 0);
nnet_conf.speech_pad_right_ms = conf.Read("speech_pad_right_ms", 0); nnet_conf.speech_pad_right_ms = conf.Read("speech_pad_right_ms", 0);
@ -72,7 +73,7 @@ PPSVadState_t PPSVadFeedForward(PPSHandle_t instance,
} }
std::vector<float> chunk_in(chunk, chunk + num_element); std::vector<float> chunk_in(chunk, chunk + num_element);
if (!model->ForwardChunk(chunk_in)){ if (!model->ForwardChunk(chunk_in)) {
LOG(ERROR) << "forward chunk failed"; LOG(ERROR) << "forward chunk failed";
return PPS_ILLEGAL; return PPS_ILLEGAL;
} }

@ -36,7 +36,9 @@ int PPSVadReset(PPSHandle_t instance);
int PPSVadChunkSizeSamples(PPSHandle_t instance); int PPSVadChunkSizeSamples(PPSHandle_t instance);
PPSVadState_t PPSVadFeedForward(PPSHandle_t instance, float* chunk,int num_element); PPSVadState_t PPSVadFeedForward(PPSHandle_t instance,
float* chunk,
int num_element);
#ifdef __cplusplus #ifdef __cplusplus
} }

@ -14,9 +14,9 @@
#include "vad/interface/vad_interface.h" #include "vad/interface/vad_interface.h"
#include "vad/frontend/wav.h"
#include <vector>
#include <iostream> #include <iostream>
#include <vector>
#include "vad/frontend/wav.h"
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
if (argc < 3) { if (argc < 3) {

@ -57,9 +57,8 @@ void Vad::Init() {
std::string Vad::ModelName() const { return "VAD"; } std::string Vad::ModelName() const { return "VAD"; }
void Vad::SetConfig(const VadNnetConf conf){ void Vad::SetConfig(const VadNnetConf conf) {
SetConfig( SetConfig(conf.sr,
conf.sr,
conf.frame_ms, conf.frame_ms,
conf.threshold, conf.threshold,
conf.min_silence_duration_ms, conf.min_silence_duration_ms,
@ -129,7 +128,6 @@ bool Vad::Initialize() {
Reset(); Reset();
// InitRuntime // InitRuntime
if (!InitRuntime()) { if (!InitRuntime()) {
fastdeploy::FDERROR << "Failed to initialize fastdeploy backend." fastdeploy::FDERROR << "Failed to initialize fastdeploy backend."
@ -137,7 +135,7 @@ bool Vad::Initialize() {
return false; return false;
} }
initialized_=true; initialized_ = true;
fastdeploy::FDINFO << "init done."; fastdeploy::FDINFO << "init done.";

@ -17,9 +17,9 @@
#include <iostream> #include <iostream>
#include <mutex> #include <mutex>
#include <vector> #include <vector>
#include "vad/frontend/wav.h"
#include "fastdeploy/fastdeploy_model.h" #include "fastdeploy/fastdeploy_model.h"
#include "fastdeploy/runtime.h" #include "fastdeploy/runtime.h"
#include "vad/frontend/wav.h"
namespace ppspeech { namespace ppspeech {

Loading…
Cancel
Save