summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/Camera2Client.h
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-08-03 13:53:39 -0700
committerEino-Ville Talvala <etalvala@google.com>2012-08-10 09:19:18 -0700
commit174181eec57c963a2a17bd156d81c3f18b3ba75c (patch)
tree9eea6b8bf3577f1f24d80b5d37d714fe6374a734 /services/camera/libcameraservice/Camera2Client.h
parenta59bf2c58311dfc28f46220383d66869e8f3f57f (diff)
downloadframeworks_av-174181eec57c963a2a17bd156d81c3f18b3ba75c.zip
frameworks_av-174181eec57c963a2a17bd156d81c3f18b3ba75c.tar.gz
frameworks_av-174181eec57c963a2a17bd156d81c3f18b3ba75c.tar.bz2
Camera2: Add trigger support, and implement autofocus
- Add skeletons for all triggering actions into Camera2Device - Add support for AF triggers to HAL - Add support for AF notifications from HAL Bug: 6243944 Change-Id: I21025440849ae41f7083e1dcb72c99f8e5b2d5f7
Diffstat (limited to 'services/camera/libcameraservice/Camera2Client.h')
-rw-r--r--services/camera/libcameraservice/Camera2Client.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.h b/services/camera/libcameraservice/Camera2Client.h
index 8c10d6b..dffd4ab 100644
--- a/services/camera/libcameraservice/Camera2Client.h
+++ b/services/camera/libcameraservice/Camera2Client.h
@@ -200,6 +200,11 @@ private:
// listed in Camera.Parameters
bool storeMetadataInBuffers;
bool playShutterSound;
+ bool enableFocusMoveMessages;
+
+ int afTriggerCounter;
+ int currentAfTriggerId;
+ bool afInMotion;
};
class LockedParameters {
@@ -313,9 +318,6 @@ private:
camera_metadata_t *mRecordingRequest;
sp<Camera2Heap> mRecordingHeap;
- // TODO: This needs to be queried from somewhere, or the BufferQueue needs
- // to be passed all the way to stagefright. Right now, set to a large number
- // to avoid starvation of the video encoders.
static const size_t kDefaultRecordingHeapCount = 8;
size_t mRecordingHeapCount;
size_t mRecordingHeapHead, mRecordingHeapFree;
@@ -325,6 +327,10 @@ private:
status_t updateRecordingRequest(const Parameters &params);
status_t updateRecordingStream(const Parameters &params);
+ /** Notification-related members */
+
+ bool mAfInMotion;
+
/** Camera2Device instance wrapping HAL2 entry */
sp<Camera2Device> mDevice;