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

Side by Side Diff: webrtc/voice_engine/transmit_mixer.h

Issue 1316523002: Convert channel counts to size_t. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Fix compile Created 4 years, 11 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 int32_t SetEngineInformation(ProcessThread& processThread, 46 int32_t SetEngineInformation(ProcessThread& processThread,
47 Statistics& engineStatistics, 47 Statistics& engineStatistics,
48 ChannelManager& channelManager); 48 ChannelManager& channelManager);
49 49
50 int32_t SetAudioProcessingModule( 50 int32_t SetAudioProcessingModule(
51 AudioProcessing* audioProcessingModule); 51 AudioProcessing* audioProcessingModule);
52 52
53 int32_t PrepareDemux(const void* audioSamples, 53 int32_t PrepareDemux(const void* audioSamples,
54 size_t nSamples, 54 size_t nSamples,
55 uint8_t nChannels, 55 size_t nChannels,
56 uint32_t samplesPerSec, 56 uint32_t samplesPerSec,
57 uint16_t totalDelayMS, 57 uint16_t totalDelayMS,
58 int32_t clockDrift, 58 int32_t clockDrift,
59 uint16_t currentMicLevel, 59 uint16_t currentMicLevel,
60 bool keyPressed); 60 bool keyPressed);
61 61
62 62
63 int32_t DemuxAndMix(); 63 int32_t DemuxAndMix();
64 // Used by the Chrome to pass the recording data to the specific VoE 64 // Used by the Chrome to pass the recording data to the specific VoE
65 // channels for demux. 65 // channels for demux.
66 void DemuxAndMix(const int voe_channels[], int number_of_voe_channels); 66 void DemuxAndMix(const int voe_channels[], size_t number_of_voe_channels);
67 67
68 int32_t EncodeAndSend(); 68 int32_t EncodeAndSend();
69 // Used by the Chrome to pass the recording data to the specific VoE 69 // Used by the Chrome to pass the recording data to the specific VoE
70 // channels for encoding and sending to the network. 70 // channels for encoding and sending to the network.
71 void EncodeAndSend(const int voe_channels[], int number_of_voe_channels); 71 void EncodeAndSend(const int voe_channels[], size_t number_of_voe_channels);
72 72
73 // Must be called on the same thread as PrepareDemux(). 73 // Must be called on the same thread as PrepareDemux().
74 uint32_t CaptureLevel() const; 74 uint32_t CaptureLevel() const;
75 75
76 int32_t StopSend(); 76 int32_t StopSend();
77 77
78 // VoEDtmf 78 // VoEDtmf
79 void UpdateMuteMicrophoneTime(uint32_t lengthMs); 79 void UpdateMuteMicrophoneTime(uint32_t lengthMs);
80 80
81 // VoEExternalMedia 81 // VoEExternalMedia
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 #endif 163 #endif
164 164
165 void EnableStereoChannelSwapping(bool enable); 165 void EnableStereoChannelSwapping(bool enable);
166 bool IsStereoChannelSwappingEnabled(); 166 bool IsStereoChannelSwappingEnabled();
167 167
168 private: 168 private:
169 TransmitMixer(uint32_t instanceId); 169 TransmitMixer(uint32_t instanceId);
170 170
171 // Gets the maximum sample rate and number of channels over all currently 171 // Gets the maximum sample rate and number of channels over all currently
172 // sending codecs. 172 // sending codecs.
173 void GetSendCodecInfo(int* max_sample_rate, int* max_channels); 173 void GetSendCodecInfo(int* max_sample_rate, size_t* max_channels);
174 174
175 void GenerateAudioFrame(const int16_t audioSamples[], 175 void GenerateAudioFrame(const int16_t audioSamples[],
176 size_t nSamples, 176 size_t nSamples,
177 int nChannels, 177 size_t nChannels,
178 int samplesPerSec); 178 int samplesPerSec);
179 int32_t RecordAudioToFile(uint32_t mixingFrequency); 179 int32_t RecordAudioToFile(uint32_t mixingFrequency);
180 180
181 int32_t MixOrReplaceAudioWithFile( 181 int32_t MixOrReplaceAudioWithFile(
182 int mixingFrequency); 182 int mixingFrequency);
183 183
184 void ProcessAudio(int delay_ms, int clock_drift, int current_mic_level, 184 void ProcessAudio(int delay_ms, int clock_drift, int current_mic_level,
185 bool key_pressed); 185 bool key_pressed);
186 186
187 #ifdef WEBRTC_VOICE_ENGINE_TYPING_DETECTION 187 #ifdef WEBRTC_VOICE_ENGINE_TYPING_DETECTION
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 int32_t _remainingMuteMicTimeMs; 229 int32_t _remainingMuteMicTimeMs;
230 bool stereo_codec_; 230 bool stereo_codec_;
231 bool swap_stereo_channels_; 231 bool swap_stereo_channels_;
232 }; 232 };
233 233
234 } // namespace voe 234 } // namespace voe
235 235
236 } // namespace webrtc 236 } // namespace webrtc
237 237
238 #endif // WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H 238 #endif // WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H
OLDNEW
« no previous file with comments | « webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc ('k') | webrtc/voice_engine/transmit_mixer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698