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

Side by Side Diff: webrtc/modules/audio_coding/acm2/audio_coding_module_impl.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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 182
183 std::vector<uint16_t> GetNackList(int64_t round_trip_time_ms) const override; 183 std::vector<uint16_t> GetNackList(int64_t round_trip_time_ms) const override;
184 184
185 void GetDecodingCallStatistics(AudioDecodingCallStats* stats) const override; 185 void GetDecodingCallStatistics(AudioDecodingCallStats* stats) const override;
186 186
187 private: 187 private:
188 struct InputData { 188 struct InputData {
189 uint32_t input_timestamp; 189 uint32_t input_timestamp;
190 const int16_t* audio; 190 const int16_t* audio;
191 size_t length_per_channel; 191 size_t length_per_channel;
192 uint8_t audio_channel; 192 size_t audio_channel;
193 // If a re-mix is required (up or down), this buffer will store a re-mixed 193 // If a re-mix is required (up or down), this buffer will store a re-mixed
194 // version of the input. 194 // version of the input.
195 int16_t buffer[WEBRTC_10MS_PCM_AUDIO]; 195 int16_t buffer[WEBRTC_10MS_PCM_AUDIO];
196 }; 196 };
197 197
198 // This member class writes values to the named UMA histogram, but only if 198 // This member class writes values to the named UMA histogram, but only if
199 // the value has changed since the last time (and always for the first call). 199 // the value has changed since the last time (and always for the first call).
200 class ChangeLogger { 200 class ChangeLogger {
201 public: 201 public:
202 explicit ChangeLogger(const std::string& histogram_name) 202 explicit ChangeLogger(const std::string& histogram_name)
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 const rtc::scoped_ptr<CriticalSectionWrapper> callback_crit_sect_; 274 const rtc::scoped_ptr<CriticalSectionWrapper> callback_crit_sect_;
275 AudioPacketizationCallback* packetization_callback_ 275 AudioPacketizationCallback* packetization_callback_
276 GUARDED_BY(callback_crit_sect_); 276 GUARDED_BY(callback_crit_sect_);
277 ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_); 277 ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_);
278 }; 278 };
279 279
280 } // namespace acm2 280 } // namespace acm2
281 } // namespace webrtc 281 } // namespace webrtc
282 282
283 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_ 283 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/acm2/audio_coding_module.cc ('k') | webrtc/modules/audio_coding/acm2/audio_coding_module_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698