diff options
| author | Glenn Kasten <gkasten@google.com> | 2011-02-08 17:26:17 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2011-02-23 15:02:56 -0800 |
| commit | 1173118eace0e9e347cb007f0da817cee87579ed (patch) | |
| tree | d2d23b2120010097d1edda29cd0adffd938105c3 /media/libmedia/mediaplayer.cpp | |
| parent | f7f3e824a8cb2b38355db8e4f99e43b90ee71ce4 (diff) | |
| download | frameworks_av-1173118eace0e9e347cb007f0da817cee87579ed.zip frameworks_av-1173118eace0e9e347cb007f0da817cee87579ed.tar.gz frameworks_av-1173118eace0e9e347cb007f0da817cee87579ed.tar.bz2 | |
Bug 3438258 Add SurfaceTexture as MediaPlayer sink
This change enables the use of a SurfaceTexture in place of a Surface
as the video sink for an android.media.MediaPlayer. The new API
MediaPlayer.setTexture is currently hidden.
This includes:
- New Java and C++ interfaces
- C++ plumbing and implementation (JNI, Binder)
- Stagefright AwesomePlayer and NuPlayer use ANativeWindow
(either Surface or SurfaceTextureClient)
Change-Id: I2b568bee143d9eaf3dfc6cc4533c1bebbd5afc51
Diffstat (limited to 'media/libmedia/mediaplayer.cpp')
| -rw-r--r-- | media/libmedia/mediaplayer.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index 87c8fe4..0ee0249 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -201,6 +201,16 @@ status_t MediaPlayer::setVideoSurface(const sp<Surface>& surface) return mPlayer->setVideoSurface(surface); } +status_t MediaPlayer::setVideoSurfaceTexture( + const sp<ISurfaceTexture>& surfaceTexture) +{ + LOGV("setVideoSurfaceTexture"); + Mutex::Autolock _l(mLock); + if (mPlayer == 0) return NO_INIT; + + return mPlayer->setVideoSurfaceTexture(surfaceTexture); +} + // must call with lock held status_t MediaPlayer::prepareAsync_l() { |