ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "get rid of Surface::getISurfaceTexture()"

Browse Source
This commit is contained in:
Mathias Agopian 2013-02-21 23:23:21 +00:00 committed by Android (Google) Code Review
commit a7121cf44b
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
include/gui/Surface.h
View File

@ -50,21 +50,39 @@ class Surface
{ {
public: public:
/*
* creates a Surface from the given IGraphicBufferProducer (which concrete
* implementation is a BufferQueue).
*
* Surface is mainly state-less while it's disconnected, it can be
* viewed as a glorified IGraphicBufferProducer holder. It's therefore
* safe to create other Surfaces from the same IGraphicBufferProducer.
*
* However, once a Surface is connected, it'll prevent other Surfaces
* referring to the same IGraphicBufferProducer to become connected and
* therefore prevent them to be used as actual producers of buffers.
*/
Surface(const sp<IGraphicBufferProducer>& bufferProducer); Surface(const sp<IGraphicBufferProducer>& bufferProducer);
/* getIGraphicBufferProducer() returns the IGraphicBufferProducer this
* Surface was created with. Usually it's an error to use the
* IGraphicBufferProducer while the Surface is connected.
*/
sp<IGraphicBufferProducer> getIGraphicBufferProducer() const; sp<IGraphicBufferProducer> getIGraphicBufferProducer() const;
static status_t writeToParcel(const sp<Surface>& surface, Parcel* parcel); /* convenience function to check that the given surface is non NULL as
static sp<Surface> readFromParcel(const Parcel& data); * well as its IGraphicBufferProducer */
static bool isValid(const sp<Surface>& surface) { static bool isValid(const sp<Surface>& surface) {
return surface != NULL && surface->getIGraphicBufferProducer() != NULL; return surface != NULL && surface->getIGraphicBufferProducer() != NULL;
} }
// FIXME: temporary for source compatibility... /* writes the given Surface into a Parcel */
sp<IGraphicBufferProducer> getISurfaceTexture() const { static status_t writeToParcel(const sp<Surface>& surface, Parcel* parcel);
return getIGraphicBufferProducer();
} /* constructs a Surface from a Parcel. see Surface::writeToParcel()
* and SurfaceControl::writeToParcel() */
static sp<Surface> readFromParcel(const Parcel& data);
protected: protected:
Surface(); Surface();

2
libs/gui/tests/SurfaceTextureClient_test.cpp
View File

@ -112,7 +112,7 @@ protected:
}; };
TEST_F(SurfaceTextureClientTest, GetISurfaceTextureIsNotNull) { TEST_F(SurfaceTextureClientTest, GetISurfaceTextureIsNotNull) {
sp<IGraphicBufferProducer> ist(mSTC->getISurfaceTexture()); sp<IGraphicBufferProducer> ist(mSTC->getIGraphicBufferProducer());
ASSERT_TRUE(ist != NULL); ASSERT_TRUE(ist != NULL);
} }