diff options
| author | Andreas Huber <andih@google.com> | 2011-11-08 08:48:31 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-08 08:48:31 -0800 |
| commit | 26f70db99f483be36caa7a4c84fec5de50bec034 (patch) | |
| tree | bb5e0c42bc4d564b8919a2c4fb302026a89582e6 /media/libstagefright | |
| parent | 99015a2464a40097c3e23e07cdf69da0f886aa66 (diff) | |
| parent | 95be24585f46229f551c529104b5e92fa4316b38 (diff) | |
| download | frameworks_base-26f70db99f483be36caa7a4c84fec5de50bec034.zip frameworks_base-26f70db99f483be36caa7a4c84fec5de50bec034.tar.gz frameworks_base-26f70db99f483be36caa7a4c84fec5de50bec034.tar.bz2 | |
Merge "Remove surface legacy APIs and code." into ics-mr1
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 9 | ||||
| -rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 2 |
2 files changed, 0 insertions, 11 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index f37e75b..7d9d7ed 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -1139,18 +1139,9 @@ bool AwesomePlayer::isPlaying() const { return (mFlags & PLAYING) || (mFlags & CACHE_UNDERRUN); } -status_t AwesomePlayer::setSurface(const sp<Surface> &surface) { - Mutex::Autolock autoLock(mLock); - - mSurface = surface; - return setNativeWindow_l(surface); -} - status_t AwesomePlayer::setSurfaceTexture(const sp<ISurfaceTexture> &surfaceTexture) { Mutex::Autolock autoLock(mLock); - mSurface.clear(); - status_t err; if (surfaceTexture != NULL) { err = setNativeWindow_l(new SurfaceTextureClient(surfaceTexture)); diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index 7d6bcad..c13d6cb 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -81,7 +81,6 @@ struct AwesomePlayer { bool isPlaying() const; - status_t setSurface(const sp<Surface> &surface); status_t setSurfaceTexture(const sp<ISurfaceTexture> &surfaceTexture); void setAudioSink(const sp<MediaPlayerBase::AudioSink> &audioSink); status_t setLooping(bool shouldLoop); @@ -154,7 +153,6 @@ private: bool mUIDValid; uid_t mUID; - sp<Surface> mSurface; sp<ANativeWindow> mNativeWindow; sp<MediaPlayerBase::AudioSink> mAudioSink; |