summaryrefslogtreecommitdiffstats
path: root/include/camera
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2015-08-17 17:28:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-17 17:28:11 +0000
commit5d1103e5a229401a4c4e0cb7dd91b2742881ff92 (patch)
treeac815f1a2ee6af6deb53754a149d31a6b3eac34a /include/camera
parent5f7d4b957a4b41eaee3bcfbe8cb5a2f8f3dc8dc0 (diff)
parentc78ac26e3a65328fc0118f16ee76a800d0687eb7 (diff)
downloadframeworks_av-5d1103e5a229401a4c4e0cb7dd91b2742881ff92.zip
frameworks_av-5d1103e5a229401a4c4e0cb7dd91b2742881ff92.tar.gz
frameworks_av-5d1103e5a229401a4c4e0cb7dd91b2742881ff92.tar.bz2
Merge "Add experimental camera session prepare API." into mnc-dr-dev
Diffstat (limited to 'include/camera')
-rw-r--r--include/camera/camera2/ICameraDeviceUser.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/camera/camera2/ICameraDeviceUser.h b/include/camera/camera2/ICameraDeviceUser.h
index a7bf8ab..4d8eb53 100644
--- a/include/camera/camera2/ICameraDeviceUser.h
+++ b/include/camera/camera2/ICameraDeviceUser.h
@@ -140,6 +140,11 @@ public:
virtual status_t prepare(int streamId) = 0;
/**
+ * Preallocate up to maxCount buffers for a given output stream asynchronously.
+ */
+ virtual status_t prepare2(int maxCount, int streamId) = 0;
+
+ /**
* Free all unused buffers for a given output stream.
*/
virtual status_t tearDown(int streamId) = 0;