diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-06-09 15:23:34 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2015-06-09 15:23:34 -0700 |
| commit | cd6984e7623366a4f21eadecdd57fd8286ab5451 (patch) | |
| tree | f797b780f62e1f9046a52f10b7004aeefc90b783 /tests/camera2/CameraStreamFixture.h | |
| parent | c88122614c1593bc9384564b10f11bd7bb7e3b64 (diff) | |
| download | hardware_libhardware-cd6984e7623366a4f21eadecdd57fd8286ab5451.zip hardware_libhardware-cd6984e7623366a4f21eadecdd57fd8286ab5451.tar.gz hardware_libhardware-cd6984e7623366a4f21eadecdd57fd8286ab5451.tar.bz2 | |
Camera2 tests: Update for framework changes
Change-Id: I9ac788cfe9a001ef33bdc52a9e8ba0bdcf3ded2c
Diffstat (limited to 'tests/camera2/CameraStreamFixture.h')
| -rw-r--r-- | tests/camera2/CameraStreamFixture.h | 8 |
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: |