diff options
author | andrew@webrtc.org <andrew@webrtc.org> | 2014-10-01 17:42:18 +0000 |
---|---|---|
committer | andrew@webrtc.org <andrew@webrtc.org> | 2014-10-01 17:42:18 +0000 |
commit | 325cff01b42064313b221f2c8819ce01218f5ca4 (patch) | |
tree | 9d18805fd2c6501aa3d8ac6e5237fb4007a67edd /webrtc/system_wrappers | |
parent | 593c3a086872c18e1296a61ce112497f56cb0827 (diff) | |
download | webrtc-325cff01b42064313b221f2c8819ce01218f5ca4.tar.gz |
Import LappedTransform and friends.
Add code for doing block-based frequency domain processing. Developed
and reviewed in isolation. Corresponding export CL:
https://chromereviews.googleplex.com/95187013/
R=bercic@google.com, kjellander@webrtc.org, turaj@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/31539004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7359 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/system_wrappers')
-rw-r--r-- | webrtc/system_wrappers/BUILD.gn | 3 | ||||
-rw-r--r-- | webrtc/system_wrappers/interface/aligned_array.h | 89 | ||||
-rw-r--r-- | webrtc/system_wrappers/source/aligned_array_unittest.cc | 55 | ||||
-rw-r--r-- | webrtc/system_wrappers/source/system_wrappers.gyp | 1 | ||||
-rw-r--r-- | webrtc/system_wrappers/source/system_wrappers_tests.gyp | 1 |
5 files changed, 148 insertions, 1 deletions
diff --git a/webrtc/system_wrappers/BUILD.gn b/webrtc/system_wrappers/BUILD.gn index 14deab9914..c193c28b77 100644 --- a/webrtc/system_wrappers/BUILD.gn +++ b/webrtc/system_wrappers/BUILD.gn @@ -17,6 +17,7 @@ config("system_wrappers_inherited_config") { static_library("system_wrappers") { sources = [ + "interface/aligned_array.h", "interface/aligned_malloc.h", "interface/atomic32.h", "interface/clock.h", @@ -107,7 +108,7 @@ static_library("system_wrappers") { configs += [ "..:common_config" ] - if (is_clang) { + if (is_clang) { # Suppress warnings from Chrome's Clang plugins. # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. configs -= [ "//build/config/clang:find_bad_constructs" ] diff --git a/webrtc/system_wrappers/interface/aligned_array.h b/webrtc/system_wrappers/interface/aligned_array.h new file mode 100644 index 0000000000..4b5c276d43 --- /dev/null +++ b/webrtc/system_wrappers/interface/aligned_array.h @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ALIGNED_ARRAY_ +#define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ALIGNED_ARRAY_ + +#include "webrtc/base/checks.h" +#include "webrtc/system_wrappers/interface/aligned_malloc.h" + +namespace webrtc { + +// Wrapper class for aligned arrays. Every row (and the first dimension) are +// aligned to the given byte alignment. +template<typename T> class AlignedArray { + public: + AlignedArray(int rows, int cols, int alignment) + : rows_(rows), + cols_(cols), + alignment_(alignment) { + CHECK_GT(alignment_, 0); + head_row_ = static_cast<T**>(AlignedMalloc(rows_ * sizeof(*head_row_), + alignment_)); + for (int i = 0; i < rows_; ++i) { + head_row_[i] = static_cast<T*>(AlignedMalloc(cols_ * sizeof(**head_row_), + alignment_)); + } + } + + ~AlignedArray() { + for (int i = 0; i < rows_; ++i) { + AlignedFree(head_row_[i]); + } + AlignedFree(head_row_); + } + + T* const* Array() { + return head_row_; + } + + const T* const* Array() const { + return head_row_; + } + + T* Row(int row) { + CHECK_LE(row, rows_); + return head_row_[row]; + } + + const T* Row(int row) const { + CHECK_LE(row, rows_); + return head_row_[row]; + } + + T& At(int row, int col) { + CHECK_LE(col, cols_); + return Row(row)[col]; + } + + const T& At(int row, int col) const { + CHECK_LE(col, cols_); + return Row(row)[col]; + } + + int rows() const { + return rows_; + } + + int cols() const { + return cols_; + } + + private: + int rows_; + int cols_; + int alignment_; + T** head_row_; +}; + +} // namespace webrtc + +#endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ALIGNED_ARRAY_ + diff --git a/webrtc/system_wrappers/source/aligned_array_unittest.cc b/webrtc/system_wrappers/source/aligned_array_unittest.cc new file mode 100644 index 0000000000..e5e556dff5 --- /dev/null +++ b/webrtc/system_wrappers/source/aligned_array_unittest.cc @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#include "webrtc/system_wrappers/interface/aligned_array.h" + +#include <stdint.h> + +#include "testing/gtest/include/gtest/gtest.h" + +namespace { + +bool IsAligned(const void* ptr, int alignment) { + return reinterpret_cast<uintptr_t>(ptr) % alignment == 0; +} + +} // namespace + +namespace webrtc { + +TEST(AlignedArrayTest, CheckAlignment) { + AlignedArray<bool> arr(10, 7, 128); + ASSERT_TRUE(IsAligned(arr.Array(), 128)); + for (int i = 0; i < 10; ++i) { + ASSERT_TRUE(IsAligned(arr.Row(i), 128)); + ASSERT_EQ(arr.Row(i), arr.Array()[i]); + } +} + +TEST(AlignedArrayTest, CheckOverlap) { + AlignedArray<int> arr(10, 7, 128); + + for (int i = 0; i < 10; ++i) { + for (int j = 0; j < 7; ++j) { + arr.At(i, j) = 20 * i + j; + } + } + + for (int i = 0; i < 10; ++i) { + for (int j = 0; j < 7; ++j) { + ASSERT_EQ(arr.At(i, j), 20 * i + j); + ASSERT_EQ(arr.Row(i)[j], 20 * i + j); + ASSERT_EQ(arr.Array()[i][j], 20 * i + j); + } + } +} + +} // namespace webrtc + diff --git a/webrtc/system_wrappers/source/system_wrappers.gyp b/webrtc/system_wrappers/source/system_wrappers.gyp index e6c4216da7..870d88a40e 100644 --- a/webrtc/system_wrappers/source/system_wrappers.gyp +++ b/webrtc/system_wrappers/source/system_wrappers.gyp @@ -25,6 +25,7 @@ ], }, 'sources': [ + '../interface/aligned_array.h', '../interface/aligned_malloc.h', '../interface/atomic32.h', '../interface/clock.h', diff --git a/webrtc/system_wrappers/source/system_wrappers_tests.gyp b/webrtc/system_wrappers/source/system_wrappers_tests.gyp index 75081b9dc4..f77b985a22 100644 --- a/webrtc/system_wrappers/source/system_wrappers_tests.gyp +++ b/webrtc/system_wrappers/source/system_wrappers_tests.gyp @@ -18,6 +18,7 @@ '<(webrtc_root)/test/test.gyp:test_support_main', ], 'sources': [ + 'aligned_array_unittest.cc', 'aligned_malloc_unittest.cc', 'clock_unittest.cc', 'condition_variable_unittest.cc', |