summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/api1/client2/ZslProcessor.cpp
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2015-03-12 15:21:16 -0700
committerDan Stoza <stoza@google.com>2015-04-07 13:05:57 -0700
commite849af8737d9302a7b24fa2f0083cde01c9cd4fc (patch)
tree2822190c54802f688b867ff68370bad9316b11ee /services/camera/libcameraservice/api1/client2/ZslProcessor.cpp
parent39a8a37759b6964b29b721b83079642c38ec417e (diff)
downloadframeworks_av-e849af8737d9302a7b24fa2f0083cde01c9cd4fc.zip
frameworks_av-e849af8737d9302a7b24fa2f0083cde01c9cd4fc.tar.gz
frameworks_av-e849af8737d9302a7b24fa2f0083cde01c9cd4fc.tar.bz2
Cherry-pick two BufferItem changes
libcameraservice: Stop using IGBC::BufferItem (cherry picked from commit 027c772ed30ddd32808df669e37a53e9b97b1f99) libstagefright: Stop using IGBC::BufferItem (cherry picked from commit 983e2be81f9ea767ae4d8b19669c1c080ecf58d4)
Diffstat (limited to 'services/camera/libcameraservice/api1/client2/ZslProcessor.cpp')
-rw-r--r--services/camera/libcameraservice/api1/client2/ZslProcessor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/api1/client2/ZslProcessor.cpp b/services/camera/libcameraservice/api1/client2/ZslProcessor.cpp
index 8b7e4b4..186ce6c 100644
--- a/services/camera/libcameraservice/api1/client2/ZslProcessor.cpp
+++ b/services/camera/libcameraservice/api1/client2/ZslProcessor.cpp
@@ -440,7 +440,7 @@ status_t ZslProcessor::processNewZslBuffer() {
zslConsumer = mZslConsumer;
}
ALOGVV("Trying to get next buffer");
- BufferItemConsumer::BufferItem item;
+ BufferItem item;
res = zslConsumer->acquireBuffer(&item, 0);
if (res != OK) {
if (res != BufferItemConsumer::NO_BUFFER_AVAILABLE) {