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

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

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

Powered by Google App Engine
This is Rietveld 408576698