diff options
| author | Igor Murashkin <iam@google.com> | 2013-02-20 18:24:43 -0800 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2013-02-22 10:50:14 -0800 |
| commit | 985fd30a10f6fec4293f071fd258c4726cff5a3d (patch) | |
| tree | 493a26cd4544e2858822e8fbaf1ddc04fbd215d4 /camera/tests | |
| parent | 68506fd58d26748617babe94d5648503cb3690bb (diff) | |
| download | frameworks_av-985fd30a10f6fec4293f071fd258c4726cff5a3d.zip frameworks_av-985fd30a10f6fec4293f071fd258c4726cff5a3d.tar.gz frameworks_av-985fd30a10f6fec4293f071fd258c4726cff5a3d.tar.bz2 | |
Camera: ProCamera2Client - add createStream (service is stubbed) and unit test
Change-Id: I1ae7ba9b24f5883c214c19a7ed0eaf0c802d69c1
Diffstat (limited to 'camera/tests')
| -rw-r--r-- | camera/tests/ProCameraTests.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/camera/tests/ProCameraTests.cpp b/camera/tests/ProCameraTests.cpp index d632b7e..230e160 100644 --- a/camera/tests/ProCameraTests.cpp +++ b/camera/tests/ProCameraTests.cpp @@ -317,14 +317,12 @@ TEST_F(ProCameraTest, StreamingImage) { } sp<Surface> surface; - sp<ANativeWindow> window; if (mDisplaySecs > 0) { createOnScreenSurface(/*out*/surface); - window = surface; } int streamId = -1; EXPECT_OK(mCamera->createStream(/*width*/640, /*height*/480, TEST_FORMAT, - window, &streamId)); + surface, &streamId)); EXPECT_NE(-1, streamId); EXPECT_OK(mCamera->exclusiveTryLock()); @@ -351,8 +349,16 @@ TEST_F(ProCameraTest, StreamingImage) { uint32_t tag = static_cast<uint32_t>(ANDROID_REQUEST_OUTPUT_STREAMS); int find = find_camera_metadata_entry(request, tag, &entry); if (find == -ENOENT) { - ASSERT_OK(add_camera_metadata_entry(request, tag, &streamId, - /*data_count*/1)); + if (add_camera_metadata_entry(request, tag, &streamId, /*data_count*/1) + != OK) { + camera_metadata_t *tmp = allocate_camera_metadata(1000, 10000); + ASSERT_OK(append_camera_metadata(tmp, request)); + free_camera_metadata(request); + request = tmp; + + ASSERT_OK(add_camera_metadata_entry(request, tag, &streamId, + /*data_count*/1)); + } } else { ASSERT_OK(update_camera_metadata_entry(request, entry.index, &streamId, /*data_count*/1, &entry)); @@ -360,10 +366,8 @@ TEST_F(ProCameraTest, StreamingImage) { EXPECT_OK(mCamera->submitRequest(request, /*streaming*/true)); + dout << "will sleep now for " << mDisplaySecs << std::endl; sleep(mDisplaySecs); - //should the window be empty until the buffer is flipped? - // that would certainly make sense - free_camera_metadata(request); EXPECT_OK(mCamera->cancelStream(streamId)); |