diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-01-06 13:36:47 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-06 13:36:47 -0800 |
| commit | 93aa950be52dc89f370c423f7b90c52093f9a3fa (patch) | |
| tree | 68d4364105cbc57f783bdc7711da55cd27e71a7f /include | |
| parent | b1787e3b95e96cc002377d41518cc183f64b58c4 (diff) | |
| parent | bfa33aae4f54c0020a0568b16a3acb7b30b6ca3d (diff) | |
| download | frameworks_av-93aa950be52dc89f370c423f7b90c52093f9a3fa.zip frameworks_av-93aa950be52dc89f370c423f7b90c52093f9a3fa.tar.gz frameworks_av-93aa950be52dc89f370c423f7b90c52093f9a3fa.tar.bz2 | |
Merge "Add camera service support for SurfaceTexture." into honeycomb
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera/Camera.h | 4 | ||||
| -rw-r--r-- | include/camera/ICamera.h | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/camera/Camera.h b/include/camera/Camera.h index c95f31e..e5f7e62 100644 --- a/include/camera/Camera.h +++ b/include/camera/Camera.h @@ -19,6 +19,7 @@ #include <utils/Timers.h> #include <camera/ICameraClient.h> +#include <gui/ISurfaceTexture.h> namespace android { @@ -175,6 +176,9 @@ public: // pass the buffered Surface to the camera service status_t setPreviewDisplay(const sp<Surface>& surface); + // pass the buffered ISurfaceTexture to the camera service + status_t setPreviewTexture(const sp<ISurfaceTexture>& surfaceTexture); + // start preview mode, must call setPreviewDisplay first status_t startPreview(); diff --git a/include/camera/ICamera.h b/include/camera/ICamera.h index b69e075..b2310a6 100644 --- a/include/camera/ICamera.h +++ b/include/camera/ICamera.h @@ -24,6 +24,7 @@ #include <binder/IMemory.h> #include <utils/String8.h> #include <camera/Camera.h> +#include <gui/ISurfaceTexture.h> namespace android { @@ -48,6 +49,10 @@ public: // pass the buffered Surface to the camera service virtual status_t setPreviewDisplay(const sp<Surface>& surface) = 0; + // pass the buffered ISurfaceTexture to the camera service + virtual status_t setPreviewTexture( + const sp<ISurfaceTexture>& surfaceTexture) = 0; + // set the preview callback flag to affect how the received frames from // preview are handled. virtual void setPreviewCallbackFlag(int flag) = 0; |