| 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 167aacdb113a1738444b2e47811bede9c37cb010..58e0387423a31143b17bd5ff7091c2f845653a9d 100644
|
| --- a/webrtc/voice_engine/voe_base_impl.h
|
| +++ b/webrtc/voice_engine/voe_base_impl.h
|
| @@ -57,7 +57,7 @@ class VoEBaseImpl : public VoEBase,
|
| int32_t RecordedDataIsAvailable(const void* audioSamples,
|
| const size_t nSamples,
|
| const size_t nBytesPerSample,
|
| - const uint8_t nChannels,
|
| + const size_t nChannels,
|
| const uint32_t samplesPerSec,
|
| const uint32_t totalDelayMS,
|
| const int32_t clockDrift,
|
| @@ -66,17 +66,17 @@ class VoEBaseImpl : public VoEBase,
|
| uint32_t& newMicLevel) override;
|
| int32_t NeedMorePlayData(const size_t nSamples,
|
| const size_t nBytesPerSample,
|
| - const uint8_t nChannels,
|
| + const size_t nChannels,
|
| const 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,
|
| + size_t number_of_voe_channels,
|
| const int16_t* audio_data,
|
| int sample_rate,
|
| - int number_of_channels,
|
| + size_t number_of_channels,
|
| size_t number_of_frames,
|
| int audio_delay_milliseconds,
|
| int current_volume,
|
| @@ -86,17 +86,17 @@ class VoEBaseImpl : public VoEBase,
|
| 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 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_channels,
|
| size_t number_of_frames,
|
| void* audio_data,
|
| int64_t* elapsed_time_ms,
|
| @@ -124,12 +124,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);
|
|
|