diff options
| author | Andy McFadden <fadden@android.com> | 2012-12-18 15:21:20 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-12-18 15:21:21 -0800 |
| commit | 6a695f176fcf758a68bc23f201e4615c37206369 (patch) | |
| tree | 99f0c8b4f04ad25c63c21a3ab7c7d7be9c513774 /media/libstagefright/include | |
| parent | 0ebf429406d796df74f781dfe085ee73851fe2a1 (diff) | |
| parent | 8ba01021b573889802e67e029225a96f0dfa471a (diff) | |
| download | frameworks_av-6a695f176fcf758a68bc23f201e4615c37206369.zip frameworks_av-6a695f176fcf758a68bc23f201e4615c37206369.tar.gz frameworks_av-6a695f176fcf758a68bc23f201e4615c37206369.tar.bz2 | |
Merge "Rename ISurfaceTexture and SurfaceTexture"
Diffstat (limited to 'media/libstagefright/include')
| -rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index 1422687..2306f31 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -36,7 +36,7 @@ struct MediaBuffer; struct MediaExtractor; struct MediaSource; struct NuCachedSource2; -struct ISurfaceTexture; +struct IGraphicBufferProducer; class DrmManagerClinet; class DecryptHandle; @@ -81,7 +81,7 @@ struct AwesomePlayer { bool isPlaying() const; - status_t setSurfaceTexture(const sp<ISurfaceTexture> &surfaceTexture); + status_t setSurfaceTexture(const sp<IGraphicBufferProducer> &bufferProducer); void setAudioSink(const sp<MediaPlayerBase::AudioSink> &audioSink); status_t setLooping(bool shouldLoop); |