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

Side by Side Diff: webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h

Issue 1225133003: Update audio code to use size_t more correctly, (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Review comment 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 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 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 void DisableNack() override; 236 void DisableNack() override;
237 237
238 std::vector<uint16_t> GetNackList(int64_t round_trip_time_ms) const override; 238 std::vector<uint16_t> GetNackList(int64_t round_trip_time_ms) const override;
239 239
240 void GetDecodingCallStatistics(AudioDecodingCallStats* stats) const override; 240 void GetDecodingCallStatistics(AudioDecodingCallStats* stats) const override;
241 241
242 private: 242 private:
243 struct InputData { 243 struct InputData {
244 uint32_t input_timestamp; 244 uint32_t input_timestamp;
245 const int16_t* audio; 245 const int16_t* audio;
246 uint16_t length_per_channel; 246 size_t length_per_channel;
247 uint8_t audio_channel; 247 uint8_t audio_channel;
248 // If a re-mix is required (up or down), this buffer will store a re-mixed 248 // If a re-mix is required (up or down), this buffer will store a re-mixed
249 // version of the input. 249 // version of the input.
250 int16_t buffer[WEBRTC_10MS_PCM_AUDIO]; 250 int16_t buffer[WEBRTC_10MS_PCM_AUDIO];
251 }; 251 };
252 252
253 // This member class writes values to the named UMA histogram, but only if 253 // This member class writes values to the named UMA histogram, but only if
254 // the value has changed since the last time (and always for the first call). 254 // the value has changed since the last time (and always for the first call).
255 class ChangeLogger { 255 class ChangeLogger {
256 public: 256 public:
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 int playout_frequency_hz_; 400 int playout_frequency_hz_;
401 // TODO(henrik.lundin): All members below this line are temporary and should 401 // TODO(henrik.lundin): All members below this line are temporary and should
402 // be removed after refactoring is completed. 402 // be removed after refactoring is completed.
403 rtc::scoped_ptr<acm2::AudioCodingModuleImpl> acm_old_; 403 rtc::scoped_ptr<acm2::AudioCodingModuleImpl> acm_old_;
404 CodecInst current_send_codec_; 404 CodecInst current_send_codec_;
405 }; 405 };
406 406
407 } // namespace webrtc 407 } // namespace webrtc
408 408
409 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_ 409 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698