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

Side by Side Diff: webrtc/modules/audio_coding/neteq/buffer_level_filter.cc

Issue 1228843002: Update audio code to use size_t more correctly, (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Review comments Created 5 years, 4 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
11 #include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" 11 #include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h"
12 12
13 #include <algorithm> // Provide access to std::max. 13 #include <algorithm> // Provide access to std::max.
14 14
15 namespace webrtc { 15 namespace webrtc {
16 16
17 BufferLevelFilter::BufferLevelFilter() { 17 BufferLevelFilter::BufferLevelFilter() {
18 Reset(); 18 Reset();
19 } 19 }
20 20
21 void BufferLevelFilter::Reset() { 21 void BufferLevelFilter::Reset() {
22 filtered_current_level_ = 0; 22 filtered_current_level_ = 0;
23 level_factor_ = 253; 23 level_factor_ = 253;
24 } 24 }
25 25
26 void BufferLevelFilter::Update(int buffer_size_packets, 26 void BufferLevelFilter::Update(size_t buffer_size_packets,
27 int time_stretched_samples, 27 int time_stretched_samples,
28 int packet_len_samples) { 28 size_t packet_len_samples) {
29 // Filter: 29 // Filter:
30 // |filtered_current_level_| = |level_factor_| * |filtered_current_level_| + 30 // |filtered_current_level_| = |level_factor_| * |filtered_current_level_| +
31 // (1 - |level_factor_|) * |buffer_size_packets| 31 // (1 - |level_factor_|) * |buffer_size_packets|
32 // |level_factor_| and |filtered_current_level_| are in Q8. 32 // |level_factor_| and |filtered_current_level_| are in Q8.
33 // |buffer_size_packets| is in Q0. 33 // |buffer_size_packets| is in Q0.
34 filtered_current_level_ = ((level_factor_ * filtered_current_level_) >> 8) + 34 filtered_current_level_ = ((level_factor_ * filtered_current_level_) >> 8) +
35 ((256 - level_factor_) * buffer_size_packets); 35 ((256 - level_factor_) * static_cast<int>(buffer_size_packets));
36 36
37 // Account for time-scale operations (accelerate and pre-emptive expand). 37 // Account for time-scale operations (accelerate and pre-emptive expand).
38 if (time_stretched_samples && packet_len_samples > 0) { 38 if (time_stretched_samples && packet_len_samples > 0) {
39 // Time-scaling has been performed since last filter update. Subtract the 39 // Time-scaling has been performed since last filter update. Subtract the
40 // value of |time_stretched_samples| from |filtered_current_level_| after 40 // value of |time_stretched_samples| from |filtered_current_level_| after
41 // converting |time_stretched_samples| from samples to packets in Q8. 41 // converting |time_stretched_samples| from samples to packets in Q8.
42 // Make sure that the filtered value remains non-negative. 42 // Make sure that the filtered value remains non-negative.
43 filtered_current_level_ = std::max(0, 43 filtered_current_level_ = std::max(0,
44 filtered_current_level_ - 44 filtered_current_level_ -
45 (time_stretched_samples << 8) / packet_len_samples); 45 (time_stretched_samples << 8) / static_cast<int>(packet_len_samples));
46 } 46 }
47 } 47 }
48 48
49 void BufferLevelFilter::SetTargetBufferLevel(int target_buffer_level) { 49 void BufferLevelFilter::SetTargetBufferLevel(int target_buffer_level) {
50 if (target_buffer_level <= 1) { 50 if (target_buffer_level <= 1) {
51 level_factor_ = 251; 51 level_factor_ = 251;
52 } else if (target_buffer_level <= 3) { 52 } else if (target_buffer_level <= 3) {
53 level_factor_ = 252; 53 level_factor_ = 252;
54 } else if (target_buffer_level <= 7) { 54 } else if (target_buffer_level <= 7) {
55 level_factor_ = 253; 55 level_factor_ = 253;
56 } else { 56 } else {
57 level_factor_ = 254; 57 level_factor_ = 254;
58 } 58 }
59 } 59 }
60 60
61 int BufferLevelFilter::filtered_current_level() const { 61 int BufferLevelFilter::filtered_current_level() const {
62 return filtered_current_level_; 62 return filtered_current_level_;
63 } 63 }
64 64
65 } // namespace webrtc 65 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/buffer_level_filter.h ('k') | webrtc/modules/audio_coding/neteq/comfort_noise.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698