851cfe8342
HWComposer didn't allow the virtual display output buffer to be set directly, instead it always used the framebuffer target buffer. DisplayDevice was only providing the framebuffer release fence to DisplaySurfaces after a commit. This change fixes both of these, so both HWComposer and DisplayDevice should continue to work if VirtualDisplaySurface changes to use separate framebuffer and output buffers. It's also more correct since VirtualDisplaySurface uses the correct release fence when queueing the buffer to the sink. Bug: 8384764 Change-Id: I95c71e8d4f67705e23f122259ec8dd5dbce70dcf
101 lines
3.6 KiB
C++
101 lines
3.6 KiB
C++
/*
|
|
* Copyright 2013 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.
|
|
*/
|
|
|
|
#include "VirtualDisplaySurface.h"
|
|
#include "HWComposer.h"
|
|
|
|
// ---------------------------------------------------------------------------
|
|
namespace android {
|
|
// ---------------------------------------------------------------------------
|
|
|
|
VirtualDisplaySurface::VirtualDisplaySurface(HWComposer& hwc, int disp,
|
|
const sp<IGraphicBufferProducer>& sink, const String8& name)
|
|
: mHwc(hwc),
|
|
mDisplayId(disp),
|
|
mSource(new BufferQueueInterposer(sink, name)),
|
|
mName(name)
|
|
{}
|
|
|
|
VirtualDisplaySurface::~VirtualDisplaySurface() {
|
|
if (mAcquiredBuffer != NULL) {
|
|
status_t result = mSource->releaseBuffer(Fence::NO_FENCE);
|
|
ALOGE_IF(result != NO_ERROR, "VirtualDisplaySurface \"%s\": "
|
|
"failed to release buffer: %d", mName.string(), result);
|
|
}
|
|
}
|
|
|
|
sp<IGraphicBufferProducer> VirtualDisplaySurface::getIGraphicBufferProducer() const {
|
|
return mSource;
|
|
}
|
|
|
|
status_t VirtualDisplaySurface::compositionComplete() {
|
|
return NO_ERROR;
|
|
}
|
|
|
|
status_t VirtualDisplaySurface::advanceFrame() {
|
|
Mutex::Autolock lock(mMutex);
|
|
status_t result = NO_ERROR;
|
|
|
|
if (mAcquiredBuffer != NULL) {
|
|
ALOGE("VirtualDisplaySurface \"%s\": "
|
|
"advanceFrame called twice without onFrameCommitted",
|
|
mName.string());
|
|
return INVALID_OPERATION;
|
|
}
|
|
|
|
sp<Fence> fence;
|
|
result = mSource->acquireBuffer(&mAcquiredBuffer, &fence);
|
|
if (result == BufferQueueInterposer::NO_BUFFER_AVAILABLE) {
|
|
result = mSource->pullEmptyBuffer();
|
|
if (result != NO_ERROR)
|
|
return result;
|
|
result = mSource->acquireBuffer(&mAcquiredBuffer, &fence);
|
|
}
|
|
if (result != NO_ERROR)
|
|
return result;
|
|
|
|
return mHwc.fbPost(mDisplayId, fence, mAcquiredBuffer);
|
|
}
|
|
|
|
void VirtualDisplaySurface::onFrameCommitted() {
|
|
Mutex::Autolock lock(mMutex);
|
|
if (mAcquiredBuffer != NULL) {
|
|
// fbFence signals when reads from the framebuffer are finished
|
|
// outFence signals when writes to the output buffer are finished
|
|
// It's unlikely that there will be an implementation where fbFence
|
|
// signals after outFence (in fact they'll typically be the same
|
|
// sync_pt), but just to be pedantic we merge them so the sink will
|
|
// be sure to wait until both are complete.
|
|
sp<Fence> fbFence = mHwc.getAndResetReleaseFence(mDisplayId);
|
|
sp<Fence> outFence = mHwc.getLastRetireFence(mDisplayId);
|
|
sp<Fence> fence = Fence::merge(
|
|
String8::format("HWC done: %.21s", mName.string()),
|
|
fbFence, outFence);
|
|
|
|
status_t result = mSource->releaseBuffer(fence);
|
|
ALOGE_IF(result != NO_ERROR, "VirtualDisplaySurface \"%s\": "
|
|
"failed to release buffer: %d", mName.string(), result);
|
|
mAcquiredBuffer.clear();
|
|
}
|
|
}
|
|
|
|
void VirtualDisplaySurface::dump(String8& result) const {
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
} // namespace android
|
|
// ---------------------------------------------------------------------------
|