diff options
| author | Lajos Molnar <lajos@google.com> | 2014-07-09 10:01:38 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2014-07-09 17:12:19 +0000 |
| commit | aae3f86c7c9a3bce5aab0d283343455d58b133b8 (patch) | |
| tree | 0faf7f6f936078e754da4a71c82674e5c8fcfa43 /media | |
| parent | 782be1ecf1022d4e2da714b5aebe51ab616e9975 (diff) | |
| download | frameworks_av-aae3f86c7c9a3bce5aab0d283343455d58b133b8.zip frameworks_av-aae3f86c7c9a3bce5aab0d283343455d58b133b8.tar.gz frameworks_av-aae3f86c7c9a3bce5aab0d283343455d58b133b8.tar.bz2 | |
DO NOT MERGE: Fix build for libstagefright
Bug: 15987446
Change-Id: I6a13e1f73b067b733e2592e12ee21210d4c4d476
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 12 | ||||
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 12 |
2 files changed, 6 insertions, 18 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index f2d960a..8945d58 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -652,15 +652,9 @@ status_t ACodec::configureOutputBuffersFromNativeWindow( err = mOMX->setParameter( mNode, OMX_IndexParamPortDefinition, &def, sizeof(def)); - if (err == OK) { - *minUndequeuedBuffers += extraBuffers; - break; - } - - ALOGW("[%s] setting nBufferCountActual to %u failed: %d", - mComponentName.c_str(), newBufferCount, err); - /* exit condition */ - if (extraBuffers == 0) { + if (err != OK) { + ALOGE("[%s] setting nBufferCountActual to %u failed: %d", + mComponentName.c_str(), newBufferCount, err); return err; } } diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 97bf514..cefa248 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -1806,15 +1806,9 @@ status_t OMXCodec::allocateOutputBuffersFromNativeWindow() { err = mOMX->setParameter( mNode, OMX_IndexParamPortDefinition, &def, sizeof(def)); - if (err == OK) { - minUndequeuedBufs += extraBuffers; - break; - } - - CODEC_LOGW("setting nBufferCountActual to %u failed: %d", - newBufferCount, err); - /* exit condition */ - if (extraBuffers == 0) { + if (err != OK) { + ALOGE("setting nBufferCountActual to %u failed: %d", + newBufferCount, err); return err; } } |