summaryrefslogtreecommitdiffstats
path: root/tests/camera2/CameraStreamFixture.h
diff options
context:
space:
mode:
Diffstat (limited to 'tests/camera2/CameraStreamFixture.h')
-rw-r--r--tests/camera2/CameraStreamFixture.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/camera2/CameraStreamFixture.h b/tests/camera2/CameraStreamFixture.h
index e234f7e..fc5fb36 100644
--- a/tests/camera2/CameraStreamFixture.h
+++ b/tests/camera2/CameraStreamFixture.h
@@ -131,7 +131,7 @@ private:
CameraModuleFixture::TearDown();
deleteOutputResolutions();
- mNativeWindow.clear();
+ mSurface.clear();
mCpuConsumer.clear();
mFrameListener.clear();
}
@@ -250,12 +250,12 @@ protected:
mCpuConsumer = new CpuConsumer(consumer, p.mHeapCount);
mCpuConsumer->setName(String8("CameraStreamTest::mCpuConsumer"));
- mNativeWindow = new Surface(producer);
+ mSurface = new Surface(producer);
int format = MapAutoFormat(p.mFormat);
ASSERT_EQ(OK,
- device->createStream(mNativeWindow,
+ device->createStream(mSurface,
mWidth, mHeight, format,
HAL_DATASPACE_UNKNOWN,
CAMERA3_STREAM_ROTATION_0,
@@ -364,7 +364,7 @@ protected:
android::sp<FrameListener> mFrameListener;
android::sp<CpuConsumer> mCpuConsumer;
- android::sp<ANativeWindow> mNativeWindow;
+ android::sp<Surface> mSurface;
KeyedVector<int32_t, Vector<int32_t>* > mOutputResolutions;
private: