summaryrefslogtreecommitdiffstats
path: root/include/camera
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-02-20 18:24:43 -0800
committerIgor Murashkin <iam@google.com>2013-02-22 10:50:14 -0800
commit985fd30a10f6fec4293f071fd258c4726cff5a3d (patch)
tree493a26cd4544e2858822e8fbaf1ddc04fbd215d4 /include/camera
parent68506fd58d26748617babe94d5648503cb3690bb (diff)
downloadframeworks_av-985fd30a10f6fec4293f071fd258c4726cff5a3d.zip
frameworks_av-985fd30a10f6fec4293f071fd258c4726cff5a3d.tar.gz
frameworks_av-985fd30a10f6fec4293f071fd258c4726cff5a3d.tar.bz2
Camera: ProCamera2Client - add createStream (service is stubbed) and unit test
Change-Id: I1ae7ba9b24f5883c214c19a7ed0eaf0c802d69c1
Diffstat (limited to 'include/camera')
-rw-r--r--include/camera/IProCameraUser.h10
-rw-r--r--include/camera/ProCamera.h2
2 files changed, 11 insertions, 1 deletions
diff --git a/include/camera/IProCameraUser.h b/include/camera/IProCameraUser.h
index 6170410..3ef4676 100644
--- a/include/camera/IProCameraUser.h
+++ b/include/camera/IProCameraUser.h
@@ -63,6 +63,16 @@ public:
virtual status_t requestStream(int streamId) = 0;
virtual status_t cancelStream(int streamId) = 0;
+ virtual status_t createStream(int width, int height, int format,
+ const sp<Surface>& surface,
+ /*out*/
+ int* streamId) = 0;
+
+ // Create a request object from a template.
+ virtual status_t createDefaultRequest(int templateId,
+ /*out*/
+ camera_metadata** request)
+ = 0;
};
diff --git a/include/camera/ProCamera.h b/include/camera/ProCamera.h
index 7191b07..9b763a3 100644
--- a/include/camera/ProCamera.h
+++ b/include/camera/ProCamera.h
@@ -132,7 +132,7 @@ public:
* Errors: -EBUSY if too many streams created
*/
status_t createStream(int width, int height, int format,
- const sp<ANativeWindow>& window,
+ const sp<Surface>& surface,
/*out*/
int* streamId);