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 /media/libmedia/IMediaPlayer.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 'media/libmedia/IMediaPlayer.cpp')
| -rw-r--r-- | media/libmedia/IMediaPlayer.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/media/libmedia/IMediaPlayer.cpp b/media/libmedia/IMediaPlayer.cpp index cb07766..e79bcd2 100644 --- a/media/libmedia/IMediaPlayer.cpp +++ b/media/libmedia/IMediaPlayer.cpp @@ -24,7 +24,7 @@ #include <media/IMediaPlayer.h> #include <media/IStreamSource.h> -#include <gui/ISurfaceTexture.h> +#include <gui/IGraphicBufferProducer.h> #include <utils/String8.h> namespace android { @@ -113,12 +113,12 @@ public: return reply.readInt32(); } - // pass the buffered ISurfaceTexture to the media player service - status_t setVideoSurfaceTexture(const sp<ISurfaceTexture>& surfaceTexture) + // pass the buffered IGraphicBufferProducer to the media player service + status_t setVideoSurfaceTexture(const sp<IGraphicBufferProducer>& bufferProducer) { Parcel data, reply; data.writeInterfaceToken(IMediaPlayer::getInterfaceDescriptor()); - sp<IBinder> b(surfaceTexture->asBinder()); + sp<IBinder> b(bufferProducer->asBinder()); data.writeStrongBinder(b); remote()->transact(SET_VIDEO_SURFACETEXTURE, data, &reply); return reply.readInt32(); @@ -383,9 +383,9 @@ status_t BnMediaPlayer::onTransact( } case SET_VIDEO_SURFACETEXTURE: { CHECK_INTERFACE(IMediaPlayer, data, reply); - sp<ISurfaceTexture> surfaceTexture = - interface_cast<ISurfaceTexture>(data.readStrongBinder()); - reply->writeInt32(setVideoSurfaceTexture(surfaceTexture)); + sp<IGraphicBufferProducer> bufferProducer = + interface_cast<IGraphicBufferProducer>(data.readStrongBinder()); + reply->writeInt32(setVideoSurfaceTexture(bufferProducer)); return NO_ERROR; } break; case PREPARE_ASYNC: { |