diff options
| author | Lajos Molnar <lajos@google.com> | 2014-12-11 11:17:51 -0800 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2014-12-11 11:17:51 -0800 |
| commit | 3e08ca6709b5a75dc3b779cf3eba8196b08a0245 (patch) | |
| tree | 0d91cba9d1c188d1898289f6b21826c6f6d316d3 /include | |
| parent | 2592184c976ef83aa9fdad7d63bfdb408c95aa7d (diff) | |
| parent | 6571ed31d9c967faacd552be238b41088ae11e25 (diff) | |
| download | frameworks_av-3e08ca6709b5a75dc3b779cf3eba8196b08a0245.zip frameworks_av-3e08ca6709b5a75dc3b779cf3eba8196b08a0245.tar.gz frameworks_av-3e08ca6709b5a75dc3b779cf3eba8196b08a0245.tar.bz2 | |
resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aosp
Change-Id: Ibaea3a0766f75a61964615482a9ef28651a42b37
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/foundation/AUtils.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/media/stagefright/foundation/AUtils.h b/include/media/stagefright/foundation/AUtils.h index 3a73a39..d7ecf50 100644 --- a/include/media/stagefright/foundation/AUtils.h +++ b/include/media/stagefright/foundation/AUtils.h @@ -40,6 +40,12 @@ inline static const T divUp(const T &nom, const T &den) { } } +/* == ceil(nom / den) * den. T must be integer type, alignment must be positive power of 2 */ +template<class T, class U> +inline static const T align(const T &nom, const U &den) { + return (nom + (T)(den - 1)) & (T)~(den - 1); +} + template<class T> inline static T abs(const T &a) { return a < 0 ? -a : a; |