Index: webrtc/voice_engine/utility.h |
diff --git a/webrtc/voice_engine/utility.h b/webrtc/voice_engine/utility.h |
index 87003c42581cd99337e3176fb3b1c2c772d438bc..98b7c34b8d930b64eb1b40ea2cd46c810ed4f85a 100644 |
--- a/webrtc/voice_engine/utility.h |
+++ b/webrtc/voice_engine/utility.h |
@@ -31,25 +31,12 @@ namespace voe { |
void RemixAndResample(const AudioFrame& src_frame, |
PushResampler<int16_t>* resampler, |
AudioFrame* dst_frame); |
- |
-// Downmix and downsample the audio in |src_data| to |dst_af| as necessary, |
-// specified by |codec_num_channels| and |codec_rate_hz|. |mono_buffer| is |
-// temporary space and must be of sufficient size to hold the downmixed source |
-// audio (recommend using a size of kMaxMonoDataSizeSamples). |
-// |
-// |dst_af| will have its data and format members (sample rate, channels and |
-// samples per channel) set appropriately. No other members will be changed. |
-// TODO(ajm): For now, this still calls Reset() on |dst_af|. Remove this, as |
-// it shouldn't be needed. |
-void DownConvertToCodecFormat(const int16_t* src_data, |
- size_t samples_per_channel, |
- int num_channels, |
- int sample_rate_hz, |
- int codec_num_channels, |
- int codec_rate_hz, |
- int16_t* mono_buffer, |
- PushResampler<int16_t>* resampler, |
- AudioFrame* dst_af); |
+void RemixAndResample(const int16_t* src_data, |
+ size_t samples_per_channel, |
+ int num_channels, |
+ int sample_rate_hz, |
+ PushResampler<int16_t>* resampler, |
+ AudioFrame* dst_frame); |
void MixWithSat(int16_t target[], |
int target_channel, |