Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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_processing/transient/wpd_tree.h" | 11 #include "webrtc/modules/audio_processing/transient/wpd_tree.h" |
| 12 | 12 |
| 13 #include <assert.h> | 13 #include <assert.h> |
| 14 #include <math.h> | 14 #include <math.h> |
| 15 #include <string.h> | 15 #include <string.h> |
| 16 | 16 |
| 17 #include "webrtc/base/scoped_ptr.h" | |
|
aluebs-webrtc
2016/02/16 16:20:10
Add <memory> include?
kwiberg-webrtc
2016/02/17 03:06:30
No, the .h file already does that.
aluebs-webrtc
2016/02/17 03:15:59
I brushed up my style-guide knowledge and you are
kwiberg-webrtc
2016/02/17 03:25:31
I'd gloat, except I didn't know better either unti
| |
| 18 #include "webrtc/modules/audio_processing/transient/dyadic_decimator.h" | 17 #include "webrtc/modules/audio_processing/transient/dyadic_decimator.h" |
| 19 #include "webrtc/modules/audio_processing/transient/wpd_node.h" | 18 #include "webrtc/modules/audio_processing/transient/wpd_node.h" |
| 20 | 19 |
| 21 namespace webrtc { | 20 namespace webrtc { |
| 22 | 21 |
| 23 WPDTree::WPDTree(size_t data_length, const float* high_pass_coefficients, | 22 WPDTree::WPDTree(size_t data_length, const float* high_pass_coefficients, |
| 24 const float* low_pass_coefficients, size_t coefficients_length, | 23 const float* low_pass_coefficients, size_t coefficients_length, |
| 25 int levels) | 24 int levels) |
| 26 : data_length_(data_length), | 25 : data_length_(data_length), |
| 27 levels_(levels), | 26 levels_(levels), |
| 28 num_nodes_((1 << (levels + 1)) - 1) { | 27 num_nodes_((1 << (levels + 1)) - 1) { |
| 29 assert(data_length > (static_cast<size_t>(1) << levels) && | 28 assert(data_length > (static_cast<size_t>(1) << levels) && |
| 30 high_pass_coefficients && | 29 high_pass_coefficients && |
| 31 low_pass_coefficients && | 30 low_pass_coefficients && |
| 32 levels > 0); | 31 levels > 0); |
| 33 // Size is 1 more, so we can use the array as 1-based. nodes_[0] is never | 32 // Size is 1 more, so we can use the array as 1-based. nodes_[0] is never |
| 34 // allocated. | 33 // allocated. |
| 35 nodes_.reset(new rtc::scoped_ptr<WPDNode>[num_nodes_ + 1]); | 34 nodes_.reset(new std::unique_ptr<WPDNode>[num_nodes_ + 1]); |
| 36 | 35 |
| 37 // Create the first node | 36 // Create the first node |
| 38 const float kRootCoefficient = 1.f; // Identity Coefficient. | 37 const float kRootCoefficient = 1.f; // Identity Coefficient. |
| 39 nodes_[1].reset(new WPDNode(data_length, &kRootCoefficient, 1)); | 38 nodes_[1].reset(new WPDNode(data_length, &kRootCoefficient, 1)); |
| 40 // Variables used to create the rest of the nodes. | 39 // Variables used to create the rest of the nodes. |
| 41 size_t index = 1; | 40 size_t index = 1; |
| 42 size_t index_left_child = 0; | 41 size_t index_left_child = 0; |
| 43 size_t index_right_child = 0; | 42 size_t index_right_child = 0; |
| 44 | 43 |
| 45 int num_nodes_at_curr_level = 0; | 44 int num_nodes_at_curr_level = 0; |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 110 if (update_result != 0) { | 109 if (update_result != 0) { |
| 111 return -1; | 110 return -1; |
| 112 } | 111 } |
| 113 } | 112 } |
| 114 } | 113 } |
| 115 | 114 |
| 116 return 0; | 115 return 0; |
| 117 } | 116 } |
| 118 | 117 |
| 119 } // namespace webrtc | 118 } // namespace webrtc |
| OLD | NEW |