summaryrefslogtreecommitdiffstats
path: root/camera/inc
diff options
context:
space:
mode:
authorTyler Luu <tluu@ti.com>2012-06-21 11:17:08 -0500
committerDaniel Levin <dendy@ti.com>2012-11-26 20:03:35 +0200
commit85855ca02333f8cc9a6a3b821ed35a06a8fec232 (patch)
treed519afff4f5a2b231e178ac1f5189f668941d5ae /camera/inc
parentc143e22be6a85a75d247fea47c4aba577fb0002d (diff)
downloadhardware_ti_omap4-85855ca02333f8cc9a6a3b821ed35a06a8fec232.tar.gz
hardware_ti_omap4-85855ca02333f8cc9a6a3b821ed35a06a8fec232.tar.bz2
hardware_ti_omap4-85855ca02333f8cc9a6a3b821ed35a06a8fec232.zip
CameraHal: Add support for setting multiple tap in/outs
- Adding support for setting multiple tap in and tap out points that the application can set at any time. Applications need to provide name of tap-in and tap-outs with their shot config for us to find the tap-in or tap-out point from the vector we are keeping. - Patch for releasing tap in/outs to follow Depends on frameworks/av change Ia21c4a26: http://review.omapzoom.org/#/c/28899/ Change-Id: I6fa91de68c7bf71525596ee5e1a5ebb2a7b3b5da Signed-off-by: Tyler Luu <tluu@ti.com> Signed-off-by: Vladimir Petrov <vppetrov@mm-sol.com>
Diffstat (limited to 'camera/inc')
-rw-r--r--camera/inc/CameraHal.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/camera/inc/CameraHal.h b/camera/inc/CameraHal.h
index 1b5466d..4a4316c 100644
--- a/camera/inc/CameraHal.h
+++ b/camera/inc/CameraHal.h
@@ -1375,8 +1375,12 @@ public:
android::sp<AppCallbackNotifier> mAppCallbackNotifier;
android::sp<DisplayAdapter> mDisplayAdapter;
android::sp<MemoryManager> mMemoryManager;
- // TODO(XXX): May need to keep this as a vector in the future
- // when we can have multiple tap-in/tap-out points
+
+ android::Vector< android::sp<DisplayAdapter> > mOutAdapters;
+ android::Vector< android::sp<DisplayAdapter> > mInAdapters;
+
+ // TODO(XXX): Even though we support user setting multiple BufferSourceAdapters now
+ // only one tap in surface and one tap out surface is supported at a time.
android::sp<DisplayAdapter> mBufferSourceAdapter_In;
android::sp<DisplayAdapter> mBufferSourceAdapter_Out;