diff options
| author | James Dong <jdong@google.com> | 2011-07-24 14:40:08 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-24 14:40:08 -0700 |
| commit | be1cc822304d3a29c106ad5b6f330aed3e8c5658 (patch) | |
| tree | cca08baf5327fd30c0f257738d2871484fa39f87 /include/media/stagefright/OMXCodec.h | |
| parent | 726e4527b7a750e688fec4c1e7c5f7b9a33d1623 (diff) | |
| parent | a57a9a491272aa884494b2ec7854960827a73742 (diff) | |
| download | frameworks_av-be1cc822304d3a29c106ad5b6f330aed3e8c5658.zip frameworks_av-be1cc822304d3a29c106ad5b6f330aed3e8c5658.tar.gz frameworks_av-be1cc822304d3a29c106ad5b6f330aed3e8c5658.tar.bz2 | |
Merge "Do not wait forever for output buffers in OMXCodec.cpp and error out in case time out happens"
Diffstat (limited to 'include/media/stagefright/OMXCodec.h')
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 93933d9..2932744 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -329,6 +329,7 @@ private: void restorePatchedDataPointer(BufferInfo *info); status_t applyRotation(); + status_t waitForBufferFilled_l(); int64_t retrieveDecodingTimeUs(bool isCodecSpecific); |