webrtc/modules/audio_device/include/audio_device_defines.h - Issue 1238083005: [NOT FOR REVIEW] Convert channel counts to size_t.

Unified Diff: webrtc/modules/audio_device/include/audio_device_defines.h

Issue 1238083005: [NOT FOR REVIEW] Convert channel counts to size_t. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@size_t

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

« no previous file with comments | « webrtc/modules/audio_device/dummy/file_audio_device.cc ('k') | webrtc/modules/audio_device/test/audio_device_test_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_device/include/audio_device_defines.h

diff --git a/webrtc/modules/audio_device/include/audio_device_defines.h b/webrtc/modules/audio_device/include/audio_device_defines.h

index 32df9e975688f6d45c0a90d677f0eac73d21b005..cd592f95810f4b49547f2f19cfd2ba5ef65850a0 100644

--- a/webrtc/modules/audio_device/include/audio_device_defines.h

+++ b/webrtc/modules/audio_device/include/audio_device_defines.h

@@ -49,7 +49,7 @@ class AudioTransport {

virtual 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,

@@ -59,7 +59,7 @@ class AudioTransport {

virtual 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,

@@ -82,10 +82,10 @@ class AudioTransport {

// TODO(xians): Remove this interface after Chrome and Libjingle switches

// to OnData().

virtual 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,

@@ -103,7 +103,7 @@ class AudioTransport {

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) {}

// Method to push the captured audio data to the specific VoE channel.

@@ -116,7 +116,7 @@ class AudioTransport {

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) {}

// Method to pull mixed render audio data from all active VoE channels.

@@ -125,7 +125,7 @@ class AudioTransport {

// channel.

virtual 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,

@@ -149,12 +149,12 @@ class AudioParameters {

channels_(0),

frames_per_buffer_(0),

frames_per_10ms_buffer_(0) {}

- AudioParameters(int sample_rate, int channels, int frames_per_buffer)

+ AudioParameters(int sample_rate, size_t channels, int frames_per_buffer)

: sample_rate_(sample_rate),

channels_(channels),

frames_per_buffer_(frames_per_buffer),

frames_per_10ms_buffer_(static_cast<size_t>(sample_rate / 100)) {}

- void reset(int sample_rate, int channels, int frames_per_buffer) {

+ void reset(int sample_rate, size_t channels, int frames_per_buffer) {

sample_rate_ = sample_rate;

channels_ = channels;

frames_per_buffer_ = frames_per_buffer;

@@ -162,7 +162,7 @@ class AudioParameters {

}

int bits_per_sample() const { return kBitsPerSample; }

int sample_rate() const { return sample_rate_; }

- int channels() const { return channels_; }

+ size_t channels() const { return channels_; }

int frames_per_buffer() const { return frames_per_buffer_; }

size_t frames_per_10ms_buffer() const { return frames_per_10ms_buffer_; }

bool is_valid() const {

@@ -183,7 +183,7 @@ class AudioParameters {

private:

int sample_rate_;

- int channels_;

+ size_t channels_;

int frames_per_buffer_;

size_t frames_per_10ms_buffer_;

};