summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/CameraClient.cpp
diff options
context:
space:
mode:
authorAndy McFadden <fadden@android.com>2012-12-18 09:46:54 -0800
committerAndy McFadden <fadden@android.com>2012-12-18 13:31:57 -0800
commit8ba01021b573889802e67e029225a96f0dfa471a (patch)
tree110eca2effc73dcb2f46da71e9a0584e4af6e71e /services/camera/libcameraservice/CameraClient.cpp
parent53bc0a2fc54330534330118edd5c393f39eff8ab (diff)
downloadframeworks_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 'services/camera/libcameraservice/CameraClient.cpp')
-rw-r--r--services/camera/libcameraservice/CameraClient.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/services/camera/libcameraservice/CameraClient.cpp b/services/camera/libcameraservice/CameraClient.cpp
index 006a9c9..f9cee0d 100644
--- a/services/camera/libcameraservice/CameraClient.cpp
+++ b/services/camera/libcameraservice/CameraClient.cpp
@@ -307,17 +307,17 @@ status_t CameraClient::setPreviewDisplay(const sp<Surface>& surface) {
return setPreviewWindow(binder, window);
}
-// set the SurfaceTexture that the preview will use
+// set the SurfaceTextureClient that the preview will use
status_t CameraClient::setPreviewTexture(
- const sp<ISurfaceTexture>& surfaceTexture) {
- LOG1("setPreviewTexture(%p) (pid %d)", surfaceTexture.get(),
+ const sp<IGraphicBufferProducer>& bufferProducer) {
+ LOG1("setPreviewTexture(%p) (pid %d)", bufferProducer.get(),
getCallingPid());
sp<IBinder> binder;
sp<ANativeWindow> window;
- if (surfaceTexture != 0) {
- binder = surfaceTexture->asBinder();
- window = new SurfaceTextureClient(surfaceTexture);
+ if (bufferProducer != 0) {
+ binder = bufferProducer->asBinder();
+ window = new SurfaceTextureClient(bufferProducer);
}
return setPreviewWindow(binder, window);
}