6710604286
the purgatory list wasn't needed anymore; in fact it had no effect as buffer life-time management is now handled by the BufferQueue. For QueuesToWindowComposer we keep a list of wp<> on the IBinder for IGraphicBufferProducers we hand over to clients so we can easily check if an IGraphicBufferProducer is ours. We clean-up the list when our IGraphicBufferProducer are destroyed. Bug: 8349142 Change-Id: I1aa06652ade8c72d0004a3f5e6c3d6e8a82fc2ae
83 lines
2.8 KiB
C++
83 lines
2.8 KiB
C++
/*
|
|
* Copyright (C) 2011 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 <stdlib.h>
|
|
#include <stdint.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <utils/Errors.h>
|
|
|
|
#include "SurfaceFlinger.h"
|
|
#include "SurfaceTextureLayer.h"
|
|
|
|
namespace android {
|
|
// ---------------------------------------------------------------------------
|
|
|
|
|
|
SurfaceTextureLayer::SurfaceTextureLayer(const sp<SurfaceFlinger>& flinger)
|
|
: BufferQueue(true), flinger(flinger) {
|
|
}
|
|
|
|
SurfaceTextureLayer::~SurfaceTextureLayer() {
|
|
// remove ourselves from SurfaceFlinger's list. We do this asynchronously
|
|
// because we don't know where this dtor is called from, it could be
|
|
// called with the mStateLock held, leading to a dead-lock (it actually
|
|
// happens).
|
|
class MessageCleanUpList : public MessageBase {
|
|
sp<SurfaceFlinger> flinger;
|
|
wp<IBinder> gbp;
|
|
public:
|
|
MessageCleanUpList(const sp<SurfaceFlinger>& flinger, const wp<IBinder>& gbp)
|
|
: flinger(flinger), gbp(gbp) { }
|
|
virtual bool handler() {
|
|
Mutex::Autolock _l(flinger->mStateLock);
|
|
flinger->mGraphicBufferProducerList.remove(gbp);
|
|
return true;
|
|
}
|
|
};
|
|
flinger->postMessageAsync( new MessageCleanUpList(flinger, this) );
|
|
}
|
|
|
|
status_t SurfaceTextureLayer::connect(int api, QueueBufferOutput* output) {
|
|
status_t err = BufferQueue::connect(api, output);
|
|
if (err == NO_ERROR) {
|
|
switch(api) {
|
|
case NATIVE_WINDOW_API_MEDIA:
|
|
case NATIVE_WINDOW_API_CAMERA:
|
|
// Camera preview and videos are rate-limited on the producer
|
|
// side. If enabled for this build, we use async mode to always
|
|
// show the most recent frame at the cost of requiring an
|
|
// additional buffer.
|
|
#ifndef NEVER_DEFAULT_TO_ASYNC_MODE
|
|
err = setSynchronousMode(false);
|
|
break;
|
|
#endif
|
|
// fall through to set synchronous mode when not defaulting to
|
|
// async mode.
|
|
default:
|
|
err = setSynchronousMode(true);
|
|
break;
|
|
}
|
|
if (err != NO_ERROR) {
|
|
disconnect(api);
|
|
}
|
|
}
|
|
return err;
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
}; // namespace android
|