2014-10-01 17:42:18 +00:00
|
|
|
/*
|
|
|
|
|
* 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.
|
|
|
|
|
*/
|
|
|
|
|
|
2018-03-22 14:11:52 +01:00
|
|
|
#ifndef RTC_BASE_MEMORY_ALIGNED_ARRAY_H_
|
|
|
|
|
#define RTC_BASE_MEMORY_ALIGNED_ARRAY_H_
|
2014-10-01 17:42:18 +00:00
|
|
|
|
2018-11-28 16:47:49 +01:00
|
|
|
#include <stddef.h>
|
|
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "rtc_base/checks.h"
|
2018-03-22 14:11:52 +01:00
|
|
|
#include "rtc_base/memory/aligned_malloc.h"
|
2014-10-01 17:42:18 +00:00
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
|
|
|
|
|
// Wrapper class for aligned arrays. Every row (and the first dimension) are
|
|
|
|
|
// aligned to the given byte alignment.
|
2017-11-08 12:26:07 +01:00
|
|
|
template <typename T>
|
|
|
|
|
class AlignedArray {
|
2014-10-01 17:42:18 +00:00
|
|
|
public:
|
Convert channel counts to size_t.
IIRC, this was originally requested by ajm during review of the other size_t conversions I did over the past year, and I agreed it made sense, but wanted to do it separately since those changes were already gargantuan.
BUG=chromium:81439
TEST=none
R=henrik.lundin@webrtc.org, henrika@webrtc.org, kjellander@webrtc.org, minyue@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org
Review URL: https://codereview.webrtc.org/1316523002 .
Cr-Commit-Position: refs/heads/master@{#11229}
2016-01-12 16:26:35 -08:00
|
|
|
AlignedArray(size_t rows, size_t cols, size_t alignment)
|
2017-11-08 12:26:07 +01:00
|
|
|
: rows_(rows), cols_(cols) {
|
2016-11-28 15:21:39 -08:00
|
|
|
RTC_CHECK_GT(alignment, 0);
|
2017-11-08 12:26:07 +01:00
|
|
|
head_row_ =
|
|
|
|
|
static_cast<T**>(AlignedMalloc(rows_ * sizeof(*head_row_), alignment));
|
Convert channel counts to size_t.
IIRC, this was originally requested by ajm during review of the other size_t conversions I did over the past year, and I agreed it made sense, but wanted to do it separately since those changes were already gargantuan.
BUG=chromium:81439
TEST=none
R=henrik.lundin@webrtc.org, henrika@webrtc.org, kjellander@webrtc.org, minyue@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org
Review URL: https://codereview.webrtc.org/1316523002 .
Cr-Commit-Position: refs/heads/master@{#11229}
2016-01-12 16:26:35 -08:00
|
|
|
for (size_t i = 0; i < rows_; ++i) {
|
2017-11-08 12:26:07 +01:00
|
|
|
head_row_[i] = static_cast<T*>(
|
|
|
|
|
AlignedMalloc(cols_ * sizeof(**head_row_), alignment));
|
2014-10-01 17:42:18 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
~AlignedArray() {
|
Convert channel counts to size_t.
IIRC, this was originally requested by ajm during review of the other size_t conversions I did over the past year, and I agreed it made sense, but wanted to do it separately since those changes were already gargantuan.
BUG=chromium:81439
TEST=none
R=henrik.lundin@webrtc.org, henrika@webrtc.org, kjellander@webrtc.org, minyue@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org
Review URL: https://codereview.webrtc.org/1316523002 .
Cr-Commit-Position: refs/heads/master@{#11229}
2016-01-12 16:26:35 -08:00
|
|
|
for (size_t i = 0; i < rows_; ++i) {
|
2014-10-01 17:42:18 +00:00
|
|
|
AlignedFree(head_row_[i]);
|
|
|
|
|
}
|
|
|
|
|
AlignedFree(head_row_);
|
|
|
|
|
}
|
|
|
|
|
|
2017-11-08 12:26:07 +01:00
|
|
|
T* const* Array() { return head_row_; }
|
2014-10-01 17:42:18 +00:00
|
|
|
|
2017-11-08 12:26:07 +01:00
|
|
|
const T* const* Array() const { return head_row_; }
|
2014-10-01 17:42:18 +00:00
|
|
|
|
Convert channel counts to size_t.
IIRC, this was originally requested by ajm during review of the other size_t conversions I did over the past year, and I agreed it made sense, but wanted to do it separately since those changes were already gargantuan.
BUG=chromium:81439
TEST=none
R=henrik.lundin@webrtc.org, henrika@webrtc.org, kjellander@webrtc.org, minyue@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org
Review URL: https://codereview.webrtc.org/1316523002 .
Cr-Commit-Position: refs/heads/master@{#11229}
2016-01-12 16:26:35 -08:00
|
|
|
T* Row(size_t row) {
|
2015-09-17 00:24:34 -07:00
|
|
|
RTC_CHECK_LE(row, rows_);
|
2014-10-01 17:42:18 +00:00
|
|
|
return head_row_[row];
|
|
|
|
|
}
|
|
|
|
|
|
Convert channel counts to size_t.
IIRC, this was originally requested by ajm during review of the other size_t conversions I did over the past year, and I agreed it made sense, but wanted to do it separately since those changes were already gargantuan.
BUG=chromium:81439
TEST=none
R=henrik.lundin@webrtc.org, henrika@webrtc.org, kjellander@webrtc.org, minyue@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org
Review URL: https://codereview.webrtc.org/1316523002 .
Cr-Commit-Position: refs/heads/master@{#11229}
2016-01-12 16:26:35 -08:00
|
|
|
const T* Row(size_t row) const {
|
2015-09-17 00:24:34 -07:00
|
|
|
RTC_CHECK_LE(row, rows_);
|
2014-10-01 17:42:18 +00:00
|
|
|
return head_row_[row];
|
|
|
|
|
}
|
|
|
|
|
|
Convert channel counts to size_t.
IIRC, this was originally requested by ajm during review of the other size_t conversions I did over the past year, and I agreed it made sense, but wanted to do it separately since those changes were already gargantuan.
BUG=chromium:81439
TEST=none
R=henrik.lundin@webrtc.org, henrika@webrtc.org, kjellander@webrtc.org, minyue@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org
Review URL: https://codereview.webrtc.org/1316523002 .
Cr-Commit-Position: refs/heads/master@{#11229}
2016-01-12 16:26:35 -08:00
|
|
|
T& At(size_t row, size_t col) {
|
2015-09-17 00:24:34 -07:00
|
|
|
RTC_CHECK_LE(col, cols_);
|
2014-10-01 17:42:18 +00:00
|
|
|
return Row(row)[col];
|
|
|
|
|
}
|
|
|
|
|
|
Convert channel counts to size_t.
IIRC, this was originally requested by ajm during review of the other size_t conversions I did over the past year, and I agreed it made sense, but wanted to do it separately since those changes were already gargantuan.
BUG=chromium:81439
TEST=none
R=henrik.lundin@webrtc.org, henrika@webrtc.org, kjellander@webrtc.org, minyue@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org
Review URL: https://codereview.webrtc.org/1316523002 .
Cr-Commit-Position: refs/heads/master@{#11229}
2016-01-12 16:26:35 -08:00
|
|
|
const T& At(size_t row, size_t col) const {
|
2015-09-17 00:24:34 -07:00
|
|
|
RTC_CHECK_LE(col, cols_);
|
2014-10-01 17:42:18 +00:00
|
|
|
return Row(row)[col];
|
|
|
|
|
}
|
|
|
|
|
|
2017-11-08 12:26:07 +01:00
|
|
|
size_t rows() const { return rows_; }
|
2015-06-20 20:10:57 +02:00
|
|
|
|
2017-11-08 12:26:07 +01:00
|
|
|
size_t cols() const { return cols_; }
|
2015-06-20 20:10:57 +02:00
|
|
|
|
2014-10-01 17:42:18 +00:00
|
|
|
private:
|
Convert channel counts to size_t.
IIRC, this was originally requested by ajm during review of the other size_t conversions I did over the past year, and I agreed it made sense, but wanted to do it separately since those changes were already gargantuan.
BUG=chromium:81439
TEST=none
R=henrik.lundin@webrtc.org, henrika@webrtc.org, kjellander@webrtc.org, minyue@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org
Review URL: https://codereview.webrtc.org/1316523002 .
Cr-Commit-Position: refs/heads/master@{#11229}
2016-01-12 16:26:35 -08:00
|
|
|
size_t rows_;
|
Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t.
This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects.
This was be reviewed and approved in pieces:
https://codereview.webrtc.org/1224093003
https://codereview.webrtc.org/1224123002
https://codereview.webrtc.org/1224163002
https://codereview.webrtc.org/1225133003
https://codereview.webrtc.org/1225173002
https://codereview.webrtc.org/1227163003
https://codereview.webrtc.org/1227203003
https://codereview.webrtc.org/1227213002
https://codereview.webrtc.org/1227893002
https://codereview.webrtc.org/1228793004
https://codereview.webrtc.org/1228803003
https://codereview.webrtc.org/1228823002
https://codereview.webrtc.org/1228823003
https://codereview.webrtc.org/1228843002
https://codereview.webrtc.org/1230693002
https://codereview.webrtc.org/1231713002
The change is being landed as TBR to all the folks who reviewed the above.
BUG=chromium:81439
TEST=none
R=andrew@webrtc.org, pbos@webrtc.org
TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher
Review URL: https://codereview.webrtc.org/1230503003 .
Cr-Commit-Position: refs/heads/master@{#9768}
2015-08-24 14:52:23 -07:00
|
|
|
size_t cols_;
|
2014-10-01 17:42:18 +00:00
|
|
|
T** head_row_;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
} // namespace webrtc
|
|
|
|
|
|
2018-03-22 14:11:52 +01:00
|
|
|
#endif // RTC_BASE_MEMORY_ALIGNED_ARRAY_H_
|