diff options
author | Robert Shih <robertshih@google.com> | 2015-05-11 03:00:49 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-11 03:00:49 +0000 |
commit | 7acac10aae34da5ae4d628c5a270e7e3e94f7598 (patch) | |
tree | db9d5d920ce89e90a5068c7f27ef4aadc8e77275 /include | |
parent | 30d77e2c75c1973f9fb363717af92cf640685da3 (diff) | |
parent | 67a30ebfe785f7cd5ecfb0d2fb487e54536a3d48 (diff) | |
download | frameworks_av-7acac10aae34da5ae4d628c5a270e7e3e94f7598.zip frameworks_av-7acac10aae34da5ae4d628c5a270e7e3e94f7598.tar.gz frameworks_av-7acac10aae34da5ae4d628c5a270e7e3e94f7598.tar.bz2 |
Merge "DO NOT MERGE: Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes" into klp-dev
Diffstat (limited to 'include')
-rw-r--r-- | include/media/stagefright/foundation/AUtils.h | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/include/media/stagefright/foundation/AUtils.h b/include/media/stagefright/foundation/AUtils.h new file mode 100644 index 0000000..60cb41d --- /dev/null +++ b/include/media/stagefright/foundation/AUtils.h @@ -0,0 +1,45 @@ +/* + * Copyright 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef A_UTILS_H_ + +#define A_UTILS_H_ + +/* ============================ math templates ============================ */ + +template<class T> +void ENSURE_UNSIGNED_TYPE() { + T TYPE_MUST_BE_UNSIGNED[(T)-1 < 0 ? -1 : 0]; +} + +// needle is in range [hayStart, hayStart + haySize) +template<class T, class U> +inline static bool isInRange(const T &hayStart, const U &haySize, const T &needle) { + ENSURE_UNSIGNED_TYPE<U>(); + return (T)(hayStart + haySize) >= hayStart && needle >= hayStart && (U)(needle - hayStart) < haySize; +} + +// [needleStart, needleStart + needleSize) is in range [hayStart, hayStart + haySize) +template<class T, class U> +inline static bool isInRange( + const T &hayStart, const U &haySize, const T &needleStart, const U &needleSize) { + ENSURE_UNSIGNED_TYPE<U>(); + return isInRange(hayStart, haySize, needleStart) + && (T)(needleStart + needleSize) >= needleStart + && (U)(needleStart + needleSize - hayStart) <= haySize; +} + +#endif // A_UTILS_H_ |