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 /camera/ICamera.cpp | |
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 'camera/ICamera.cpp')
-rw-r--r-- | camera/ICamera.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/camera/ICamera.cpp b/camera/ICamera.cpp index 8d8408c..5d210e7 100644 --- a/camera/ICamera.cpp +++ b/camera/ICamera.cpp @@ -22,7 +22,7 @@ #include <sys/types.h> #include <binder/Parcel.h> #include <camera/ICamera.h> -#include <gui/ISurfaceTexture.h> +#include <gui/IGraphicBufferProducer.h> #include <gui/Surface.h> namespace android { @@ -79,13 +79,13 @@ public: return reply.readInt32(); } - // pass the buffered SurfaceTexture 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) { ALOGV("setPreviewTexture"); Parcel data, reply; data.writeInterfaceToken(ICamera::getInterfaceDescriptor()); - sp<IBinder> b(surfaceTexture->asBinder()); + sp<IBinder> b(bufferProducer->asBinder()); data.writeStrongBinder(b); remote()->transact(SET_PREVIEW_TEXTURE, data, &reply); return reply.readInt32(); @@ -292,7 +292,8 @@ status_t BnCamera::onTransact( case SET_PREVIEW_TEXTURE: { ALOGV("SET_PREVIEW_TEXTURE"); CHECK_INTERFACE(ICamera, data, reply); - sp<ISurfaceTexture> st = interface_cast<ISurfaceTexture>(data.readStrongBinder()); + sp<IGraphicBufferProducer> st = + interface_cast<IGraphicBufferProducer>(data.readStrongBinder()); reply->writeInt32(setPreviewTexture(st)); return NO_ERROR; } break; |