diff options
| author | Jamie Gennis <jgennis@google.com> | 2010-12-20 11:51:31 -0800 |
|---|---|---|
| committer | Jamie Gennis <jgennis@google.com> | 2011-01-06 13:31:53 -0800 |
| commit | bfa33aae4f54c0020a0568b16a3acb7b30b6ca3d (patch) | |
| tree | 3dae4190516dcddec996a2b7c51b5f192c3ed4ca /services/camera/libcameraservice/CameraService.h | |
| parent | 5de2001a5c3f854b63dbcea284e02f930881ca75 (diff) | |
| download | frameworks_av-bfa33aae4f54c0020a0568b16a3acb7b30b6ca3d.zip frameworks_av-bfa33aae4f54c0020a0568b16a3acb7b30b6ca3d.tar.gz frameworks_av-bfa33aae4f54c0020a0568b16a3acb7b30b6ca3d.tar.bz2 | |
Add camera service support for SurfaceTexture.
This change enables the use of a SurfaceTexture in place of a Surface as
the destination of camera preview frames.
Change-Id: Ic70d404c8fe261e9d5da6f1de93d6babb5b191cb
Diffstat (limited to 'services/camera/libcameraservice/CameraService.h')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index d78d7e5..ccb9cf7 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -94,6 +94,7 @@ private: virtual status_t lock(); virtual status_t unlock(); virtual status_t setPreviewDisplay(const sp<Surface>& surface); + virtual status_t setPreviewTexture(const sp<ISurfaceTexture>& surfaceTexture); virtual void setPreviewCallbackFlag(int flag); virtual status_t startPreview(); virtual void stopPreview(); @@ -180,7 +181,8 @@ private: // Ensures atomicity among the public methods mutable Mutex mLock; - sp<ISurface> mSurface; + // This is a binder of Surface or SurfaceTexture. + sp<IBinder> mSurface; sp<ANativeWindow> mPreviewWindow; // If the user want us to return a copy of the preview frame (instead |