diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-22 22:42:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-22 22:42:46 +0000 |
| commit | 5b756bfdaa27c8b606720544bf507213cf47376d (patch) | |
| tree | 7c6886aba2268ee29d8a7d9c025b259458022574 /media | |
| parent | c10b874c4d0d6208fb93a7aa0dc8af4418faad45 (diff) | |
| parent | 8b187f4acea8d7e517ff9ced32fc7368bdbaa6e0 (diff) | |
| download | frameworks_av-5b756bfdaa27c8b606720544bf507213cf47376d.zip frameworks_av-5b756bfdaa27c8b606720544bf507213cf47376d.tar.gz frameworks_av-5b756bfdaa27c8b606720544bf507213cf47376d.tar.bz2 | |
am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."
* commit '8b187f4acea8d7e517ff9ced32fc7368bdbaa6e0':
Move frameworks/av off <sys/atomics.h>.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/MediaBuffer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/libstagefright/MediaBuffer.cpp b/media/libstagefright/MediaBuffer.cpp index 11b80bf..8af0880 100644 --- a/media/libstagefright/MediaBuffer.cpp +++ b/media/libstagefright/MediaBuffer.cpp @@ -27,7 +27,6 @@ #include <media/stagefright/MetaData.h> #include <ui/GraphicBuffer.h> -#include <sys/atomics.h> namespace android { @@ -92,7 +91,7 @@ void MediaBuffer::release() { return; } - int prevCount = __atomic_dec(&mRefCount); + int prevCount = __sync_fetch_and_sub(&mRefCount, 1); if (prevCount == 1) { if (mObserver == NULL) { delete this; @@ -112,7 +111,7 @@ void MediaBuffer::claim() { } void MediaBuffer::add_ref() { - (void) __atomic_inc(&mRefCount); + (void) __sync_fetch_and_add(&mRefCount, 1); } void *MediaBuffer::data() const { |