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

Side by Side Diff: webrtc/modules/audio_processing/agc/histogram.h

Issue 1710483002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_processing/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 10 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 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AGC_HISTOGRAM_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AGC_HISTOGRAM_H_
12 #define WEBRTC_MODULES_AUDIO_PROCESSING_AGC_HISTOGRAM_H_ 12 #define WEBRTC_MODULES_AUDIO_PROCESSING_AGC_HISTOGRAM_H_
13 13
14 #include <string.h> 14 #include <string.h>
15 15
16 #include "webrtc/base/scoped_ptr.h" 16 #include <memory>
17
17 #include "webrtc/typedefs.h" 18 #include "webrtc/typedefs.h"
18 19
19 namespace webrtc { 20 namespace webrtc {
20 21
21 // This class implements the histogram of loudness with circular buffers so that 22 // This class implements the histogram of loudness with circular buffers so that
22 // the histogram tracks the last T seconds of the loudness. 23 // the histogram tracks the last T seconds of the loudness.
23 class Histogram { 24 class Histogram {
24 public: 25 public:
25 // Create a non-sliding Histogram. 26 // Create a non-sliding Histogram.
26 static Histogram* Create(); 27 static Histogram* Create();
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 // Audio content, this should be equal to the sum of the components of 67 // Audio content, this should be equal to the sum of the components of
67 // |bin_count_q10_|. 68 // |bin_count_q10_|.
68 int64_t audio_content_q10_; 69 int64_t audio_content_q10_;
69 70
70 // Histogram of input RMS in Q10 with |kHistSize_| bins. In each 'Update(),' 71 // Histogram of input RMS in Q10 with |kHistSize_| bins. In each 'Update(),'
71 // we increment the associated histogram-bin with the given probability. The 72 // we increment the associated histogram-bin with the given probability. The
72 // increment is implemented in Q10 to avoid rounding errors. 73 // increment is implemented in Q10 to avoid rounding errors.
73 int64_t bin_count_q10_[kHistSize]; 74 int64_t bin_count_q10_[kHistSize];
74 75
75 // Circular buffer for probabilities 76 // Circular buffer for probabilities
76 rtc::scoped_ptr<int[]> activity_probability_; 77 std::unique_ptr<int[]> activity_probability_;
77 // Circular buffer for histogram-indices of probabilities. 78 // Circular buffer for histogram-indices of probabilities.
78 rtc::scoped_ptr<int[]> hist_bin_index_; 79 std::unique_ptr<int[]> hist_bin_index_;
79 // Current index of circular buffer, where the newest data will be written to, 80 // Current index of circular buffer, where the newest data will be written to,
80 // therefore, pointing to the oldest data if buffer is full. 81 // therefore, pointing to the oldest data if buffer is full.
81 int buffer_index_; 82 int buffer_index_;
82 // Indicating if buffer is full and we had a wrap around. 83 // Indicating if buffer is full and we had a wrap around.
83 int buffer_is_full_; 84 int buffer_is_full_;
84 // Size of circular buffer. 85 // Size of circular buffer.
85 int len_circular_buffer_; 86 int len_circular_buffer_;
86 int len_high_activity_; 87 int len_high_activity_;
87 }; 88 };
88 89
89 } // namespace webrtc 90 } // namespace webrtc
90 91
91 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AGC_HISTOGRAM_H_ 92 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AGC_HISTOGRAM_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_processing/agc/agc_manager_direct.h ('k') | webrtc/modules/audio_processing/agc/histogram_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698