diff options
| author | Andreas Huber <andih@google.com> | 2011-08-29 13:01:23 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2011-08-29 13:01:23 -0700 |
| commit | 63970b42f101c87db7cfd26d43b0d300260b1582 (patch) | |
| tree | 5e358f4f34709bc1663723fc094b7d888b7a86d9 /media/libmediaplayerservice/StagefrightPlayer.cpp | |
| parent | 1b5a697dc5435c76447eb5a2de373f5acdda119e (diff) | |
| download | frameworks_av-63970b42f101c87db7cfd26d43b0d300260b1582.zip frameworks_av-63970b42f101c87db7cfd26d43b0d300260b1582.tar.gz frameworks_av-63970b42f101c87db7cfd26d43b0d300260b1582.tar.bz2 | |
Return an error to the client instead of asserting if decoder instantiation fails
after a surface change.
Change-Id: Ic7758cbeb107032db68a1c3b8e2984710a12dd8b
related-to-bug: 5212725
Diffstat (limited to 'media/libmediaplayerservice/StagefrightPlayer.cpp')
| -rw-r--r-- | media/libmediaplayerservice/StagefrightPlayer.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/media/libmediaplayerservice/StagefrightPlayer.cpp b/media/libmediaplayerservice/StagefrightPlayer.cpp index 40e055c..cd4b1ef 100644 --- a/media/libmediaplayerservice/StagefrightPlayer.cpp +++ b/media/libmediaplayerservice/StagefrightPlayer.cpp @@ -72,16 +72,14 @@ status_t StagefrightPlayer::setDataSource(const sp<IStreamSource> &source) { status_t StagefrightPlayer::setVideoSurface(const sp<Surface> &surface) { LOGV("setVideoSurface"); - mPlayer->setSurface(surface); - return OK; + return mPlayer->setSurface(surface); } status_t StagefrightPlayer::setVideoSurfaceTexture( const sp<ISurfaceTexture> &surfaceTexture) { LOGV("setVideoSurfaceTexture"); - mPlayer->setSurfaceTexture(surfaceTexture); - return OK; + return mPlayer->setSurfaceTexture(surfaceTexture); } status_t StagefrightPlayer::prepare() { |