diff options
author | Lajos Molnar <lajos@google.com> | 2014-09-11 17:27:33 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-11 17:27:33 +0000 |
commit | c2f78c91f7cb5238b932ca8107f311630edebc88 (patch) | |
tree | da384485c7dd6474760e558c87d72ee9e60db49c /include | |
parent | e4ce3eb0d4785679994b38d54aa7ec01d208be72 (diff) | |
parent | 87088150423676a8a0d6a0094e6b6e77e11fb3b5 (diff) | |
download | frameworks_av-c2f78c91f7cb5238b932ca8107f311630edebc88.zip frameworks_av-c2f78c91f7cb5238b932ca8107f311630edebc88.tar.gz frameworks_av-c2f78c91f7cb5238b932ca8107f311630edebc88.tar.bz2 |
am 87088150: am fd732779: Merge "stagefright: don\'t use AAtomizer in AMessage" into lmp-dev
* commit '87088150423676a8a0d6a0094e6b6e77e11fb3b5':
stagefright: don't use AAtomizer in AMessage
Diffstat (limited to 'include')
-rw-r--r-- | include/media/stagefright/foundation/AMessage.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/media/stagefright/foundation/AMessage.h b/include/media/stagefright/foundation/AMessage.h index 5846d6b..a9e235b 100644 --- a/include/media/stagefright/foundation/AMessage.h +++ b/include/media/stagefright/foundation/AMessage.h @@ -137,7 +137,9 @@ private: Rect rectValue; } u; const char *mName; + size_t mNameLength; Type mType; + void setName(const char *name, size_t len); }; enum { @@ -147,12 +149,14 @@ private: size_t mNumItems; Item *allocateItem(const char *name); - void freeItem(Item *item); + void freeItemValue(Item *item); const Item *findItem(const char *name, Type type) const; void setObjectInternal( const char *name, const sp<RefBase> &obj, Type type); + size_t findItemIndex(const char *name, size_t len) const; + DISALLOW_EVIL_CONSTRUCTORS(AMessage); }; |