summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/common
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2013-07-31 09:50:58 -0700
committerZhijun He <zhijunhe@google.com>2013-07-31 12:10:51 -0700
commit11d0d44d583f679638cc927bfffe920e495e90cc (patch)
treee795a55fea68ccd8f7b5a92edbadaa3b77260a7f /services/camera/libcameraservice/common
parent7b82efe7a376c882f8f938e1c41b8311a8cdda4a (diff)
downloadframeworks_av-11d0d44d583f679638cc927bfffe920e495e90cc.zip
frameworks_av-11d0d44d583f679638cc927bfffe920e495e90cc.tar.gz
frameworks_av-11d0d44d583f679638cc927bfffe920e495e90cc.tar.bz2
Camera: fix the metadate parcel write issue
Also rename the frameId to requestId to make it less confusing. Change-Id: I14a20b6fcabb86294afb31fc0c56397e185c1373
Diffstat (limited to 'services/camera/libcameraservice/common')
-rw-r--r--services/camera/libcameraservice/common/FrameProcessorBase.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/services/camera/libcameraservice/common/FrameProcessorBase.cpp b/services/camera/libcameraservice/common/FrameProcessorBase.cpp
index 10bc6ea..e7b440a 100644
--- a/services/camera/libcameraservice/common/FrameProcessorBase.cpp
+++ b/services/camera/libcameraservice/common/FrameProcessorBase.cpp
@@ -143,7 +143,7 @@ status_t FrameProcessorBase::processListeners(const CameraMetadata &frame,
__FUNCTION__, device->getId());
return BAD_VALUE;
}
- int32_t frameId = entry.data.i32[0];
+ int32_t requestId = entry.data.i32[0];
List<sp<FilteredListener> > listeners;
{
@@ -151,8 +151,8 @@ status_t FrameProcessorBase::processListeners(const CameraMetadata &frame,
List<RangeListener>::iterator item = mRangeListeners.begin();
while (item != mRangeListeners.end()) {
- if (frameId >= item->minId &&
- frameId < item->maxId) {
+ if (requestId >= item->minId &&
+ requestId < item->maxId) {
sp<FilteredListener> listener = item->listener.promote();
if (listener == 0) {
item = mRangeListeners.erase(item);
@@ -167,7 +167,7 @@ status_t FrameProcessorBase::processListeners(const CameraMetadata &frame,
ALOGV("Got %d range listeners out of %d", listeners.size(), mRangeListeners.size());
List<sp<FilteredListener> >::iterator item = listeners.begin();
for (; item != listeners.end(); item++) {
- (*item)->onFrameAvailable(frameId, frame);
+ (*item)->onFrameAvailable(requestId, frame);
}
return OK;
}