| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 // input ones. | 33 // input ones. |
| 34 void RemixAndResample(const AudioFrame& src_frame, | 34 void RemixAndResample(const AudioFrame& src_frame, |
| 35 PushResampler<int16_t>* resampler, | 35 PushResampler<int16_t>* resampler, |
| 36 AudioFrame* dst_frame); | 36 AudioFrame* dst_frame); |
| 37 | 37 |
| 38 // This version has a pointer to the samples |src_data| as input and receives | 38 // This version has a pointer to the samples |src_data| as input and receives |
| 39 // |samples_per_channel|, |num_channels| and |sample_rate_hz| of the data as | 39 // |samples_per_channel|, |num_channels| and |sample_rate_hz| of the data as |
| 40 // parameters. | 40 // parameters. |
| 41 void RemixAndResample(const int16_t* src_data, | 41 void RemixAndResample(const int16_t* src_data, |
| 42 size_t samples_per_channel, | 42 size_t samples_per_channel, |
| 43 int num_channels, | 43 size_t num_channels, |
| 44 int sample_rate_hz, | 44 int sample_rate_hz, |
| 45 PushResampler<int16_t>* resampler, | 45 PushResampler<int16_t>* resampler, |
| 46 AudioFrame* dst_frame); | 46 AudioFrame* dst_frame); |
| 47 | 47 |
| 48 void MixWithSat(int16_t target[], | 48 void MixWithSat(int16_t target[], |
| 49 int target_channel, | 49 size_t target_channel, |
| 50 const int16_t source[], | 50 const int16_t source[], |
| 51 int source_channel, | 51 size_t source_channel, |
| 52 size_t source_len); | 52 size_t source_len); |
| 53 | 53 |
| 54 } // namespace voe | 54 } // namespace voe |
| 55 } // namespace webrtc | 55 } // namespace webrtc |
| 56 | 56 |
| 57 #endif // WEBRTC_VOICE_ENGINE_UTILITY_H_ | 57 #endif // WEBRTC_VOICE_ENGINE_UTILITY_H_ |
| OLD | NEW |