diff options
author | Patrik Ryd <patrik.ryd@linaro.org> | 2012-05-16 16:38:50 +0200 |
---|---|---|
committer | Patrik Ryd <patrik.ryd@linaro.org> | 2012-05-16 16:38:50 +0200 |
commit | e6a8c10d3d6d652c0325d965a87494faa84b1aca (patch) | |
tree | 78bd5ebee704236f2d4de098b7b0569095b9d9bd | |
parent | 77e3d81262855702023f7fa4a7a63bf6abf784b0 (diff) | |
download | base-e6a8c10d3d6d652c0325d965a87494faa84b1aca.tar.gz |
Revert "changes for awesomeplayer"
This reverts commit 06d0b9b37d168dd0520398057373116018d94c2a.
-rw-r--r--[-rwxr-xr-x] | media/libstagefright/AwesomePlayer.cpp | 9 | ||||
-rw-r--r--[-rwxr-xr-x] | 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 f5ecd6909961..1b4f79f89d69 100755..100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -1141,18 +1141,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 d9c54e1a9dea..0985f479d561 100755..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; |