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

Side by Side Diff: webrtc/voice_engine/output_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
« no previous file with comments | « webrtc/voice_engine/channel.cc ('k') | webrtc/voice_engine/output_mixer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 int32_t MixActiveChannels(); 56 int32_t MixActiveChannels();
57 57
58 int32_t DoOperationsOnCombinedSignal(bool feed_data_to_apm); 58 int32_t DoOperationsOnCombinedSignal(bool feed_data_to_apm);
59 59
60 int32_t SetMixabilityStatus(MixerParticipant& participant, 60 int32_t SetMixabilityStatus(MixerParticipant& participant,
61 bool mixable); 61 bool mixable);
62 62
63 int32_t SetAnonymousMixabilityStatus(MixerParticipant& participant, 63 int32_t SetAnonymousMixabilityStatus(MixerParticipant& participant,
64 bool mixable); 64 bool mixable);
65 65
66 int GetMixedAudio(int sample_rate_hz, int num_channels, 66 int GetMixedAudio(int sample_rate_hz, size_t num_channels,
67 AudioFrame* audioFrame); 67 AudioFrame* audioFrame);
68 68
69 // VoEVolumeControl 69 // VoEVolumeControl
70 int GetSpeechOutputLevel(uint32_t& level); 70 int GetSpeechOutputLevel(uint32_t& level);
71 71
72 int GetSpeechOutputLevelFullRange(uint32_t& level); 72 int GetSpeechOutputLevelFullRange(uint32_t& level);
73 73
74 int SetOutputVolumePan(float left, float right); 74 int SetOutputVolumePan(float left, float right);
75 75
76 int GetOutputVolumePan(float& left, float& right); 76 int GetOutputVolumePan(float& left, float& right);
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 int _mixingFrequencyHz; 128 int _mixingFrequencyHz;
129 FileRecorder* _outputFileRecorderPtr; 129 FileRecorder* _outputFileRecorderPtr;
130 bool _outputFileRecording; 130 bool _outputFileRecording;
131 }; 131 };
132 132
133 } // namespace voe 133 } // namespace voe
134 134
135 } // namespace werbtc 135 } // namespace werbtc
136 136
137 #endif // VOICE_ENGINE_OUTPUT_MIXER_H_ 137 #endif // VOICE_ENGINE_OUTPUT_MIXER_H_
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel.cc ('k') | webrtc/voice_engine/output_mixer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698