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

Unified Diff: webrtc/modules/audio_device/test/func_test_manager.h

Issue 1230503003: Update a ton of audio code to use size_t more correctly and in general reduce (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Resync Created 5 years, 4 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/modules/audio_device/test/func_test_manager.h
diff --git a/webrtc/modules/audio_device/test/func_test_manager.h b/webrtc/modules/audio_device/test/func_test_manager.h
index f5ddd3a21d513f5a016435f2eb327dddec6e0e62..a91ae814e5860400499c03dd1a51bbae0dc9e048 100644
--- a/webrtc/modules/audio_device/test/func_test_manager.h
+++ b/webrtc/modules/audio_device/test/func_test_manager.h
@@ -47,8 +47,8 @@ enum TestType
struct AudioPacket
{
uint8_t dataBuffer[4 * 960];
- uint16_t nSamples;
- uint16_t nBytesPerSample;
+ size_t nSamples;
+ size_t nBytesPerSample;
uint8_t nChannels;
uint32_t samplesPerSec;
};
@@ -86,8 +86,8 @@ class AudioTransportImpl: public AudioTransport
{
public:
int32_t RecordedDataIsAvailable(const void* audioSamples,
- const uint32_t nSamples,
- const uint8_t nBytesPerSample,
+ const size_t nSamples,
+ const size_t nBytesPerSample,
const uint8_t nChannels,
const uint32_t samplesPerSec,
const uint32_t totalDelayMS,
@@ -96,12 +96,12 @@ public:
const bool keyPressed,
uint32_t& newMicLevel) override;
- int32_t NeedMorePlayData(const uint32_t nSamples,
- const uint8_t nBytesPerSample,
+ int32_t NeedMorePlayData(const size_t nSamples,
+ const size_t nBytesPerSample,
const uint8_t nChannels,
const uint32_t samplesPerSec,
void* audioSamples,
- uint32_t& nSamplesOut,
+ size_t& nSamplesOut,
int64_t* elapsed_time_ms,
int64_t* ntp_time_ms) override;
@@ -110,7 +110,7 @@ public:
const int16_t* audio_data,
int sample_rate,
int number_of_channels,
- int number_of_frames,
+ size_t number_of_frames,
int audio_delay_milliseconds,
int current_volume,
bool key_pressed,
@@ -119,10 +119,10 @@ public:
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;
+ 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;
« no previous file with comments | « webrtc/modules/audio_device/test/audio_device_test_api.cc ('k') | webrtc/modules/audio_device/test/func_test_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698