From 952b1a145110da49d667562bde8c9f27e8550ac9 Mon Sep 17 00:00:00 2001 From: Yang Zhou Date: Tue, 31 May 2022 08:41:22 +0800 Subject: [PATCH] rename, test=doc --- speechx/speechx/decoder/param.h | 6 +++--- speechx/speechx/frontend/audio/CMakeLists.txt | 2 +- .../frontend/audio/{dispenser.cc => assembler.cc} | 12 ++++++------ .../frontend/audio/{dispenser.h => assembler.h} | 12 ++++++------ speechx/speechx/frontend/audio/feature_pipeline.cc | 4 ++-- speechx/speechx/frontend/audio/feature_pipeline.h | 8 ++++---- 6 files changed, 22 insertions(+), 22 deletions(-) rename speechx/speechx/frontend/audio/{dispenser.cc => assembler.cc} (87%) rename speechx/speechx/frontend/audio/{dispenser.h => assembler.h} (90%) diff --git a/speechx/speechx/decoder/param.h b/speechx/speechx/decoder/param.h index ae759568..495e5236 100644 --- a/speechx/speechx/decoder/param.h +++ b/speechx/speechx/decoder/param.h @@ -81,8 +81,8 @@ FeaturePipelineOptions InitFeaturePipelineOptions() { frame_opts.preemph_coeff = 0.0; opts.linear_spectrogram_opts.frame_opts = frame_opts; } - opts.dispenser_opts.frame_chunk_size = FLAGS_receptive_field_length; - opts.dispenser_opts.frame_chunk_stride = FLAGS_downsampling_rate; + opts.assembler_opts.frame_chunk_size = FLAGS_receptive_field_length; + opts.assembler_opts.frame_chunk_stride = FLAGS_downsampling_rate; return opts; } @@ -115,4 +115,4 @@ RecognizerResource InitRecognizerResoure() { resource.tlg_opts = InitDecoderOptions(); return resource; } -} \ No newline at end of file +} diff --git a/speechx/speechx/frontend/audio/CMakeLists.txt b/speechx/speechx/frontend/audio/CMakeLists.txt index ee7c05c4..8ae63256 100644 --- a/speechx/speechx/frontend/audio/CMakeLists.txt +++ b/speechx/speechx/frontend/audio/CMakeLists.txt @@ -8,7 +8,7 @@ add_library(frontend STATIC feature_cache.cc feature_pipeline.cc fbank.cc - dispenser.cc + assembler.cc ) target_link_libraries(frontend PUBLIC kaldi-matrix kaldi-feat-common kaldi-fbank) diff --git a/speechx/speechx/frontend/audio/dispenser.cc b/speechx/speechx/frontend/audio/assembler.cc similarity index 87% rename from speechx/speechx/frontend/audio/dispenser.cc rename to speechx/speechx/frontend/audio/assembler.cc index 0e8cdc6f..47e0705b 100644 --- a/speechx/speechx/frontend/audio/dispenser.cc +++ b/speechx/speechx/frontend/audio/assembler.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "frontend/audio/dispenser.h" +#include "frontend/audio/assembler.h" namespace ppspeech { @@ -21,7 +21,7 @@ using kaldi::VectorBase; using kaldi::BaseFloat; using std::unique_ptr; -Dispenser::Dispenser(DispenserOptions opts, +Assembler::Assembler(AssemblerOptions opts, unique_ptr base_extractor) { frame_chunk_stride_ = opts.frame_chunk_stride; frame_chunk_size_ = opts.frame_chunk_size; @@ -29,20 +29,20 @@ Dispenser::Dispenser(DispenserOptions opts, dim_ = base_extractor_->Dim(); } -void Dispenser::Accept(const kaldi::VectorBase& inputs) { +void Assembler::Accept(const kaldi::VectorBase& inputs) { // read inputs base_extractor_->Accept(inputs); } // pop feature chunk -bool Dispenser::Read(kaldi::Vector* feats) { +bool Assembler::Read(kaldi::Vector* feats) { feats->Resize(dim_ * frame_chunk_size_); bool result = Compute(feats); return result; } // read all data from base_feature_extractor_ into cache_ -bool Dispenser::Compute(Vector* feats) { +bool Assembler::Compute(Vector* feats) { // compute and feed bool result = false; while (feature_cache_.size() < frame_chunk_size_) { @@ -69,4 +69,4 @@ bool Dispenser::Compute(Vector* feats) { return result; } -} // namespace ppspeech \ No newline at end of file +} // namespace ppspeech diff --git a/speechx/speechx/frontend/audio/dispenser.h b/speechx/speechx/frontend/audio/assembler.h similarity index 90% rename from speechx/speechx/frontend/audio/dispenser.h rename to speechx/speechx/frontend/audio/assembler.h index 89d9c977..4397d3f6 100644 --- a/speechx/speechx/frontend/audio/dispenser.h +++ b/speechx/speechx/frontend/audio/assembler.h @@ -19,19 +19,19 @@ namespace ppspeech { -struct DispenserOptions { +struct AssemblerOptions { int32 frame_chunk_size; int32 frame_chunk_stride; - DispenserOptions() + AssemblerOptions() : frame_chunk_size(1), frame_chunk_stride(1) {} }; -class Dispenser : public FrontendInterface { +class Assembler : public FrontendInterface { public: - explicit Dispenser( - DispenserOptions opts, + explicit Assembler( + AssemblerOptions opts, std::unique_ptr base_extractor = NULL); // Feed feats or waves @@ -61,7 +61,7 @@ class Dispenser : public FrontendInterface { int32 frame_chunk_stride_; // stride std::queue> feature_cache_; std::unique_ptr base_extractor_; - DISALLOW_COPY_AND_ASSIGN(Dispenser); + DISALLOW_COPY_AND_ASSIGN(Assembler); }; } // namespace ppspeech diff --git a/speechx/speechx/frontend/audio/feature_pipeline.cc b/speechx/speechx/frontend/audio/feature_pipeline.cc index 026905f0..9cacff9f 100644 --- a/speechx/speechx/frontend/audio/feature_pipeline.cc +++ b/speechx/speechx/frontend/audio/feature_pipeline.cc @@ -39,7 +39,7 @@ FeaturePipeline::FeaturePipeline(const FeaturePipelineOptions& opts) { new ppspeech::FeatureCache(opts.feature_cache_opts, std::move(cmvn))); base_extractor_.reset( - new ppspeech::Dispenser(opts.dispenser_opts, std::move(cache))); + new ppspeech::Assembler(opts.assembler_opts, std::move(cache))); } -} // ppspeech \ No newline at end of file +} // ppspeech diff --git a/speechx/speechx/frontend/audio/feature_pipeline.h b/speechx/speechx/frontend/audio/feature_pipeline.h index 9f86c634..b848f548 100644 --- a/speechx/speechx/frontend/audio/feature_pipeline.h +++ b/speechx/speechx/frontend/audio/feature_pipeline.h @@ -23,7 +23,7 @@ #include "frontend/audio/frontend_itf.h" #include "frontend/audio/linear_spectrogram.h" #include "frontend/audio/normalizer.h" -#include "frontend/audio/dispenser.h" +#include "frontend/audio/assembler.h" namespace ppspeech { @@ -34,7 +34,7 @@ struct FeaturePipelineOptions { LinearSpectrogramOptions linear_spectrogram_opts; FbankOptions fbank_opts; FeatureCacheOptions feature_cache_opts; - DispenserOptions dispenser_opts; + AssemblerOptions assembler_opts; FeaturePipelineOptions() : cmvn_file(""), @@ -43,7 +43,7 @@ struct FeaturePipelineOptions { linear_spectrogram_opts(), fbank_opts(), feature_cache_opts(), - dispenser_opts() {} + assembler_opts() {} }; class FeaturePipeline : public FrontendInterface { @@ -63,4 +63,4 @@ class FeaturePipeline : public FrontendInterface { private: std::unique_ptr base_extractor_; }; -} \ No newline at end of file +}