Rename ISurfaceTexture and SurfaceTexture

The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.

Bug 7736700

Change-Id: Ib65a7b0495d0bd405e1d487014ff21ca956b177a

5 files changed, 20 insertions, 20 deletions

diff --git a/test/CameraHal/camera_test_bufferqueue.h b/test/CameraHal/camera_test_bufferqueue.h
index a7a2ef5..2002447 100644
--- a/test/CameraHal/camera_test_bufferqueue.h
+++ b/test/CameraHal/camera_test_bufferqueue.h
@@ -4,7 +4,7 @@
 #ifdef ANDROID_API_JB_OR_LATER
 
 #include <gui/Surface.h>
-#include <gui/SurfaceTexture.h>
+#include <gui/GLConsumer.h>
 #include <gui/SurfaceComposerClient.h>
 
 #include "camera_test.h"
@@ -126,8 +126,8 @@ public:
     BQ_BufferSourceInput(int tex_id, sp<Camera> camera) :
                   BufferSourceInput(camera), mTexId(tex_id) {
         mBufferQueue = new BufferQueue(true, 1);
-        sp<ISurfaceTexture> surfaceTexture = mBufferQueue;
-        mWindowTapIn = new SurfaceTextureClient(surfaceTexture);
+        sp<IGraphicBufferProducer> bufferProducer = mBufferQueue;
+        mWindowTapIn = new SurfaceTextureClient(bufferProducer);
         mCamera->setBufferSource(mBufferQueue, NULL);
     }
     virtual ~BQ_BufferSourceInput() {
diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp
index 8d75710..877edb5 100644
--- a/test/CameraHal/camera_test_menu.cpp
+++ b/test/CameraHal/camera_test_menu.cpp
@@ -12,7 +12,7 @@
 
 #include <ui/DisplayInfo.h>
 
-#include <gui/SurfaceTexture.h>
+#include <gui/GLConsumer.h>
 #include <gui/SurfaceTextureClient.h>
 #include <ui/GraphicBuffer.h>
 
diff --git a/test/CameraHal/camera_test_surfacetexture.cpp b/test/CameraHal/camera_test_surfacetexture.cpp
index 5c52094..264afc4 100644
--- a/test/CameraHal/camera_test_surfacetexture.cpp
+++ b/test/CameraHal/camera_test_surfacetexture.cpp
@@ -10,7 +10,7 @@
 #include <climits>
 #include <math.h>
 
-#include <gui/SurfaceTexture.h>
+#include <gui/GLConsumer.h>
 #include <gui/SurfaceTextureClient.h>
 #include <ui/GraphicBuffer.h>
 #include <ui/GraphicBufferMapper.h>
@@ -494,14 +494,14 @@ void GLSurface::createProgram(const char* pVertexSource, const char* pFragmentSo
     *outPgm = program;
 }
 
-// SurfaceTexture specific
-sp<SurfaceTexture> SurfaceTextureBase::getST() {
+// GLConsumer specific
+sp<GLConsumer> SurfaceTextureBase::getST() {
      return mST;
 }
 
 void SurfaceTextureBase::initialize(int tex_id, EGLenum tex_target) {
     mTexId = tex_id;
-    mST = new SurfaceTexture(tex_id, true, tex_target);
+    mST = new GLConsumer(tex_id, true, tex_target);
     mSTC = new SurfaceTextureClient(mST);
     mANW = mSTC;
 }
@@ -525,7 +525,7 @@ void SurfaceTextureBase::getId(const char **name) {
     windowTapOut.clear();
 }
 
-// SurfaceTexture with GL specific
+// GLConsumer with GL specific
 
 void SurfaceTextureGL::initialize(int display, int tex_id) {
     GLSurface::initialize(display);
@@ -570,7 +570,7 @@ void SurfaceTextureGL::deinit() {
     GLSurface::deinit();
 }
 
-// drawTexture draws the SurfaceTexture over the entire GL viewport.
+// drawTexture draws the GLConsumer over the entire GL viewport.
 void SurfaceTextureGL::drawTexture() {
     const GLfloat triangleVertices[] = {
         -1.0f, 1.0f,
diff --git a/test/CameraHal/camera_test_surfacetexture.h b/test/CameraHal/camera_test_surfacetexture.h
index 395e82d..bc51454 100644
--- a/test/CameraHal/camera_test_surfacetexture.h
+++ b/test/CameraHal/camera_test_surfacetexture.h
@@ -5,7 +5,7 @@
 
 #ifdef ANDROID_API_JB_OR_LATER
 #include <gui/Surface.h>
-#include <gui/SurfaceTexture.h>
+#include <gui/GLConsumer.h>
 #include <gui/SurfaceComposerClient.h>
 #else
 #include <surfaceflinger/Surface.h>
@@ -31,7 +31,7 @@
 
 using namespace android;
 
-class FrameWaiter : public android::SurfaceTexture::FrameAvailableListener {
+class FrameWaiter : public android::GLConsumer::FrameAvailableListener {
 public:
     FrameWaiter():
             mPendingFrames(0) {
@@ -99,10 +99,10 @@ public:
     void deinit();
     void getId(const char **name);
 
-    virtual sp<SurfaceTexture> getST();
+    virtual sp<GLConsumer> getST();
 
 protected:
-    sp<SurfaceTexture> mST;
+    sp<GLConsumer> mST;
     sp<SurfaceTextureClient> mSTC;
     sp<ANativeWindow> mANW;
     int mTexId;
@@ -115,7 +115,7 @@ public:
     void initialize(int display, int tex_id);
     void deinit();
 
-    // drawTexture draws the SurfaceTexture over the entire GL viewport.
+    // drawTexture draws the GLConsumer over the entire GL viewport.
     void drawTexture();
 
 private:
@@ -192,7 +192,7 @@ public:
 
 private:
     SurfaceTextureBase *mSurfaceTextureBase;
-    sp<SurfaceTexture> mSurfaceTexture;
+    sp<GLConsumer> mSurfaceTexture;
     sp<FrameWaiter> mFW;
 };
 
@@ -201,7 +201,7 @@ public:
     ST_BufferSourceInput(int tex_id, sp<Camera> camera) :
                  BufferSourceInput(camera), mTexId(tex_id) {
         mSurfaceTexture = new SurfaceTextureBase();
-        sp<SurfaceTexture> surface_texture;
+        sp<GLConsumer> surface_texture;
         mSurfaceTexture->initialize(mTexId);
         surface_texture = mSurfaceTexture->getST();
         surface_texture->setSynchronousMode(true);
diff --git a/test/CameraHal/surfacetexture_test.cpp b/test/CameraHal/surfacetexture_test.cpp
index b25853e..fdec0ad 100644
--- a/test/CameraHal/surfacetexture_test.cpp
+++ b/test/CameraHal/surfacetexture_test.cpp
@@ -41,7 +41,7 @@
 #include <string.h>
 #include <climits>
 
-#include <gui/SurfaceTexture.h>
+#include <gui/GLConsumer.h>
 #include <gui/SurfaceTextureClient.h>
 #include <ui/GraphicBuffer.h>
 #include <ui/GraphicBufferMapper.h>
@@ -111,7 +111,7 @@ using namespace android;
 static void
 test_format (int format, int page_mode, int width, int height)
 {
-    sp<SurfaceTexture> st;
+    sp<GLConsumer> st;
     SurfaceTextureClient *stc;
     GLint tex_id = 0;
     sp<ANativeWindow> anw;
@@ -122,7 +122,7 @@ test_format (int format, int page_mode, int width, int height)
 
     printf("testing format %x, page_mode %d\n", format, page_mode);
 
-    st = new SurfaceTexture (tex_id, true, GL_TEXTURE_EXTERNAL_OES);
+    st = new GLConsumer (tex_id, true, GL_TEXTURE_EXTERNAL_OES);
 
     st->setDefaultBufferSize (width, height);