diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-05-08 20:08:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-08 20:08:42 +0000 |
| commit | 8bae3aa349f9d03934a170d3bafbf0008bfc3a9d (patch) | |
| tree | fabce753498abea0a2de91de1c4bf0f895b10531 /include/media | |
| parent | 3af8a321d06b3ee59afe159479c58e6b549c7b8f (diff) | |
| parent | 47a2e875bdd2bd25cb8500208940ff1488b01e08 (diff) | |
| download | frameworks_av-8bae3aa349f9d03934a170d3bafbf0008bfc3a9d.zip frameworks_av-8bae3aa349f9d03934a170d3bafbf0008bfc3a9d.tar.gz frameworks_av-8bae3aa349f9d03934a170d3bafbf0008bfc3a9d.tar.bz2 | |
Merge "libstagefright: report special error when codec is released by resource manager." into mnc-dev
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index 56d2523..82c768d 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -164,6 +164,11 @@ protected: virtual void onMessageReceived(const sp<AMessage> &msg); private: + // used by ResourceManagerClient + status_t reclaim(); + friend struct ResourceManagerClient; + +private: enum State { UNINITIALIZED, INITIALIZING, @@ -262,6 +267,7 @@ private: }; State mState; + bool mReleasedByResourceManager; sp<ALooper> mLooper; sp<ALooper> mCodecLooper; sp<CodecBase> mCodec; @@ -321,7 +327,7 @@ private: static status_t PostAndAwaitResponse( const sp<AMessage> &msg, sp<AMessage> *response); - static void PostReplyWithError(const sp<AReplyToken> &replyID, int32_t err); + void PostReplyWithError(const sp<AReplyToken> &replyID, int32_t err); status_t init(const AString &name, bool nameIsType, bool encoder); |