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

Side by Side Diff: webrtc/system_wrappers/include/aligned_array.h

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
11 #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ALIGNED_ARRAY_ 11 #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ALIGNED_ARRAY_
12 #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ALIGNED_ARRAY_ 12 #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ALIGNED_ARRAY_
13 13
14 #include "webrtc/base/checks.h" 14 #include "webrtc/base/checks.h"
15 #include "webrtc/system_wrappers/include/aligned_malloc.h" 15 #include "webrtc/system_wrappers/include/aligned_malloc.h"
16 16
17 namespace webrtc { 17 namespace webrtc {
18 18
19 // Wrapper class for aligned arrays. Every row (and the first dimension) are 19 // Wrapper class for aligned arrays. Every row (and the first dimension) are
20 // aligned to the given byte alignment. 20 // aligned to the given byte alignment.
21 template<typename T> class AlignedArray { 21 template<typename T> class AlignedArray {
22 public: 22 public:
23 AlignedArray(int rows, size_t cols, size_t alignment) 23 AlignedArray(size_t rows, size_t cols, size_t alignment)
24 : rows_(rows), 24 : rows_(rows),
25 cols_(cols) { 25 cols_(cols) {
26 RTC_CHECK_GT(alignment, 0u); 26 RTC_CHECK_GT(alignment, 0u);
27 head_row_ = static_cast<T**>(AlignedMalloc(rows_ * sizeof(*head_row_), 27 head_row_ = static_cast<T**>(AlignedMalloc(rows_ * sizeof(*head_row_),
28 alignment)); 28 alignment));
29 for (int i = 0; i < rows_; ++i) { 29 for (size_t i = 0; i < rows_; ++i) {
30 head_row_[i] = static_cast<T*>(AlignedMalloc(cols_ * sizeof(**head_row_), 30 head_row_[i] = static_cast<T*>(AlignedMalloc(cols_ * sizeof(**head_row_),
31 alignment)); 31 alignment));
32 } 32 }
33 } 33 }
34 34
35 ~AlignedArray() { 35 ~AlignedArray() {
36 for (int i = 0; i < rows_; ++i) { 36 for (size_t i = 0; i < rows_; ++i) {
37 AlignedFree(head_row_[i]); 37 AlignedFree(head_row_[i]);
38 } 38 }
39 AlignedFree(head_row_); 39 AlignedFree(head_row_);
40 } 40 }
41 41
42 T* const* Array() { 42 T* const* Array() {
43 return head_row_; 43 return head_row_;
44 } 44 }
45 45
46 const T* const* Array() const { 46 const T* const* Array() const {
47 return head_row_; 47 return head_row_;
48 } 48 }
49 49
50 T* Row(int row) { 50 T* Row(size_t row) {
51 RTC_CHECK_LE(row, rows_); 51 RTC_CHECK_LE(row, rows_);
52 return head_row_[row]; 52 return head_row_[row];
53 } 53 }
54 54
55 const T* Row(int row) const { 55 const T* Row(size_t row) const {
56 RTC_CHECK_LE(row, rows_); 56 RTC_CHECK_LE(row, rows_);
57 return head_row_[row]; 57 return head_row_[row];
58 } 58 }
59 59
60 T& At(int row, size_t col) { 60 T& At(size_t row, size_t col) {
61 RTC_CHECK_LE(col, cols_); 61 RTC_CHECK_LE(col, cols_);
62 return Row(row)[col]; 62 return Row(row)[col];
63 } 63 }
64 64
65 const T& At(int row, size_t col) const { 65 const T& At(size_t row, size_t col) const {
66 RTC_CHECK_LE(col, cols_); 66 RTC_CHECK_LE(col, cols_);
67 return Row(row)[col]; 67 return Row(row)[col];
68 } 68 }
69 69
70 int rows() const { 70 size_t rows() const {
71 return rows_; 71 return rows_;
72 } 72 }
73 73
74 size_t cols() const { 74 size_t cols() const {
75 return cols_; 75 return cols_;
76 } 76 }
77 77
78 private: 78 private:
79 int rows_; 79 size_t rows_;
80 size_t cols_; 80 size_t cols_;
81 T** head_row_; 81 T** head_row_;
82 }; 82 };
83 83
84 } // namespace webrtc 84 } // namespace webrtc
85 85
86 #endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ALIGNED_ARRAY_ 86 #endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ALIGNED_ARRAY_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/test/testAPI/test_api_audio.cc ('k') | webrtc/system_wrappers/source/aligned_array_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698