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

Side by Side Diff: webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.cc

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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 const size_t max_encoded_bytes_active = speech_encoder_->MaxEncodedBytes(); 68 const size_t max_encoded_bytes_active = speech_encoder_->MaxEncodedBytes();
69 const size_t max_encoded_bytes_passive = 69 const size_t max_encoded_bytes_passive =
70 rtc::CheckedDivExact(kMaxFrameSizeMs, 10) * SamplesPer10msFrame(); 70 rtc::CheckedDivExact(kMaxFrameSizeMs, 10) * SamplesPer10msFrame();
71 return std::max(max_encoded_bytes_active, max_encoded_bytes_passive); 71 return std::max(max_encoded_bytes_active, max_encoded_bytes_passive);
72 } 72 }
73 73
74 int AudioEncoderCng::SampleRateHz() const { 74 int AudioEncoderCng::SampleRateHz() const {
75 return speech_encoder_->SampleRateHz(); 75 return speech_encoder_->SampleRateHz();
76 } 76 }
77 77
78 int AudioEncoderCng::NumChannels() const { 78 size_t AudioEncoderCng::NumChannels() const {
79 return 1; 79 return 1;
80 } 80 }
81 81
82 int AudioEncoderCng::RtpTimestampRateHz() const { 82 int AudioEncoderCng::RtpTimestampRateHz() const {
83 return speech_encoder_->RtpTimestampRateHz(); 83 return speech_encoder_->RtpTimestampRateHz();
84 } 84 }
85 85
86 size_t AudioEncoderCng::Num10MsFramesInNextPacket() const { 86 size_t AudioEncoderCng::Num10MsFramesInNextPacket() const {
87 return speech_encoder_->Num10MsFramesInNextPacket(); 87 return speech_encoder_->Num10MsFramesInNextPacket();
88 } 88 }
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 } 255 }
256 } 256 }
257 return info; 257 return info;
258 } 258 }
259 259
260 size_t AudioEncoderCng::SamplesPer10msFrame() const { 260 size_t AudioEncoderCng::SamplesPer10msFrame() const {
261 return rtc::CheckedDivExact(10 * SampleRateHz(), 1000); 261 return rtc::CheckedDivExact(10 * SampleRateHz(), 1000);
262 } 262 }
263 263
264 } // namespace webrtc 264 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698