| Index: webrtc/common_audio/lapped_transform.h
|
| diff --git a/webrtc/common_audio/lapped_transform.h b/webrtc/common_audio/lapped_transform.h
|
| index 832735991befd208a516a304a7d64eca5292f3f8..18b77685a3f7a7bad1b9c8f5ec61a3fa669702ff 100644
|
| --- a/webrtc/common_audio/lapped_transform.h
|
| +++ b/webrtc/common_audio/lapped_transform.h
|
| @@ -1,5 +1,5 @@
|
| /*
|
| - * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
|
| + * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
|
| *
|
| * Use of this source code is governed by a BSD-style license
|
| * that can be found in the LICENSE file in the root of the source
|
| @@ -11,115 +11,7 @@
|
| #ifndef WEBRTC_COMMON_AUDIO_LAPPED_TRANSFORM_H_
|
| #define WEBRTC_COMMON_AUDIO_LAPPED_TRANSFORM_H_
|
|
|
| -#include <complex>
|
| -#include <memory>
|
| -
|
| -#include "webrtc/common_audio/blocker.h"
|
| -#include "webrtc/common_audio/real_fourier.h"
|
| -#include "webrtc/system_wrappers/include/aligned_array.h"
|
| -
|
| -namespace webrtc {
|
| -
|
| -// Helper class for audio processing modules which operate on frequency domain
|
| -// input derived from the windowed time domain audio stream.
|
| -//
|
| -// The input audio chunk is sliced into possibly overlapping blocks, multiplied
|
| -// by a window and transformed with an FFT implementation. The transformed data
|
| -// is supplied to the given callback for processing. The processed output is
|
| -// then inverse transformed into the time domain and spliced back into a chunk
|
| -// which constitutes the final output of this processing module.
|
| -class LappedTransform {
|
| - public:
|
| - class Callback {
|
| - public:
|
| - virtual ~Callback() {}
|
| -
|
| - virtual void ProcessAudioBlock(const std::complex<float>* const* in_block,
|
| - size_t num_in_channels, size_t frames,
|
| - size_t num_out_channels,
|
| - std::complex<float>* const* out_block) = 0;
|
| - };
|
| -
|
| - // Construct a transform instance. |chunk_length| is the number of samples in
|
| - // each channel. |window| defines the window, owned by the caller (a copy is
|
| - // made internally); |window| should have length equal to |block_length|.
|
| - // |block_length| defines the length of a block, in samples.
|
| - // |shift_amount| is in samples. |callback| is the caller-owned audio
|
| - // processing function called for each block of the input chunk.
|
| - LappedTransform(size_t num_in_channels,
|
| - size_t num_out_channels,
|
| - size_t chunk_length,
|
| - const float* window,
|
| - size_t block_length,
|
| - size_t shift_amount,
|
| - Callback* callback);
|
| - ~LappedTransform() {}
|
| -
|
| - // Main audio processing helper method. Internally slices |in_chunk| into
|
| - // blocks, transforms them to frequency domain, calls the callback for each
|
| - // block and returns a de-blocked time domain chunk of audio through
|
| - // |out_chunk|. Both buffers are caller-owned.
|
| - void ProcessChunk(const float* const* in_chunk, float* const* out_chunk);
|
| -
|
| - // Get the chunk length.
|
| - //
|
| - // The chunk length is the number of samples per channel that must be passed
|
| - // to ProcessChunk via the parameter in_chunk.
|
| - //
|
| - // Returns the same chunk_length passed to the LappedTransform constructor.
|
| - size_t chunk_length() const { return chunk_length_; }
|
| -
|
| - // Get the number of input channels.
|
| - //
|
| - // This is the number of arrays that must be passed to ProcessChunk via
|
| - // in_chunk.
|
| - //
|
| - // Returns the same num_in_channels passed to the LappedTransform constructor.
|
| - size_t num_in_channels() const { return num_in_channels_; }
|
| -
|
| - // Get the number of output channels.
|
| - //
|
| - // This is the number of arrays that must be passed to ProcessChunk via
|
| - // out_chunk.
|
| - //
|
| - // Returns the same num_out_channels passed to the LappedTransform
|
| - // constructor.
|
| - size_t num_out_channels() const { return num_out_channels_; }
|
| -
|
| - private:
|
| - // Internal middleware callback, given to the blocker. Transforms each block
|
| - // and hands it over to the processing method given at construction time.
|
| - class BlockThunk : public BlockerCallback {
|
| - public:
|
| - explicit BlockThunk(LappedTransform* parent) : parent_(parent) {}
|
| -
|
| - virtual void ProcessBlock(const float* const* input,
|
| - size_t num_frames,
|
| - size_t num_input_channels,
|
| - size_t num_output_channels,
|
| - float* const* output);
|
| -
|
| - private:
|
| - LappedTransform* const parent_;
|
| - } blocker_callback_;
|
| -
|
| - const size_t num_in_channels_;
|
| - const size_t num_out_channels_;
|
| -
|
| - const size_t block_length_;
|
| - const size_t chunk_length_;
|
| -
|
| - Callback* const block_processor_;
|
| - Blocker blocker_;
|
| -
|
| - std::unique_ptr<RealFourier> fft_;
|
| - const size_t cplx_length_;
|
| - AlignedArray<float> real_buf_;
|
| - AlignedArray<std::complex<float> > cplx_pre_;
|
| - AlignedArray<std::complex<float> > cplx_post_;
|
| -};
|
| -
|
| -} // namespace webrtc
|
| +// TODO(peah): Remove as soon as all downstream dependencies are resolved.
|
| +#include "webrtc/modules/audio_processing/utility/lapped_transform.h
|
|
|
| #endif // WEBRTC_COMMON_AUDIO_LAPPED_TRANSFORM_H_
|
| -
|
|
|