Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(992)

Unified Diff: webrtc/voice_engine/voe_base_impl.h

Issue 1224163002: Update audio code to use size_t more correctly, webrtc/voice_engine/ portion. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Checkpoint Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 dfb2e0474916cd4ef51d85a98d2a6e3068671d48..f0ac959dcdd0e4dd4163edaec1e5cf49d00b0aae 100644
--- a/webrtc/voice_engine/voe_base_impl.h
+++ b/webrtc/voice_engine/voe_base_impl.h
@@ -54,30 +54,31 @@ class VoEBaseImpl : public VoEBase,
int AssociateSendChannel(int channel, int accociate_send_channel) override;
// AudioTransport
- int32_t RecordedDataIsAvailable(const void* audioSamples, uint32_t nSamples,
- uint8_t nBytesPerSample, uint8_t nChannels,
+ int32_t RecordedDataIsAvailable(const void* audioSamples, size_t nSamples,
+ size_t nBytesPerSample, uint8_t nChannels,
uint32_t samplesPerSec, uint32_t totalDelayMS,
int32_t clockDrift, uint32_t micLevel,
bool keyPressed,
uint32_t& newMicLevel) override;
- int32_t NeedMorePlayData(uint32_t nSamples, uint8_t nBytesPerSample,
+ int32_t NeedMorePlayData(size_t nSamples, size_t nBytesPerSample,
uint8_t nChannels, uint32_t samplesPerSec,
- void* audioSamples, uint32_t& nSamplesOut,
+ 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,
const int16_t* audio_data, int sample_rate,
- int number_of_channels, int number_of_frames,
+ int 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 number_of_frames) override;
+ 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, int number_of_frames) override;
+ int number_of_channels,
+ size_t number_of_frames) override;
void PullRenderData(int bits_per_sample, int sample_rate,
- int number_of_channels, int number_of_frames,
+ int number_of_channels, size_t number_of_frames,
void* audio_data, int64_t* elapsed_time_ms,
int64_t* ntp_time_ms) override;
@@ -105,11 +106,11 @@ class VoEBaseImpl : public VoEBase,
int ProcessRecordedDataWithAPM(
const int voe_channels[], int number_of_voe_channels,
const void* audio_data, uint32_t sample_rate, uint8_t number_of_channels,
- uint32_t number_of_frames, uint32_t audio_delay_milliseconds,
+ 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,
- int number_of_frames, bool feed_data_to_apm,
+ size_t number_of_frames, bool feed_data_to_apm,
void* audio_data, int64_t* elapsed_time_ms,
int64_t* ntp_time_ms);

Powered by Google App Engine
This is Rietveld 408576698