diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-10-13 21:20:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-13 21:20:27 +0000 |
| commit | e5200ea76c5d180b53087ae7825326ec61cc4687 (patch) | |
| tree | d18a0e7d46858f79d0009f2ae29faa14be40c65c /include | |
| parent | c4c68f63192ae7af09a6158b2e72ca7a1a7f4364 (diff) | |
| parent | 4b710f086070fabe022b3a1f474bfcbec842b8fc (diff) | |
| download | frameworks_av-e5200ea76c5d180b53087ae7825326ec61cc4687.zip frameworks_av-e5200ea76c5d180b53087ae7825326ec61cc4687.tar.gz frameworks_av-e5200ea76c5d180b53087ae7825326ec61cc4687.tar.bz2 | |
Merge "libstagefright: don't reclaim codec when there's buffer owned by client. Notify the client and try to reclaim again in 0.5s." into mnc-dr-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index c10963d..cdfa159 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -176,7 +176,7 @@ protected: private: // used by ResourceManagerClient - status_t reclaim(); + status_t reclaim(bool force = false); friend struct ResourceManagerClient; private: @@ -385,6 +385,9 @@ private: uint64_t getGraphicBufferSize(); void addResource(const String8 &type, const String8 &subtype, uint64_t value); + bool hasPendingBuffer(int portIndex); + bool hasPendingBuffer(); + /* called to get the last codec error when the sticky flag is set. * if no such codec error is found, returns UNKNOWN_ERROR. */ |