From eda79df3c7e683cb4b73a742d3716b81bb7e899a Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Tue, 18 Dec 2012 09:50:24 -0800 Subject: 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: I7fc8474c1d0d95658609b69cdb0af412d69a42c4 --- tests/camera2/camera2.cpp | 2 +- tests/camera2/camera2_utils.cpp | 2 +- tests/camera2/camera2_utils.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/camera2') diff --git a/tests/camera2/camera2.cpp b/tests/camera2/camera2.cpp index a15c5e6..75ec73f 100644 --- a/tests/camera2/camera2.cpp +++ b/tests/camera2/camera2.cpp @@ -214,7 +214,7 @@ class Camera2Test: public testing::Test { } - void setUpStream(sp consumer, + void setUpStream(sp consumer, int width, int height, int format, int *id) { status_t res; diff --git a/tests/camera2/camera2_utils.cpp b/tests/camera2/camera2_utils.cpp index 166ac52..501cd71 100644 --- a/tests/camera2/camera2_utils.cpp +++ b/tests/camera2/camera2_utils.cpp @@ -317,7 +317,7 @@ void NotifierListener::notify_callback_dispatch(int32_t msg_type, (type *)((char*)(ptr) - offsetof(type, member)) #endif -StreamAdapter::StreamAdapter(sp consumer): +StreamAdapter::StreamAdapter(sp consumer): mState(UNINITIALIZED), mDevice(NULL), mId(-1), mWidth(0), mHeight(0), mFormat(0) diff --git a/tests/camera2/camera2_utils.h b/tests/camera2/camera2_utils.h index 757044b..c846317 100644 --- a/tests/camera2/camera2_utils.h +++ b/tests/camera2/camera2_utils.h @@ -161,12 +161,12 @@ class NotifierListener { }; /** - * Adapter from an ISurfaceTexture interface to camera2 device stream ops. + * Adapter from an IGraphicBufferProducer interface to camera2 device stream ops. * Also takes care of allocating/deallocating stream in device interface */ class StreamAdapter: public camera2_stream_ops { public: - StreamAdapter(sp consumer); + StreamAdapter(sp consumer); ~StreamAdapter(); -- cgit v1.1