summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2015-04-15 17:56:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-15 17:56:26 +0000
commitc44111b22c26236cb0b32d3fbd1cc9fad3fb28ff (patch)
tree3eae04149058cd321b732fb201efb1c2d3e465b4 /include
parenta5bf4e0339a10b7db936c739fbfd6cf3cb00fbb8 (diff)
parent4d44cad22ea925a651463f2d51d6586c14d4b787 (diff)
downloadframeworks_av-c44111b22c26236cb0b32d3fbd1cc9fad3fb28ff.zip
frameworks_av-c44111b22c26236cb0b32d3fbd1cc9fad3fb28ff.tar.gz
frameworks_av-c44111b22c26236cb0b32d3fbd1cc9fad3fb28ff.tar.bz2
Merge "Camera2: Add prepare for output streams"
Diffstat (limited to 'include')
-rw-r--r--include/camera/camera2/ICameraDeviceCallbacks.h3
-rw-r--r--include/camera/camera2/ICameraDeviceUser.h5
2 files changed, 8 insertions, 0 deletions
diff --git a/include/camera/camera2/ICameraDeviceCallbacks.h b/include/camera/camera2/ICameraDeviceCallbacks.h
index 670480b..c57b39f 100644
--- a/include/camera/camera2/ICameraDeviceCallbacks.h
+++ b/include/camera/camera2/ICameraDeviceCallbacks.h
@@ -65,6 +65,9 @@ public:
// One way
virtual void onResultReceived(const CameraMetadata& metadata,
const CaptureResultExtras& resultExtras) = 0;
+
+ // One way
+ virtual void onPrepared(int streamId) = 0;
};
// ----------------------------------------------------------------------------
diff --git a/include/camera/camera2/ICameraDeviceUser.h b/include/camera/camera2/ICameraDeviceUser.h
index c850924..619b161 100644
--- a/include/camera/camera2/ICameraDeviceUser.h
+++ b/include/camera/camera2/ICameraDeviceUser.h
@@ -133,6 +133,11 @@ public:
*/
virtual status_t flush(/*out*/
int64_t* lastFrameNumber = NULL) = 0;
+
+ /**
+ * Preallocate buffers for a given output stream asynchronously.
+ */
+ virtual status_t prepare(int streamId) = 0;
};
// ----------------------------------------------------------------------------