9504eb915c
This needs the ConsumerBase mutex locked, but wasn't locking it. Two of the four places that called it already held the lock so were fine. Now addReleaseFence() takes the lock itself, and I added addReleaseFenceLocked() for the two already-locked callers, since in one of them dropping the lock would be inconvenient. Bug: 7289269 Change-Id: I7a5628adb516f8eec782aa6c14128202f96d7b0a
97 lines
2.9 KiB
C++
97 lines
2.9 KiB
C++
/*
|
|
* Copyright (C) 2012 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
//#define LOG_NDEBUG 0
|
|
#define LOG_TAG "BufferItemConsumer"
|
|
#define ATRACE_TAG ATRACE_TAG_GRAPHICS
|
|
#include <utils/Log.h>
|
|
|
|
#include <gui/BufferItemConsumer.h>
|
|
|
|
#define BI_LOGV(x, ...) ALOGV("[%s] "x, mName.string(), ##__VA_ARGS__)
|
|
#define BI_LOGD(x, ...) ALOGD("[%s] "x, mName.string(), ##__VA_ARGS__)
|
|
#define BI_LOGI(x, ...) ALOGI("[%s] "x, mName.string(), ##__VA_ARGS__)
|
|
#define BI_LOGW(x, ...) ALOGW("[%s] "x, mName.string(), ##__VA_ARGS__)
|
|
#define BI_LOGE(x, ...) ALOGE("[%s] "x, mName.string(), ##__VA_ARGS__)
|
|
|
|
namespace android {
|
|
|
|
BufferItemConsumer::BufferItemConsumer(uint32_t consumerUsage,
|
|
int bufferCount, bool synchronousMode) :
|
|
ConsumerBase(new BufferQueue(true) )
|
|
{
|
|
mBufferQueue->setConsumerUsageBits(consumerUsage);
|
|
mBufferQueue->setSynchronousMode(synchronousMode);
|
|
mBufferQueue->setMaxAcquiredBufferCount(bufferCount);
|
|
}
|
|
|
|
BufferItemConsumer::~BufferItemConsumer() {
|
|
}
|
|
|
|
void BufferItemConsumer::setName(const String8& name) {
|
|
Mutex::Autolock _l(mMutex);
|
|
mName = name;
|
|
mBufferQueue->setConsumerName(name);
|
|
}
|
|
|
|
status_t BufferItemConsumer::acquireBuffer(BufferItem *item, bool waitForFence) {
|
|
status_t err;
|
|
|
|
if (!item) return BAD_VALUE;
|
|
|
|
Mutex::Autolock _l(mMutex);
|
|
|
|
err = acquireBufferLocked(item);
|
|
if (err != OK) {
|
|
if (err != NO_BUFFER_AVAILABLE) {
|
|
BI_LOGE("Error acquiring buffer: %s (%d)", strerror(err), err);
|
|
}
|
|
return err;
|
|
}
|
|
|
|
if (waitForFence && item->mFence.get()) {
|
|
err = item->mFence->waitForever(1000, "BufferItemConsumer::acquireBuffer");
|
|
if (err != OK) {
|
|
BI_LOGE("Failed to wait for fence of acquired buffer: %s (%d)",
|
|
strerror(-err), err);
|
|
return err;
|
|
}
|
|
}
|
|
|
|
item->mGraphicBuffer = mSlots[item->mBuf].mGraphicBuffer;
|
|
|
|
return OK;
|
|
}
|
|
|
|
status_t BufferItemConsumer::releaseBuffer(const BufferItem &item,
|
|
const sp<Fence>& releaseFence) {
|
|
status_t err;
|
|
|
|
Mutex::Autolock _l(mMutex);
|
|
|
|
err = addReleaseFenceLocked(item.mBuf, releaseFence);
|
|
|
|
err = releaseBufferLocked(item.mBuf, EGL_NO_DISPLAY,
|
|
EGL_NO_SYNC_KHR);
|
|
if (err != OK) {
|
|
BI_LOGE("Failed to release buffer: %s (%d)",
|
|
strerror(-err), err);
|
|
}
|
|
return err;
|
|
}
|
|
|
|
} // namespace android
|