diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/gui/BufferItemConsumer.h | 2 | ||||
| -rw-r--r-- | include/gui/BufferQueue.h | 14 | ||||
| -rw-r--r-- | include/gui/ConsumerBase.h | 4 | ||||
| -rw-r--r-- | include/gui/CpuConsumer.h | 2 | ||||
| -rw-r--r-- | include/gui/DummyConsumer.h | 4 | ||||
| -rw-r--r-- | include/gui/GLConsumer.h (renamed from include/gui/SurfaceTexture.h) | 64 | ||||
| -rw-r--r-- | include/gui/IGraphicBufferProducer.h (renamed from include/gui/ISurfaceTexture.h) | 43 | ||||
| -rw-r--r-- | include/gui/ISurface.h | 4 | ||||
| -rw-r--r-- | include/gui/ISurfaceComposer.h | 4 | ||||
| -rw-r--r-- | include/gui/Surface.h | 8 | ||||
| -rw-r--r-- | include/gui/SurfaceComposerClient.h | 4 | ||||
| -rw-r--r-- | include/gui/SurfaceTextureClient.h | 19 | ||||
| -rw-r--r-- | include/private/gui/LayerState.h | 2 |
13 files changed, 87 insertions, 87 deletions
diff --git a/include/gui/BufferItemConsumer.h b/include/gui/BufferItemConsumer.h index cd4df25..0840891 100644 --- a/include/gui/BufferItemConsumer.h +++ b/include/gui/BufferItemConsumer.h @@ -82,7 +82,7 @@ class BufferItemConsumer: public ConsumerBase status_t releaseBuffer(const BufferItem &item, const sp<Fence>& releaseFence = Fence::NO_FENCE); - sp<ISurfaceTexture> getProducerInterface() const { return getBufferQueue(); } + sp<IGraphicBufferProducer> getProducerInterface() const { return getBufferQueue(); } }; diff --git a/include/gui/BufferQueue.h b/include/gui/BufferQueue.h index 88bcd8f..c59e00e 100644 --- a/include/gui/BufferQueue.h +++ b/include/gui/BufferQueue.h @@ -21,7 +21,7 @@ #include <EGL/eglext.h> #include <gui/IGraphicBufferAlloc.h> -#include <gui/ISurfaceTexture.h> +#include <gui/IGraphicBufferProducer.h> #include <ui/Fence.h> #include <ui/GraphicBuffer.h> @@ -33,7 +33,7 @@ namespace android { // ---------------------------------------------------------------------------- -class BufferQueue : public BnSurfaceTexture { +class BufferQueue : public BnGraphicBufferProducer { public: enum { MIN_UNDEQUEUED_BUFFERS = 2 }; enum { NUM_BUFFER_SLOTS = 32 }; @@ -149,7 +149,7 @@ public: virtual status_t setSynchronousMode(bool enabled); // connect attempts to connect a producer client API to the BufferQueue. - // This must be called before any other ISurfaceTexture methods are called + // This must be called before any other IGraphicBufferProducer methods are called // except for getAllocator. // // This method will fail if the connect was previously called on the @@ -158,7 +158,7 @@ public: // disconnect attempts to disconnect a producer client API from the // BufferQueue. Calling this method will cause any subsequent calls to other - // ISurfaceTexture methods to fail except for getAllocator and connect. + // IGraphicBufferProducer methods to fail except for getAllocator and connect. // Successfully calling connect after this will allow the other methods to // succeed again. // @@ -265,7 +265,7 @@ public: // producer is connected to the BufferQueue. status_t setMaxAcquiredBufferCount(int maxAcquiredBuffers); - // isSynchronousMode returns whether the SurfaceTexture is currently in + // isSynchronousMode returns whether the BufferQueue is currently in // synchronous mode. bool isSynchronousMode() const; @@ -506,10 +506,10 @@ private: Fifo mQueue; // mAbandoned indicates that the BufferQueue will no longer be used to - // consume images buffers pushed to it using the ISurfaceTexture interface. + // consume images buffers pushed to it using the IGraphicBufferProducer interface. // It is initialized to false, and set to true in the abandon method. A // BufferQueue that has been abandoned will return the NO_INIT error from - // all ISurfaceTexture methods capable of returning an error. + // all IGraphicBufferProducer methods capable of returning an error. bool mAbandoned; // mName is a string used to identify the BufferQueue in log messages. diff --git a/include/gui/ConsumerBase.h b/include/gui/ConsumerBase.h index 5ae5a19..49a764f 100644 --- a/include/gui/ConsumerBase.h +++ b/include/gui/ConsumerBase.h @@ -53,7 +53,7 @@ public: // abandon frees all the buffers and puts the ConsumerBase into the // 'abandoned' state. Once put in this state the ConsumerBase can never // leave it. When in the 'abandoned' state, all methods of the - // ISurfaceTexture interface will fail with the NO_INIT error. + // IGraphicBufferProducer interface will fail with the NO_INIT error. // // Note that while calling this method causes all the buffers to be freed // from the perspective of the the ConsumerBase, if there are additional @@ -186,7 +186,7 @@ protected: Slot mSlots[BufferQueue::NUM_BUFFER_SLOTS]; // mAbandoned indicates that the BufferQueue will no longer be used to - // consume images buffers pushed to it using the ISurfaceTexture + // consume images buffers pushed to it using the IGraphicBufferProducer // interface. It is initialized to false, and set to true in the abandon // method. A BufferQueue that has been abandoned will return the NO_INIT // error from all IConsumerBase methods capable of returning an error. diff --git a/include/gui/CpuConsumer.h b/include/gui/CpuConsumer.h index 807a4b5..a08c718 100644 --- a/include/gui/CpuConsumer.h +++ b/include/gui/CpuConsumer.h @@ -82,7 +82,7 @@ class CpuConsumer: public ConsumerBase // lockNextBuffer. status_t unlockBuffer(const LockedBuffer &nativeBuffer); - sp<ISurfaceTexture> getProducerInterface() const { return getBufferQueue(); } + sp<IGraphicBufferProducer> getProducerInterface() const { return getBufferQueue(); } private: // Maximum number of buffers that can be locked at a time diff --git a/include/gui/DummyConsumer.h b/include/gui/DummyConsumer.h index 7fe4d40..08e8ec8 100644 --- a/include/gui/DummyConsumer.h +++ b/include/gui/DummyConsumer.h @@ -24,7 +24,7 @@ namespace android { // The DummyConsumer does not keep a reference to BufferQueue -// unlike SurfaceTexture. This prevents a circular reference from +// unlike GLConsumer. This prevents a circular reference from // forming without having to use a ProxyConsumerListener class DummyConsumer : public BufferQueue::ConsumerListener { public: @@ -33,7 +33,7 @@ public: protected: // Implementation of the BufferQueue::ConsumerListener interface. These - // calls are used to notify the SurfaceTexture of asynchronous events in the + // calls are used to notify the GLConsumer of asynchronous events in the // BufferQueue. virtual void onFrameAvailable(); virtual void onBuffersReleased(); diff --git a/include/gui/SurfaceTexture.h b/include/gui/GLConsumer.h index 50efb73..e0fa893 100644 --- a/include/gui/SurfaceTexture.h +++ b/include/gui/GLConsumer.h @@ -14,15 +14,15 @@ * limitations under the License. */ -#ifndef ANDROID_GUI_SURFACETEXTURE_H -#define ANDROID_GUI_SURFACETEXTURE_H +#ifndef ANDROID_GUI_CONSUMER_H +#define ANDROID_GUI_CONSUMER_H #include <EGL/egl.h> #include <EGL/eglext.h> #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> -#include <gui/ISurfaceTexture.h> +#include <gui/IGraphicBufferProducer.h> #include <gui/BufferQueue.h> #include <gui/ConsumerBase.h> @@ -43,10 +43,10 @@ namespace android { class String8; /* - * SurfaceTexture consumes buffers of graphics data from a BufferQueue, + * GLConsumer consumes buffers of graphics data from a BufferQueue, * and makes them available to OpenGL as a texture. * - * A typical usage pattern is to set up the SurfaceTexture with the + * A typical usage pattern is to set up the GLConsumer with the * desired options, and call updateTexImage() when a new frame is desired. * If a new frame is available, the texture will be updated. If not, * the previous contents are retained. @@ -55,13 +55,13 @@ class String8; * texture target, in the EGL context of the first thread that calls * updateTexImage(). * - * TODO: rename to GLConsumer (OpenGLConsumer?) + * This class was previously called SurfaceTexture. */ -class SurfaceTexture : public ConsumerBase { +class GLConsumer : public ConsumerBase { public: typedef ConsumerBase::FrameAvailableListener FrameAvailableListener; - // SurfaceTexture constructs a new SurfaceTexture object. tex indicates the + // GLConsumer constructs a new GLConsumer object. tex indicates the // name of the OpenGL ES texture to which images are to be streamed. // allowSynchronousMode specifies whether or not synchronous mode can be // enabled. texTarget specifies the OpenGL ES texture target to which the @@ -71,7 +71,7 @@ public: // if behavior for queue/dequeue/connect etc needs to be customized. // Otherwise a default BufferQueue will be created and used. // - // For legacy reasons, the SurfaceTexture is created in a state where it is + // For legacy reasons, the GLConsumer is created in a state where it is // considered attached to an OpenGL ES context for the purposes of the // attachToContext and detachFromContext methods. However, despite being // considered "attached" to a context, the specific OpenGL ES context @@ -79,13 +79,13 @@ public: // point, all calls to updateTexImage must be made with the same OpenGL ES // context current. // - // A SurfaceTexture may be detached from one OpenGL ES context and then + // A GLConsumer may be detached from one OpenGL ES context and then // attached to a different context using the detachFromContext and // attachToContext methods, respectively. The intention of these methods is - // purely to allow a SurfaceTexture to be transferred from one consumer + // purely to allow a GLConsumer to be transferred from one consumer // context to another. If such a transfer is not needed there is no // requirement that either of these methods be called. - SurfaceTexture(GLuint tex, bool allowSynchronousMode = true, + GLConsumer(GLuint tex, bool allowSynchronousMode = true, GLenum texTarget = GL_TEXTURE_EXTERNAL_OES, bool useFenceSync = true, const sp<BufferQueue> &bufferQueue = 0); @@ -102,7 +102,7 @@ public: // current buffer is no longer being read. This fence will be returned to // the producer when the current buffer is released by updateTexImage(). // Multiple fences can be set for a given buffer; they will be merged into - // a single union fence. The SurfaceTexture will close the file descriptor + // a single union fence. The GLConsumer will close the file descriptor // when finished with it. void setReleaseFence(int fenceFd); @@ -122,7 +122,7 @@ public: // // This transform is necessary to compensate for transforms that the stream // content producer may implicitly apply to the content. By forcing users of - // a SurfaceTexture to apply this transform we avoid performing an extra + // a GLConsumer to apply this transform we avoid performing an extra // copy of the data that would be needed to hide the transform from the // user. // @@ -178,11 +178,11 @@ public: // current texture buffer. status_t doGLFenceWait() const; - // isSynchronousMode returns whether the SurfaceTexture is currently in + // isSynchronousMode returns whether the GLConsumer is currently in // synchronous mode. bool isSynchronousMode() const; - // set the name of the SurfaceTexture that will be used to identify it in + // set the name of the GLConsumer that will be used to identify it in // log messages. void setName(const String8& name); @@ -194,29 +194,29 @@ public: virtual status_t setSynchronousMode(bool enabled); // getBufferQueue returns the BufferQueue object to which this - // SurfaceTexture is connected. + // GLConsumer is connected. sp<BufferQueue> getBufferQueue() const { return mBufferQueue; } - // detachFromContext detaches the SurfaceTexture from the calling thread's + // detachFromContext detaches the GLConsumer from the calling thread's // current OpenGL ES context. This context must be the same as the context // that was current for previous calls to updateTexImage. // - // Detaching a SurfaceTexture from an OpenGL ES context will result in the + // Detaching a GLConsumer from an OpenGL ES context will result in the // deletion of the OpenGL ES texture object into which the images were being - // streamed. After a SurfaceTexture has been detached from the OpenGL ES + // streamed. After a GLConsumer has been detached from the OpenGL ES // context calls to updateTexImage will fail returning INVALID_OPERATION - // until the SurfaceTexture is attached to a new OpenGL ES context using the + // until the GLConsumer is attached to a new OpenGL ES context using the // attachToContext method. status_t detachFromContext(); - // attachToContext attaches a SurfaceTexture that is currently in the - // 'detached' state to the current OpenGL ES context. A SurfaceTexture is + // attachToContext attaches a GLConsumer that is currently in the + // 'detached' state to the current OpenGL ES context. A GLConsumer is // in the 'detached' state iff detachFromContext has successfully been // called and no calls to attachToContext have succeeded since the last // detachFromContext call. Calls to attachToContext made on a - // SurfaceTexture that is not in the 'detached' state will result in an + // GLConsumer that is not in the 'detached' state will result in an // INVALID_OPERATION error. // // The tex argument specifies the OpenGL ES texture object name in the @@ -232,7 +232,7 @@ protected: // mCurrentTextureBuf in addition to the ConsumerBase behavior. virtual void abandonLocked(); - // dumpLocked overrides the ConsumerBase method to dump SurfaceTexture- + // dumpLocked overrides the ConsumerBase method to dump GLConsumer- // specific info in addition to the ConsumerBase behavior. virtual void dumpLocked(String8& result, const char* prefix, char* buffer, size_t size) const; @@ -268,7 +268,7 @@ protected: // values. status_t checkAndUpdateEglStateLocked(); - // If set, SurfaceTexture will use the EGL_ANDROID_native_fence_sync + // If set, GLConsumer will use the EGL_ANDROID_native_fence_sync // extension to create Android native fences for GLES activity. static const bool sUseNativeFenceSync; @@ -308,9 +308,9 @@ private: // binding the buffer without touching the EglSlots. status_t bindUnslottedBufferLocked(EGLDisplay dpy); - // The default consumer usage flags that SurfaceTexture always sets on its + // The default consumer usage flags that GLConsumer always sets on its // BufferQueue instance; these will be OR:d with any additional flags passed - // from the SurfaceTexture user. In particular, SurfaceTexture will always + // from the GLConsumer user. In particular, GLConsumer will always // consume buffers as hardware textures. static const uint32_t DEFAULT_USAGE_FLAGS = GraphicBuffer::USAGE_HW_TEXTURE; @@ -371,7 +371,7 @@ private: const GLenum mTexTarget; // EGLSlot contains the information and object references that - // SurfaceTexture maintains about a BufferQueue buffer slot. + // GLConsumer maintains about a BufferQueue buffer slot. struct EglSlot { EglSlot() : mEglImage(EGL_NO_IMAGE_KHR), @@ -388,13 +388,13 @@ private: EGLSyncKHR mEglFence; }; - // mEglDisplay is the EGLDisplay with which this SurfaceTexture is currently + // mEglDisplay is the EGLDisplay with which this GLConsumer is currently // associated. It is intialized to EGL_NO_DISPLAY and gets set to the // current display when updateTexImage is called for the first time and when // attachToContext is called. EGLDisplay mEglDisplay; - // mEglContext is the OpenGL ES context with which this SurfaceTexture is + // mEglContext is the OpenGL ES context with which this GLConsumer is // currently associated. It is initialized to EGL_NO_CONTEXT and gets set // to the current GL context when updateTexImage is called for the first // time and when attachToContext is called. @@ -429,4 +429,4 @@ private: // ---------------------------------------------------------------------------- }; // namespace android -#endif // ANDROID_GUI_SURFACETEXTURE_H +#endif // ANDROID_GUI_CONSUMER_H diff --git a/include/gui/ISurfaceTexture.h b/include/gui/IGraphicBufferProducer.h index 58345a0..3b61229 100644 --- a/include/gui/ISurfaceTexture.h +++ b/include/gui/IGraphicBufferProducer.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ANDROID_GUI_ISURFACETEXTURE_H -#define ANDROID_GUI_ISURFACETEXTURE_H +#ifndef ANDROID_GUI_IGRAPHICBUFFERPRODUCER_H +#define ANDROID_GUI_IGRAPHICBUFFERPRODUCER_H #include <stdint.h> #include <sys/types.h> @@ -44,16 +44,15 @@ class SurfaceTextureClient; * producer calls dequeueBuffer() to get an empty buffer, fills it with * data, then calls queueBuffer() to make it available to the consumer. * - * The BnSurfaceTexture and BpSurfaceTexture classes provide the Binder - * IPC implementation. + * The BnGraphicBufferProducer and BpGraphicBufferProducer classes provide + * the Binder IPC implementation. * - * TODO: rename to IGraphicBufferProducer (IBufferProducer? - * IBufferQueueProducer?) + * This class was previously called ISurfaceTexture. */ -class ISurfaceTexture : public IInterface +class IGraphicBufferProducer : public IInterface { public: - DECLARE_META_INTERFACE(SurfaceTexture); + DECLARE_META_INTERFACE(GraphicBufferProducer); enum { BUFFER_NEEDS_REALLOCATION = 0x1, @@ -61,8 +60,8 @@ public: }; // requestBuffer requests a new buffer for the given index. The server (i.e. - // the ISurfaceTexture implementation) assigns the newly created buffer to - // the given slot index, and the client is expected to mirror the + // the IGraphicBufferProducer implementation) assigns the newly created + // buffer to the given slot index, and the client is expected to mirror the // slot->buffer mapping so that it's not necessary to transfer a // GraphicBuffer for every dequeue operation. virtual status_t requestBuffer(int slot, sp<GraphicBuffer>* buf) = 0; @@ -180,32 +179,32 @@ public: // The default mode is asynchronous. virtual status_t setSynchronousMode(bool enabled) = 0; - // connect attempts to connect a client API to the SurfaceTexture. This - // must be called before any other ISurfaceTexture methods are called except - // for getAllocator. + // connect attempts to connect a client API to the IGraphicBufferProducer. + // This must be called before any other IGraphicBufferProducer methods are + // called except for getAllocator. // // This method will fail if the connect was previously called on the - // SurfaceTexture and no corresponding disconnect call was made. + // IGraphicBufferProducer and no corresponding disconnect call was made. // // outWidth, outHeight and outTransform are filled with the default width // and height of the window and current transform applied to buffers, // respectively. virtual status_t connect(int api, QueueBufferOutput* output) = 0; - // disconnect attempts to disconnect a client API from the SurfaceTexture. - // Calling this method will cause any subsequent calls to other - // ISurfaceTexture methods to fail except for getAllocator and connect. - // Successfully calling connect after this will allow the other methods to - // succeed again. + // disconnect attempts to disconnect a client API from the + // IGraphicBufferProducer. Calling this method will cause any subsequent + // calls to other IGraphicBufferProducer methods to fail except for + // getAllocator and connect. Successfully calling connect after this will + // allow the other methods to succeed again. // - // This method will fail if the the SurfaceTexture is not currently + // This method will fail if the the IGraphicBufferProducer is not currently // connected to the specified client API. virtual status_t disconnect(int api) = 0; }; // ---------------------------------------------------------------------------- -class BnSurfaceTexture : public BnInterface<ISurfaceTexture> +class BnGraphicBufferProducer : public BnInterface<IGraphicBufferProducer> { public: virtual status_t onTransact( uint32_t code, @@ -217,4 +216,4 @@ public: // ---------------------------------------------------------------------------- }; // namespace android -#endif // ANDROID_GUI_ISURFACETEXTURE_H +#endif // ANDROID_GUI_IGRAPHICBUFFERPRODUCER_H diff --git a/include/gui/ISurface.h b/include/gui/ISurface.h index c0ff9fc..ce6e715 100644 --- a/include/gui/ISurface.h +++ b/include/gui/ISurface.h @@ -31,7 +31,7 @@ namespace android { typedef int32_t SurfaceID; -class ISurfaceTexture; +class IGraphicBufferProducer; class ISurface : public IInterface { @@ -43,7 +43,7 @@ protected: public: DECLARE_META_INTERFACE(Surface); - virtual sp<ISurfaceTexture> getSurfaceTexture() const = 0; + virtual sp<IGraphicBufferProducer> getSurfaceTexture() const = 0; }; // ---------------------------------------------------------------------------- diff --git a/include/gui/ISurfaceComposer.h b/include/gui/ISurfaceComposer.h index 6500ad5..50b2ad1 100644 --- a/include/gui/ISurfaceComposer.h +++ b/include/gui/ISurfaceComposer.h @@ -86,10 +86,10 @@ public: */ virtual void bootFinished() = 0; - /* verify that an ISurfaceTexture was created by SurfaceFlinger. + /* verify that an IGraphicBufferProducer was created by SurfaceFlinger. */ virtual bool authenticateSurfaceTexture( - const sp<ISurfaceTexture>& surface) const = 0; + const sp<IGraphicBufferProducer>& surface) const = 0; /* Capture the specified screen. requires READ_FRAME_BUFFER permission * This function will fail if there is a secure window on screen. diff --git a/include/gui/Surface.h b/include/gui/Surface.h index f3455b5..cba11b8 100644 --- a/include/gui/Surface.h +++ b/include/gui/Surface.h @@ -37,7 +37,7 @@ namespace android { // --------------------------------------------------------------------------- -class ISurfaceTexture; +class IGraphicBufferProducer; class Surface; class SurfaceComposerClient; @@ -126,7 +126,7 @@ public: uint32_t reserved[2]; }; - explicit Surface(const sp<ISurfaceTexture>& st); + explicit Surface(const sp<IGraphicBufferProducer>& bp); static status_t writeToParcel(const sp<Surface>& control, Parcel* parcel); @@ -137,7 +137,7 @@ public: bool isValid(); uint32_t getIdentity() const { return mIdentity; } - sp<ISurfaceTexture> getSurfaceTexture(); + sp<IGraphicBufferProducer> getSurfaceTexture(); // TODO: rename this // the lock/unlock APIs must be used from the same thread status_t lock(SurfaceInfo* info, Region* dirty = NULL); @@ -161,7 +161,7 @@ private: /* * private stuff... */ - void init(const sp<ISurfaceTexture>& surfaceTexture); + void init(const sp<IGraphicBufferProducer>& bufferProducer); static void cleanCachedSurfacesLocked(); diff --git a/include/gui/SurfaceComposerClient.h b/include/gui/SurfaceComposerClient.h index ae5d69a..22e6b14 100644 --- a/include/gui/SurfaceComposerClient.h +++ b/include/gui/SurfaceComposerClient.h @@ -39,7 +39,7 @@ class DisplayInfo; class Composer; class IMemoryHeap; class ISurfaceComposerClient; -class ISurfaceTexture; +class IGraphicBufferProducer; class Region; // --------------------------------------------------------------------------- @@ -122,7 +122,7 @@ public: status_t destroySurface(SurfaceID sid); static void setDisplaySurface(const sp<IBinder>& token, - const sp<ISurfaceTexture>& surface); + const sp<IGraphicBufferProducer>& bufferProducer); static void setDisplayLayerStack(const sp<IBinder>& token, uint32_t layerStack); diff --git a/include/gui/SurfaceTextureClient.h b/include/gui/SurfaceTextureClient.h index a582975..bce2329 100644 --- a/include/gui/SurfaceTextureClient.h +++ b/include/gui/SurfaceTextureClient.h @@ -17,8 +17,8 @@ #ifndef ANDROID_GUI_SURFACETEXTURECLIENT_H #define ANDROID_GUI_SURFACETEXTURECLIENT_H -#include <gui/ISurfaceTexture.h> -#include <gui/SurfaceTexture.h> +#include <gui/IGraphicBufferProducer.h> +#include <gui/GLConsumer.h> #include <gui/BufferQueue.h> #include <ui/ANativeObjectBase.h> @@ -44,7 +44,7 @@ class Surface; * compositing. For example, a video decoder could render a frame and call * eglSwapBuffers(), which invokes ANativeWindow callbacks defined by * SurfaceTextureClient. STC then acts as the BufferQueue producer, - * providing the new frame to a consumer such as SurfaceTexture. + * providing the new frame to a consumer such as GLConsumer. * * TODO: rename to Surface. The existing Surface class wraps STC with * some Binder goodies, which most users of Surface class don't care about. @@ -54,14 +54,14 @@ class SurfaceTextureClient { public: - SurfaceTextureClient(const sp<ISurfaceTexture>& surfaceTexture); + SurfaceTextureClient(const sp<IGraphicBufferProducer>& bufferProducer); - sp<ISurfaceTexture> getISurfaceTexture() const; + sp<IGraphicBufferProducer> getISurfaceTexture() const; // TODO: rename protected: SurfaceTextureClient(); virtual ~SurfaceTextureClient(); - void setISurfaceTexture(const sp<ISurfaceTexture>& surfaceTexture); + void setISurfaceTexture(const sp<IGraphicBufferProducer>& bufferProducer); private: // can't be copied @@ -144,11 +144,12 @@ private: // mSurfaceTexture is the interface to the surface texture server. All // operations on the surface texture client ultimately translate into // interactions with the server using this interface. - sp<ISurfaceTexture> mSurfaceTexture; + // TODO: rename to mBufferProducer + sp<IGraphicBufferProducer> mSurfaceTexture; // mSlots stores the buffers that have been allocated for each buffer slot. // It is initialized to null pointers, and gets filled in with the result of - // ISurfaceTexture::requestBuffer when the client dequeues a buffer from a + // IGraphicBufferProducer::requestBuffer when the client dequeues a buffer from a // slot that has not yet been used. The buffer allocated to a slot will also // be replaced if the requested buffer usage or geometry differs from that // of the buffer allocated to a slot. @@ -214,7 +215,7 @@ private: mutable bool mConsumerRunningBehind; // mMutex is the mutex used to prevent concurrent access to the member - // variables of SurfaceTexture objects. It must be locked whenever the + // variables of SurfaceTextureClient objects. It must be locked whenever the // member variables are accessed. mutable Mutex mMutex; diff --git a/include/private/gui/LayerState.h b/include/private/gui/LayerState.h index a7eb48c..5b400ca 100644 --- a/include/private/gui/LayerState.h +++ b/include/private/gui/LayerState.h @@ -114,7 +114,7 @@ struct DisplayState { uint32_t what; sp<IBinder> token; - sp<ISurfaceTexture> surface; + sp<IGraphicBufferProducer> surface; uint32_t layerStack; uint32_t orientation; Rect viewport; |