diff --git a/runtime/engine/vad/frontend/wav.h b/runtime/engine/vad/frontend/wav.h index 902154f40..c84326921 100644 --- a/runtime/engine/vad/frontend/wav.h +++ b/runtime/engine/vad/frontend/wav.h @@ -17,8 +17,8 @@ #include #include #include -#include #include +#include namespace wav { diff --git a/runtime/engine/vad/interface/vad_interface.cc b/runtime/engine/vad/interface/vad_interface.cc index 59b7aa94c..820988169 100644 --- a/runtime/engine/vad/interface/vad_interface.cc +++ b/runtime/engine/vad/interface/vad_interface.cc @@ -14,8 +14,8 @@ #include "vad/interface/vad_interface.h" -#include "common/base/log.h" #include "common/base/config.h" +#include "common/base/log.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.frame_ms = conf.Read("frame_ms", 32); 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_right_ms = conf.Read("speech_pad_right_ms", 0); @@ -63,8 +64,8 @@ int PPSVadChunkSizeSamples(PPSHandle_t instance) { } PPSVadState_t PPSVadFeedForward(PPSHandle_t instance, - float* chunk, - int num_element) { + float* chunk, + int num_element) { ppspeech::Vad* model = static_cast(instance); if (model == nullptr) { LOG(ERROR) << "instance is null"; @@ -72,12 +73,12 @@ PPSVadState_t PPSVadFeedForward(PPSHandle_t instance, } std::vector chunk_in(chunk, chunk + num_element); - if (!model->ForwardChunk(chunk_in)){ + if (!model->ForwardChunk(chunk_in)) { LOG(ERROR) << "forward chunk failed"; return PPS_ILLEGAL; } ppspeech::Vad::State s = model->Postprocess(); - PPSVadState_t ret = (PPSVadState_t)s; + PPSVadState_t ret = (PPSVadState_t)s; return ret; } diff --git a/runtime/engine/vad/interface/vad_interface.h b/runtime/engine/vad/interface/vad_interface.h index 5df24b555..947b1f654 100644 --- a/runtime/engine/vad/interface/vad_interface.h +++ b/runtime/engine/vad/interface/vad_interface.h @@ -21,11 +21,11 @@ extern "C" { typedef void* PPSHandle_t; typedef enum { - PPS_ILLEGAL = 0, // error - PPS_SIL, // silence - PPS_START, // start speech - PPS_SPEECH, // in speech - PPS_END, // end speech + PPS_ILLEGAL = 0, // error + PPS_SIL, // silence + PPS_START, // start speech + PPS_SPEECH, // in speech + PPS_END, // end speech } PPSVadState_t; PPSHandle_t PPSVadCreateInstance(const char* conf_path); @@ -36,8 +36,10 @@ int PPSVadReset(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 } -#endif // __cplusplus \ No newline at end of file +#endif // __cplusplus \ No newline at end of file diff --git a/runtime/engine/vad/interface/vad_interface_main.cc b/runtime/engine/vad/interface/vad_interface_main.cc index f5656943c..cb9db5d34 100644 --- a/runtime/engine/vad/interface/vad_interface_main.cc +++ b/runtime/engine/vad/interface/vad_interface_main.cc @@ -14,9 +14,9 @@ #include "vad/interface/vad_interface.h" -#include "vad/frontend/wav.h" -#include #include +#include +#include "vad/frontend/wav.h" int main(int argc, char* argv[]) { if (argc < 3) { @@ -41,7 +41,7 @@ int main(int argc, char* argv[]) { inputWav[i] = wav_reader.data()[i] / 32768; } - int window_size_samples = PPSVadChunkSizeSamples(handle); + int window_size_samples = PPSVadChunkSizeSamples(handle); for (int64_t j = 0; j < num_samples; j += window_size_samples) { auto start = j; auto end = start + window_size_samples >= num_samples diff --git a/runtime/engine/vad/nnet/vad.cc b/runtime/engine/vad/nnet/vad.cc index b5ae3be0e..db69618aa 100644 --- a/runtime/engine/vad/nnet/vad.cc +++ b/runtime/engine/vad/nnet/vad.cc @@ -57,14 +57,13 @@ void Vad::Init() { std::string Vad::ModelName() const { return "VAD"; } -void Vad::SetConfig(const VadNnetConf conf){ - SetConfig( - conf.sr, - conf.frame_ms, - conf.threshold, - conf.min_silence_duration_ms, - conf.speech_pad_left_ms, - conf.speech_pad_right_ms); +void Vad::SetConfig(const VadNnetConf conf) { + SetConfig(conf.sr, + conf.frame_ms, + conf.threshold, + conf.min_silence_duration_ms, + conf.speech_pad_left_ms, + conf.speech_pad_right_ms); } void Vad::SetConfig(const int& sr, @@ -128,7 +127,6 @@ bool Vad::Initialize() { Reset(); - // InitRuntime if (!InitRuntime()) { @@ -137,7 +135,7 @@ bool Vad::Initialize() { return false; } - initialized_=true; + initialized_ = true; fastdeploy::FDINFO << "init done."; @@ -325,4 +323,4 @@ std::ostream& operator<<(std::ostream& os, const Vad::State& s) { return os; } -} // namepsace ppspeech \ No newline at end of file +} // namepsace ppspeech \ No newline at end of file diff --git a/runtime/engine/vad/nnet/vad.h b/runtime/engine/vad/nnet/vad.h index 8eb0a9871..ac8f64b8b 100644 --- a/runtime/engine/vad/nnet/vad.h +++ b/runtime/engine/vad/nnet/vad.h @@ -17,9 +17,9 @@ #include #include #include -#include "vad/frontend/wav.h" #include "fastdeploy/fastdeploy_model.h" #include "fastdeploy/runtime.h" +#include "vad/frontend/wav.h" namespace ppspeech { @@ -36,8 +36,8 @@ struct VadNnetConf { std::string model_file_path; std::string param_file_path; std::string dict_file_path; - int num_cpu_thread; // 1 thred - std::string backend; // ort,lite, etc. + int num_cpu_thread; // 1 thred + std::string backend; // ort,lite, etc. }; class Vad : public fastdeploy::FastDeployModel { @@ -54,11 +54,11 @@ class Vad : public fastdeploy::FastDeployModel { void Reset(); void SetConfig(const int& sr, - const int& frame_ms, - const float& threshold, - const int& min_silence_duration_ms, - const int& speech_pad_left_ms, - const int& speech_pad_right_ms); + const int& frame_ms, + const float& threshold, + const int& min_silence_duration_ms, + const int& speech_pad_left_ms, + const int& speech_pad_right_ms); void SetConfig(const VadNnetConf conf); bool ForwardChunk(std::vector& chunk); @@ -147,4 +147,4 @@ class Vad : public fastdeploy::FastDeployModel { const std::vector hc_node_dims_ = {2, 1, 64}; }; -} // namepsace ppspeech \ No newline at end of file +} // namepsace ppspeech \ No newline at end of file