diff options
| author | Andy McFadden <fadden@android.com> | 2012-12-18 09:46:54 -0800 |
|---|---|---|
| committer | Andy McFadden <fadden@android.com> | 2012-12-18 13:31:57 -0800 |
| commit | 8ba01021b573889802e67e029225a96f0dfa471a (patch) | |
| tree | 110eca2effc73dcb2f46da71e9a0584e4af6e71e /include/camera | |
| parent | 53bc0a2fc54330534330118edd5c393f39eff8ab (diff) | |
| download | frameworks_av-8ba01021b573889802e67e029225a96f0dfa471a.zip frameworks_av-8ba01021b573889802e67e029225a96f0dfa471a.tar.gz frameworks_av-8ba01021b573889802e67e029225a96f0dfa471a.tar.bz2 | |
Rename ISurfaceTexture and SurfaceTexture
The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.
Bug 7736700
Change-Id: I64520a55f8c09fe6215382ea361c539a9940cba5
Diffstat (limited to 'include/camera')
| -rw-r--r-- | include/camera/Camera.h | 6 | ||||
| -rw-r--r-- | include/camera/ICamera.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/camera/Camera.h b/include/camera/Camera.h index 234e165..43dae1c 100644 --- a/include/camera/Camera.h +++ b/include/camera/Camera.h @@ -18,7 +18,7 @@ #define ANDROID_HARDWARE_CAMERA_H #include <utils/Timers.h> -#include <gui/ISurfaceTexture.h> +#include <gui/IGraphicBufferProducer.h> #include <system/camera.h> #include <camera/ICameraClient.h> #include <camera/ICameraRecordingProxy.h> @@ -86,8 +86,8 @@ 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); + // pass the buffered IGraphicBufferProducer to the camera service + status_t setPreviewTexture(const sp<IGraphicBufferProducer>& bufferProducer); // start preview mode, must call setPreviewDisplay first status_t startPreview(); diff --git a/include/camera/ICamera.h b/include/camera/ICamera.h index 3d18837..eccaa41 100644 --- a/include/camera/ICamera.h +++ b/include/camera/ICamera.h @@ -27,7 +27,7 @@ namespace android { class ICameraClient; -class ISurfaceTexture; +class IGraphicBufferProducer; class Surface; class ICamera: public IInterface @@ -49,9 +49,9 @@ 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 + // pass the buffered IGraphicBufferProducer to the camera service virtual status_t setPreviewTexture( - const sp<ISurfaceTexture>& surfaceTexture) = 0; + const sp<IGraphicBufferProducer>& bufferProducer) = 0; // set the preview callback flag to affect how the received frames from // preview are handled. |