diff --git a/speechx/speechx/frontend/audio/fbank.h b/speechx/speechx/frontend/audio/fbank.h index e513b969a2a54800d3b7cda2feb1e420504f4b99..a1e654138de1f252c599cb76e53631bd14d9c03b 100644 --- a/speechx/speechx/frontend/audio/fbank.h +++ b/speechx/speechx/frontend/audio/fbank.h @@ -15,8 +15,8 @@ #pragma once #include "base/common.h" -#include "frontend/audio/frontend_itf.h" #include "frontend/audio/feature_common.h" +#include "frontend/audio/frontend_itf.h" #include "kaldi/feat/feature-fbank.h" #include "kaldi/feat/feature-mfcc.h" #include "kaldi/matrix/kaldi-vector.h" @@ -25,11 +25,11 @@ namespace ppspeech { class FbankComputer { public: - typedef kaldi::FbankOptions Options; + typedef kaldi::FbankOptions Options; explicit FbankComputer(const Options& opts); kaldi::FrameExtractionOptions& GetFrameOptions() { - return opts_.frame_opts; + return opts_.frame_opts; } bool Compute(kaldi::Vector* window, @@ -42,7 +42,7 @@ class FbankComputer { Options opts_; kaldi::FbankComputer computer_; - //DISALLOW_COPY_AND_ASSIGN(FbankComputer); + DISALLOW_COPY_AND_ASSIGN(FbankComputer); }; typedef StreamingFeatureTpl Fbank; diff --git a/speechx/speechx/frontend/audio/linear_spectrogram.h b/speechx/speechx/frontend/audio/linear_spectrogram.h index 7ef30dbc40504ef5ac24ebd35b85683ad5ce5e6c..de957c23576f92ac0525e7d9c9e5a523dca320ac 100644 --- a/speechx/speechx/frontend/audio/linear_spectrogram.h +++ b/speechx/speechx/frontend/audio/linear_spectrogram.h @@ -16,15 +16,15 @@ #pragma once #include "base/common.h" +#include "frontend/audio/feature_common.h" #include "frontend/audio/frontend_itf.h" #include "kaldi/feat/feature-window.h" -#include "frontend/audio/feature_common.h" namespace ppspeech { struct LinearSpectrogramOptions { kaldi::FrameExtractionOptions frame_opts; - LinearSpectrogramOptions(): frame_opts() {} + LinearSpectrogramOptions() : frame_opts() {} }; class LinearSpectrogramComputer { @@ -33,7 +33,7 @@ class LinearSpectrogramComputer { explicit LinearSpectrogramComputer(const Options& opts); kaldi::FrameExtractionOptions& GetFrameOptions() { - return opts_.frame_opts; + return opts_.frame_opts; } bool Compute(kaldi::Vector* window, @@ -42,17 +42,16 @@ class LinearSpectrogramComputer { int32 Dim() const { return dim_; } bool NeedRawLogEnergy() { return false; } - + private: kaldi::BaseFloat scale_; Options opts_; int32 frame_length_; int32 dim_; + DISALLOW_COPY_AND_ASSIGN(LinearSpectrogramComputer); }; typedef StreamingFeatureTpl LinearSpectrogram; - //DISALLOW_COPY_AND_ASSIGN(LinearSpectrogram); - } // namespace ppspeech \ No newline at end of file