595264f1af
this is the first step of a series of improvements to
BufferQueue. A few things happen in this change:
- setSynchronousMode() goes away as well as the SynchronousModeAllowed flag
- BufferQueue now defaults to (what used to be) synchronous mode
- a new "controlled by app" flag is passed when creating consumers and producers
those flags are used to put the BufferQueue in a mode where it
will never block if both flags are set. This is achieved by:
- returning an error from dequeueBuffer() if it would block
- making sure a buffer is always available by replacing
the previous buffer with the new one in queueBuffer()
(note: this is similar to what asynchrnous mode used to be)
Note: in this change EGL's swap-interval 0 is broken; this will be
fixed in another change.
Change-Id: I691f9507d6e2e158287e3039f2a79a4d4434211d
56 lines
1.9 KiB
C++
56 lines
1.9 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(), 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) );
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
}; // namespace android
|