diff options
author | Chong Zhang <chz@google.com> | 2014-10-04 01:43:12 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-04 01:43:12 +0000 |
commit | 176dda365968a32eec62c440c14ac0d4133241f5 (patch) | |
tree | dae0c07d65becda2c9aa0873c05711bbd47f32cf /media | |
parent | e9c83ef28c876389812b69ef9625305066ec5fd3 (diff) | |
parent | f0011d49c0f08753dc2dc254c5a70885a9986602 (diff) | |
download | frameworks_av-176dda365968a32eec62c440c14ac0d4133241f5.zip frameworks_av-176dda365968a32eec62c440c14ac0d4133241f5.tar.gz frameworks_av-176dda365968a32eec62c440c14ac0d4133241f5.tar.bz2 |
am f0011d49: Merge "MediaRecorder: only dequeue available buffers from MediaCodec" into lmp-dev
* commit 'f0011d49c0f08753dc2dc254c5a70885a9986602':
MediaRecorder: only dequeue available buffers from MediaCodec
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/MediaCodecSource.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/media/libstagefright/MediaCodecSource.cpp b/media/libstagefright/MediaCodecSource.cpp index 27cd231..0fecda8 100644 --- a/media/libstagefright/MediaCodecSource.cpp +++ b/media/libstagefright/MediaCodecSource.cpp @@ -615,11 +615,11 @@ status_t MediaCodecSource::feedEncoderInputBuffers() { return OK; } -status_t MediaCodecSource::doMoreWork() { - status_t err; +status_t MediaCodecSource::doMoreWork(int32_t numInput, int32_t numOutput) { + status_t err = OK; if (!(mFlags & FLAG_USE_SURFACE_INPUT)) { - for (;;) { + while (numInput-- > 0) { size_t bufferIndex; err = mEncoder->dequeueInputBuffer(&bufferIndex); @@ -633,7 +633,7 @@ status_t MediaCodecSource::doMoreWork() { feedEncoderInputBuffers(); } - for (;;) { + while (numOutput-- > 0) { size_t bufferIndex; size_t offset; size_t size; @@ -805,7 +805,16 @@ void MediaCodecSource::onMessageReceived(const sp<AMessage> &msg) { break; } - status_t err = doMoreWork(); + int32_t numInput, numOutput; + + if (!msg->findInt32("input-buffers", &numInput)) { + numInput = INT32_MAX; + } + if (!msg->findInt32("output-buffers", &numOutput)) { + numOutput = INT32_MAX; + } + + status_t err = doMoreWork(numInput, numOutput); if (err == OK) { scheduleDoMoreWork(); |