diff options
author | Chong Zhang <chz@google.com> | 2014-10-03 16:12:37 -0700 |
---|---|---|
committer | Chong Zhang <chz@google.com> | 2014-10-03 23:25:54 +0000 |
commit | f2a64852a4a48c5a3d8a08ffcda20d6884586672 (patch) | |
tree | 6f9909217ea845e3d57580240ad00116d7408069 /media/libstagefright/MediaCodecSource.cpp | |
parent | b220fe0e40bc3752b62a9576fc824634a16fc3ab (diff) | |
download | frameworks_av-f2a64852a4a48c5a3d8a08ffcda20d6884586672.zip frameworks_av-f2a64852a4a48c5a3d8a08ffcda20d6884586672.tar.gz frameworks_av-f2a64852a4a48c5a3d8a08ffcda20d6884586672.tar.bz2 |
MediaRecorder: only dequeue available buffers from MediaCodec
Bug: 17514968
Change-Id: If232f92d163deb2440b927315c69e0c4d51ca290
Diffstat (limited to 'media/libstagefright/MediaCodecSource.cpp')
-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(); |