diff options
author | Zhijun He <zhijunhe@google.com> | 2014-06-28 00:55:16 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-26 23:50:27 +0000 |
commit | 0b5003b7d80f70af20f387b1d0d990972a5570da (patch) | |
tree | 99f6c8f639d165d7b83bffd953fff63f4e4f0e81 /services/camera/libcameraservice/common | |
parent | 4ce87ac008bcd6a1004ca416f6d7031ba813078f (diff) | |
parent | 25a0aef19e170d2695f64b4c48296e7914155a88 (diff) | |
download | frameworks_av-0b5003b7d80f70af20f387b1d0d990972a5570da.zip frameworks_av-0b5003b7d80f70af20f387b1d0d990972a5570da.tar.gz frameworks_av-0b5003b7d80f70af20f387b1d0d990972a5570da.tar.bz2 |
Merge "Camera1: Don't send partial results to ZSL clients"
Diffstat (limited to 'services/camera/libcameraservice/common')
-rw-r--r-- | services/camera/libcameraservice/common/FrameProcessorBase.cpp | 6 | ||||
-rw-r--r-- | services/camera/libcameraservice/common/FrameProcessorBase.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/services/camera/libcameraservice/common/FrameProcessorBase.cpp b/services/camera/libcameraservice/common/FrameProcessorBase.cpp index f6a971a..2c82049 100644 --- a/services/camera/libcameraservice/common/FrameProcessorBase.cpp +++ b/services/camera/libcameraservice/common/FrameProcessorBase.cpp @@ -37,11 +37,11 @@ FrameProcessorBase::~FrameProcessorBase() { } status_t FrameProcessorBase::registerListener(int32_t minId, - int32_t maxId, wp<FilteredListener> listener, bool quirkSendPartials) { + int32_t maxId, wp<FilteredListener> listener, bool sendPartials) { Mutex::Autolock l(mInputMutex); ALOGV("%s: Registering listener for frame id range %d - %d", __FUNCTION__, minId, maxId); - RangeListener rListener = { minId, maxId, listener, quirkSendPartials }; + RangeListener rListener = { minId, maxId, listener, sendPartials }; mRangeListeners.push_back(rListener); return OK; } @@ -176,7 +176,7 @@ status_t FrameProcessorBase::processListeners(const CaptureResult &result, List<RangeListener>::iterator item = mRangeListeners.begin(); while (item != mRangeListeners.end()) { if (requestId >= item->minId && requestId < item->maxId && - (!quirkIsPartial || item->quirkSendPartials)) { + (!quirkIsPartial || item->sendPartials)) { sp<FilteredListener> listener = item->listener.promote(); if (listener == 0) { item = mRangeListeners.erase(item); diff --git a/services/camera/libcameraservice/common/FrameProcessorBase.h b/services/camera/libcameraservice/common/FrameProcessorBase.h index 15a014e..ee44a8b 100644 --- a/services/camera/libcameraservice/common/FrameProcessorBase.h +++ b/services/camera/libcameraservice/common/FrameProcessorBase.h @@ -45,10 +45,10 @@ class FrameProcessorBase: public Thread { // Register a listener for a range of IDs [minId, maxId). Multiple listeners // can be listening to the same range. - // QUIRK: sendPartials controls whether partial results will be sent. + // sendPartials controls whether partial results will be sent. status_t registerListener(int32_t minId, int32_t maxId, wp<FilteredListener> listener, - bool quirkSendPartials = true); + bool sendPartials = true); status_t removeListener(int32_t minId, int32_t maxId, wp<FilteredListener> listener); @@ -66,7 +66,7 @@ class FrameProcessorBase: public Thread { int32_t minId; int32_t maxId; wp<FilteredListener> listener; - bool quirkSendPartials; + bool sendPartials; }; List<RangeListener> mRangeListeners; |