diff options
| author | Mathias Agopian <mathias@google.com> | 2013-02-14 17:34:35 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2013-02-15 12:47:52 -0800 |
| commit | cc50111825fe5c8fd2a657b4a302a45fdca627e1 (patch) | |
| tree | f5d78a2b5427b169c5bea9e1562e3ed7a6dc31b7 /tests/camera2 | |
| parent | 7effe0ce84e234ece1fab8965ffef26acc672791 (diff) | |
| download | hardware_libhardware-cc50111825fe5c8fd2a657b4a302a45fdca627e1.zip hardware_libhardware-cc50111825fe5c8fd2a657b4a302a45fdca627e1.tar.gz hardware_libhardware-cc50111825fe5c8fd2a657b4a302a45fdca627e1.tar.bz2 | |
Refactoring: Rename SurfaceTextureClient to Surface
Change-Id: Iff197c557c06673a1ad85a9bbd36caa38efb88b7
Diffstat (limited to 'tests/camera2')
| -rw-r--r-- | tests/camera2/CameraFrameTests.cpp | 2 | ||||
| -rw-r--r-- | tests/camera2/CameraMetadataTests.cpp | 2 | ||||
| -rw-r--r-- | tests/camera2/CameraStreamFixture.h | 4 | ||||
| -rw-r--r-- | tests/camera2/camera2_utils.cpp | 2 | ||||
| -rw-r--r-- | tests/camera2/camera2_utils.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/tests/camera2/CameraFrameTests.cpp b/tests/camera2/CameraFrameTests.cpp index 13d1b17..2b5b546 100644 --- a/tests/camera2/CameraFrameTests.cpp +++ b/tests/camera2/CameraFrameTests.cpp @@ -27,7 +27,7 @@ #include "utils/StrongPointer.h" #include <gui/CpuConsumer.h> -#include <gui/SurfaceTextureClient.h> +#include <gui/Surface.h> #include <unistd.h> diff --git a/tests/camera2/CameraMetadataTests.cpp b/tests/camera2/CameraMetadataTests.cpp index d02d104..722e71e 100644 --- a/tests/camera2/CameraMetadataTests.cpp +++ b/tests/camera2/CameraMetadataTests.cpp @@ -29,7 +29,7 @@ #include "utils/StrongPointer.h" #include <gui/CpuConsumer.h> -#include <gui/SurfaceTextureClient.h> +#include <gui/Surface.h> #include <string> diff --git a/tests/camera2/CameraStreamFixture.h b/tests/camera2/CameraStreamFixture.h index 569b9d1..531d3c0 100644 --- a/tests/camera2/CameraStreamFixture.h +++ b/tests/camera2/CameraStreamFixture.h @@ -21,7 +21,7 @@ #include <iostream> #include <gui/CpuConsumer.h> -#include <gui/SurfaceTextureClient.h> +#include <gui/Surface.h> #include <utils/Condition.h> #include <utils/Mutex.h> @@ -142,7 +142,7 @@ protected: mCpuConsumer = new CpuConsumer(p.mHeapCount); mCpuConsumer->setName(String8("CameraStreamTest::mCpuConsumer")); - mNativeWindow = new SurfaceTextureClient( + mNativeWindow = new Surface( mCpuConsumer->getProducerInterface()); ASSERT_EQ(OK, diff --git a/tests/camera2/camera2_utils.cpp b/tests/camera2/camera2_utils.cpp index 501cd71..76a7233 100644 --- a/tests/camera2/camera2_utils.cpp +++ b/tests/camera2/camera2_utils.cpp @@ -322,7 +322,7 @@ StreamAdapter::StreamAdapter(sp<IGraphicBufferProducer> consumer): mId(-1), mWidth(0), mHeight(0), mFormat(0) { - mConsumerInterface = new SurfaceTextureClient(consumer); + mConsumerInterface = new Surface(consumer); camera2_stream_ops::dequeue_buffer = dequeue_buffer; camera2_stream_ops::enqueue_buffer = enqueue_buffer; camera2_stream_ops::cancel_buffer = cancel_buffer; diff --git a/tests/camera2/camera2_utils.h b/tests/camera2/camera2_utils.h index c846317..0cdf4a3 100644 --- a/tests/camera2/camera2_utils.h +++ b/tests/camera2/camera2_utils.h @@ -22,7 +22,7 @@ #include <system/camera_metadata.h> #include <hardware/camera2.h> -#include <gui/SurfaceTextureClient.h> +#include <gui/Surface.h> #include <gui/CpuConsumer.h> #include <utils/List.h> |