| OLD | NEW |
| 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_INTERFACE_ALIGNED_ARRAY_ | 11 #ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ALIGNED_ARRAY_ |
| 12 #define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ALIGNED_ARRAY_ | 12 #define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ALIGNED_ARRAY_ |
| 13 | 13 |
| 14 #include "webrtc/base/checks.h" | 14 #include "webrtc/base/checks.h" |
| 15 #include "webrtc/system_wrappers/interface/aligned_malloc.h" | 15 #include "webrtc/system_wrappers/interface/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, int cols, int alignment) | 23 AlignedArray(int rows, size_t cols, int alignment) |
| 24 : rows_(rows), | 24 : rows_(rows), |
| 25 cols_(cols), | 25 cols_(cols), |
| 26 alignment_(alignment) { | 26 alignment_(alignment) { |
| 27 CHECK_GT(alignment_, 0); | 27 CHECK_GT(alignment_, 0); |
| 28 head_row_ = static_cast<T**>(AlignedMalloc(rows_ * sizeof(*head_row_), | 28 head_row_ = static_cast<T**>(AlignedMalloc(rows_ * sizeof(*head_row_), |
| 29 alignment_)); | 29 alignment_)); |
| 30 for (int i = 0; i < rows_; ++i) { | 30 for (int i = 0; i < rows_; ++i) { |
| 31 head_row_[i] = static_cast<T*>(AlignedMalloc(cols_ * sizeof(**head_row_), | 31 head_row_[i] = static_cast<T*>(AlignedMalloc(cols_ * sizeof(**head_row_), |
| 32 alignment_)); | 32 alignment_)); |
| 33 } | 33 } |
| (...skipping 17 matching lines...) Expand all Loading... |
| 51 T* Row(int row) { | 51 T* Row(int row) { |
| 52 CHECK_LE(row, rows_); | 52 CHECK_LE(row, rows_); |
| 53 return head_row_[row]; | 53 return head_row_[row]; |
| 54 } | 54 } |
| 55 | 55 |
| 56 const T* Row(int row) const { | 56 const T* Row(int row) const { |
| 57 CHECK_LE(row, rows_); | 57 CHECK_LE(row, rows_); |
| 58 return head_row_[row]; | 58 return head_row_[row]; |
| 59 } | 59 } |
| 60 | 60 |
| 61 T& At(int row, int col) { | 61 T& At(int row, size_t col) { |
| 62 CHECK_LE(col, cols_); | 62 CHECK_LE(col, cols_); |
| 63 return Row(row)[col]; | 63 return Row(row)[col]; |
| 64 } | 64 } |
| 65 | 65 |
| 66 const T& At(int row, int col) const { | 66 const T& At(int row, size_t col) const { |
| 67 CHECK_LE(col, cols_); | 67 CHECK_LE(col, cols_); |
| 68 return Row(row)[col]; | 68 return Row(row)[col]; |
| 69 } | 69 } |
| 70 | 70 |
| 71 int rows() const { | 71 int rows() const { |
| 72 return rows_; | 72 return rows_; |
| 73 } | 73 } |
| 74 | 74 |
| 75 int cols() const { | 75 size_t cols() const { |
| 76 return cols_; | 76 return cols_; |
| 77 } | 77 } |
| 78 | 78 |
| 79 private: | 79 private: |
| 80 int rows_; | 80 int rows_; |
| 81 int cols_; | 81 size_t cols_; |
| 82 int alignment_; | 82 int alignment_; |
| 83 T** head_row_; | 83 T** head_row_; |
| 84 }; | 84 }; |
| 85 | 85 |
| 86 } // namespace webrtc | 86 } // namespace webrtc |
| 87 | 87 |
| 88 #endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ALIGNED_ARRAY_ | 88 #endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ALIGNED_ARRAY_ |
| OLD | NEW |