| Index: webrtc/voice_engine/transmit_mixer.h
|
| diff --git a/webrtc/voice_engine/transmit_mixer.h b/webrtc/voice_engine/transmit_mixer.h
|
| index 071d91d77a38b592e59d6bf2a06d88b86a705a62..0aee1062316ce930c18a6bd59c09d4f8eb721b60 100644
|
| --- a/webrtc/voice_engine/transmit_mixer.h
|
| +++ b/webrtc/voice_engine/transmit_mixer.h
|
| @@ -52,7 +52,7 @@ public:
|
|
|
| int32_t PrepareDemux(const void* audioSamples,
|
| size_t nSamples,
|
| - uint8_t nChannels,
|
| + size_t nChannels,
|
| uint32_t samplesPerSec,
|
| uint16_t totalDelayMS,
|
| int32_t clockDrift,
|
| @@ -63,12 +63,12 @@ public:
|
| int32_t DemuxAndMix();
|
| // Used by the Chrome to pass the recording data to the specific VoE
|
| // channels for demux.
|
| - void DemuxAndMix(const int voe_channels[], int number_of_voe_channels);
|
| + void DemuxAndMix(const int voe_channels[], size_t number_of_voe_channels);
|
|
|
| int32_t EncodeAndSend();
|
| // Used by the Chrome to pass the recording data to the specific VoE
|
| // channels for encoding and sending to the network.
|
| - void EncodeAndSend(const int voe_channels[], int number_of_voe_channels);
|
| + void EncodeAndSend(const int voe_channels[], size_t number_of_voe_channels);
|
|
|
| // Must be called on the same thread as PrepareDemux().
|
| uint32_t CaptureLevel() const;
|
| @@ -170,11 +170,11 @@ private:
|
|
|
| // Gets the maximum sample rate and number of channels over all currently
|
| // sending codecs.
|
| - void GetSendCodecInfo(int* max_sample_rate, int* max_channels);
|
| + void GetSendCodecInfo(int* max_sample_rate, size_t* max_channels);
|
|
|
| void GenerateAudioFrame(const int16_t audioSamples[],
|
| size_t nSamples,
|
| - int nChannels,
|
| + size_t nChannels,
|
| int samplesPerSec);
|
| int32_t RecordAudioToFile(uint32_t mixingFrequency);
|
|
|
|
|