Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t.
This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects.
This was be reviewed and approved in pieces:
https://codereview.webrtc.org/1224093003
https://codereview.webrtc.org/1224123002
https://codereview.webrtc.org/1224163002
https://codereview.webrtc.org/1225133003
https://codereview.webrtc.org/1225173002
https://codereview.webrtc.org/1227163003
https://codereview.webrtc.org/1227203003
https://codereview.webrtc.org/1227213002
https://codereview.webrtc.org/1227893002
https://codereview.webrtc.org/1228793004
https://codereview.webrtc.org/1228803003
https://codereview.webrtc.org/1228823002
https://codereview.webrtc.org/1228823003
https://codereview.webrtc.org/1228843002
https://codereview.webrtc.org/1230693002
https://codereview.webrtc.org/1231713002
The change is being landed as TBR to all the folks who reviewed the above.
BUG=chromium:81439
TEST=none
R=andrew@webrtc.org, pbos@webrtc.org
TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher
Review URL: https://codereview.webrtc.org/1230503003 .
Cr-Original-Commit-Position: refs/heads/master@{#9768}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: dce40cf804019a9898b6ab8d8262466b697c56e0
diff --git a/voice_engine/voe_base_impl.h b/voice_engine/voe_base_impl.h
index dfb2e04..f0ac959 100644
--- a/voice_engine/voe_base_impl.h
+++ b/voice_engine/voe_base_impl.h
@@ -54,30 +54,31 @@
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 @@
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);
