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 | cc562a3576a6a8096626387472e05e8bee03352a (patch) | |
tree | 86b53d7654e5e4a57d623dd616df57aa05801616 /media/tests/players | |
parent | 1beb48055208bca57c6bf9d26676f86386e3a5dc (diff) | |
download | frameworks_base-cc562a3576a6a8096626387472e05e8bee03352a.zip frameworks_base-cc562a3576a6a8096626387472e05e8bee03352a.tar.gz frameworks_base-cc562a3576a6a8096626387472e05e8bee03352a.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/tests/players')
-rw-r--r-- | media/tests/players/invoke_mock_media_player.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/tests/players/invoke_mock_media_player.cpp b/media/tests/players/invoke_mock_media_player.cpp index 1e3731e..d571106 100644 --- a/media/tests/players/invoke_mock_media_player.cpp +++ b/media/tests/players/invoke_mock_media_player.cpp @@ -25,8 +25,8 @@ #include <utils/Errors.h> using android::INVALID_OPERATION; -using android::ISurface; using android::Surface; +using android::ISurfaceTexture; using android::MediaPlayerBase; using android::OK; using android::Parcel; @@ -69,6 +69,8 @@ class Player: public MediaPlayerBase virtual status_t setDataSource(int fd, int64_t offset, int64_t length) {return OK;} virtual status_t setVideoSurface(const sp<Surface>& surface) {return OK;} + virtual status_t setVideoSurfaceTexture( + const sp<ISurfaceTexture>& surfaceTexture) {return OK;} virtual status_t prepare() {return OK;} virtual status_t prepareAsync() {return OK;} virtual status_t start() {return OK;} |