ecc504043f
SurfaceFlinger's (Layer's) shadow copy of the BufferQueue queue was
getting out of sync for a few reasons. This change fixes these by
doing the following:
- Adds a check to re-synchronize the shadow copy every time we
successfully acquire a buffer by first dropping stale buffers before
removing the current buffer.
- Avoids trying to perform updates for buffers which have been rejected
(for incorrect dimensions) by SurfaceFlinger.
- Adds IGraphicBufferConsumer::setShadowQueueSize, which allows the
consumer to notify the BufferQueue that it is maintaining a shadow
copy of the queue and prevents it from dropping so many buffers
during acquireBuffer that it ends up returning a buffer for which the
consumer has not yet received an onFrameAvailable call.
Bug: 20096136
Change-Id: I78d0738428005fc19b3be85cc8f1db498043612f
(cherry picked from commit 2e36f2283f)
96 lines
3.2 KiB
C++
96 lines
3.2 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.
|
|
*/
|
|
|
|
#ifndef ANDROID_SURFACEFLINGERCONSUMER_H
|
|
#define ANDROID_SURFACEFLINGERCONSUMER_H
|
|
|
|
#include "DispSync.h"
|
|
#include <gui/GLConsumer.h>
|
|
|
|
namespace android {
|
|
// ----------------------------------------------------------------------------
|
|
|
|
/*
|
|
* This is a thin wrapper around GLConsumer.
|
|
*/
|
|
class SurfaceFlingerConsumer : public GLConsumer {
|
|
public:
|
|
static const status_t BUFFER_REJECTED = UNKNOWN_ERROR + 8;
|
|
|
|
struct ContentsChangedListener: public FrameAvailableListener {
|
|
virtual void onSidebandStreamChanged() = 0;
|
|
};
|
|
|
|
SurfaceFlingerConsumer(const sp<IGraphicBufferConsumer>& consumer,
|
|
uint32_t tex)
|
|
: GLConsumer(consumer, tex, GLConsumer::TEXTURE_EXTERNAL, false, false),
|
|
mTransformToDisplayInverse(false), mSurfaceDamage()
|
|
{}
|
|
|
|
class BufferRejecter {
|
|
friend class SurfaceFlingerConsumer;
|
|
virtual bool reject(const sp<GraphicBuffer>& buf,
|
|
const BufferItem& item) = 0;
|
|
|
|
protected:
|
|
virtual ~BufferRejecter() { }
|
|
};
|
|
|
|
virtual status_t acquireBufferLocked(BufferItem *item, nsecs_t presentWhen);
|
|
|
|
// This version of updateTexImage() takes a functor that may be used to
|
|
// reject the newly acquired buffer. Unlike the GLConsumer version,
|
|
// this does not guarantee that the buffer has been bound to the GL
|
|
// texture.
|
|
status_t updateTexImage(BufferRejecter* rejecter, const DispSync& dispSync);
|
|
|
|
// See GLConsumer::bindTextureImageLocked().
|
|
status_t bindTextureImage();
|
|
|
|
// must be called from SF main thread
|
|
bool getTransformToDisplayInverse() const;
|
|
const Region& getSurfaceDamage() const;
|
|
|
|
// Sets the contents changed listener. This should be used instead of
|
|
// ConsumerBase::setFrameAvailableListener().
|
|
void setContentsChangedListener(const wp<ContentsChangedListener>& listener);
|
|
|
|
sp<NativeHandle> getSidebandStream() const;
|
|
|
|
// See IGraphicBufferConsumer::setShadowQueueSize
|
|
void setShadowQueueSize(size_t size);
|
|
|
|
nsecs_t computeExpectedPresent(const DispSync& dispSync);
|
|
|
|
private:
|
|
virtual void onSidebandStreamChanged();
|
|
|
|
wp<ContentsChangedListener> mContentsChangedListener;
|
|
|
|
// Indicates this buffer must be transformed by the inverse transform of the screen
|
|
// it is displayed onto. This is applied after GLConsumer::mCurrentTransform.
|
|
// This must be set/read from SurfaceFlinger's main thread.
|
|
bool mTransformToDisplayInverse;
|
|
|
|
// The portion of this surface that has changed since the previous frame
|
|
Region mSurfaceDamage;
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
}; // namespace android
|
|
|
|
#endif // ANDROID_SURFACEFLINGERCONSUMER_H
|