| Index: webrtc/voice_engine/voe_base_impl.h
|
| diff --git a/webrtc/voice_engine/voe_base_impl.h b/webrtc/voice_engine/voe_base_impl.h
|
| index f0ac959dcdd0e4dd4163edaec1e5cf49d00b0aae..8e1b969bb17eca014937fb7d1681d0f3a01eda10 100644
|
| --- a/webrtc/voice_engine/voe_base_impl.h
|
| +++ b/webrtc/voice_engine/voe_base_impl.h
|
| @@ -55,30 +55,30 @@ class VoEBaseImpl : public VoEBase,
|
|
|
| // AudioTransport
|
| int32_t RecordedDataIsAvailable(const void* audioSamples, size_t nSamples,
|
| - size_t nBytesPerSample, uint8_t nChannels,
|
| + size_t nBytesPerSample, size_t nChannels,
|
| uint32_t samplesPerSec, uint32_t totalDelayMS,
|
| int32_t clockDrift, uint32_t micLevel,
|
| bool keyPressed,
|
| uint32_t& newMicLevel) override;
|
| int32_t NeedMorePlayData(size_t nSamples, size_t nBytesPerSample,
|
| - uint8_t nChannels, uint32_t samplesPerSec,
|
| + size_t nChannels, uint32_t samplesPerSec,
|
| void* audioSamples, size_t& nSamplesOut,
|
| int64_t* elapsed_time_ms,
|
| int64_t* ntp_time_ms) override;
|
| - int OnDataAvailable(const int voe_channels[], int number_of_voe_channels,
|
| + int OnDataAvailable(const int voe_channels[], size_t number_of_voe_channels,
|
| const int16_t* audio_data, int sample_rate,
|
| - int number_of_channels, size_t number_of_frames,
|
| + size_t number_of_channels, size_t number_of_frames,
|
| int audio_delay_milliseconds, int volume,
|
| bool key_pressed, bool need_audio_processing) override;
|
| void OnData(int voe_channel, const void* audio_data, int bits_per_sample,
|
| - int sample_rate, int number_of_channels,
|
| + int sample_rate, size_t number_of_channels,
|
| size_t number_of_frames) override;
|
| void PushCaptureData(int voe_channel, const void* audio_data,
|
| int bits_per_sample, int sample_rate,
|
| - int number_of_channels,
|
| + size_t number_of_channels,
|
| size_t number_of_frames) override;
|
| void PullRenderData(int bits_per_sample, int sample_rate,
|
| - int number_of_channels, size_t number_of_frames,
|
| + size_t number_of_channels, size_t number_of_frames,
|
| void* audio_data, int64_t* elapsed_time_ms,
|
| int64_t* ntp_time_ms) override;
|
|
|
| @@ -104,12 +104,12 @@ class VoEBaseImpl : public VoEBase,
|
| // It returns new AGC microphone volume or 0 if no volume changes
|
| // should be done.
|
| int ProcessRecordedDataWithAPM(
|
| - const int voe_channels[], int number_of_voe_channels,
|
| - const void* audio_data, uint32_t sample_rate, uint8_t number_of_channels,
|
| + const int voe_channels[], size_t number_of_voe_channels,
|
| + const void* audio_data, uint32_t sample_rate, size_t number_of_channels,
|
| size_t number_of_frames, uint32_t audio_delay_milliseconds,
|
| int32_t clock_drift, uint32_t volume, bool key_pressed);
|
|
|
| - void GetPlayoutData(int sample_rate, int number_of_channels,
|
| + void GetPlayoutData(int sample_rate, size_t number_of_channels,
|
| size_t number_of_frames, bool feed_data_to_apm,
|
| void* audio_data, int64_t* elapsed_time_ms,
|
| int64_t* ntp_time_ms);
|
|
|