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/libstagefright/include/AwesomePlayer.h | |
| 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/libstagefright/include/AwesomePlayer.h')
| -rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index 14476d3..24cf77c 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -84,8 +84,8 @@ struct AwesomePlayer { bool isPlaying() const; - void setSurface(const sp<Surface> &surface); - void setSurfaceTexture(const sp<ISurfaceTexture> &surfaceTexture); + 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); @@ -298,7 +298,7 @@ private: void postAudioSeekComplete_l(); void shutdownVideoDecoder_l(); - void setNativeWindow_l(const sp<ANativeWindow> &native); + status_t setNativeWindow_l(const sp<ANativeWindow> &native); bool isStreamingHTTP() const; void sendCacheStats(); |