tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 2a512b49: Merge "Camera2 Test: check the right result metadata" into klp-dev

Browse source 
* commit '2a512b49e028b5714782ab69cba9662e01e25016':
  Camera2 Test: check the right result metadata
This commit is contained in:
Zhijun He 2013-09-13 13:20:09 -07:00 committed by Android Git Automerger
commit 8d24efb096
1 changed files with 84 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
tests/camera2/CameraMultiStreamTests.cpp
View file

@ -35,6 +35,7 @@
#define CAMERA_MULTI_STREAM_DEBUGGING 0 #define CAMERA_MULTI_STREAM_DEBUGGING 0
#define CAMERA_FRAME_TIMEOUT 1000000000LL // nsecs (1 secs) #define CAMERA_FRAME_TIMEOUT 1000000000LL // nsecs (1 secs)
#define PREVIEW_RENDERING_TIME_INTERVAL 200000 // in unit of us, 200ms #define PREVIEW_RENDERING_TIME_INTERVAL 200000 // in unit of us, 200ms
#define TOLERANCE_MARGIN 0.01 // 1% tolerance margin for exposure sanity check.
/* constants for display */ /* constants for display */
#define DISPLAY_BUFFER_HEIGHT 1024 #define DISPLAY_BUFFER_HEIGHT 1024
#define DISPLAY_BUFFER_WIDTH 1024 #define DISPLAY_BUFFER_WIDTH 1024
@ -269,7 +270,7 @@ public:
int previewStreamId, int previewStreamId,
int meteringStreamId, int meteringStreamId,
int captureStreamId) { int captureStreamId) {
int32_t requestId = 1; int32_t requestId = 0;
Vector<int32_t> previewStreamIds; Vector<int32_t> previewStreamIds;
previewStreamIds.push(previewStreamId); previewStreamIds.push(previewStreamId);
ASSERT_EQ(OK, mDevice->createDefaultRequest(CAMERA2_TEMPLATE_PREVIEW, ASSERT_EQ(OK, mDevice->createDefaultRequest(CAMERA2_TEMPLATE_PREVIEW,
@ -292,9 +293,6 @@ public:
ASSERT_EQ(OK, meteringRequest.update( ASSERT_EQ(OK, meteringRequest.update(
ANDROID_REQUEST_OUTPUT_STREAMS, ANDROID_REQUEST_OUTPUT_STREAMS,
meteringStreamIds)); meteringStreamIds));
ASSERT_EQ(OK, meteringRequest.update(
ANDROID_REQUEST_ID,
&requestId, 1));
ASSERT_EQ(OK, meteringRequest.update( ASSERT_EQ(OK, meteringRequest.update(
ANDROID_CONTROL_MODE, ANDROID_CONTROL_MODE,
&cmOff, 1)); &cmOff, 1));
@ -306,7 +304,6 @@ public:
&sharpOff, 1)); &sharpOff, 1));
// Create capture request, manual settings // Create capture request, manual settings
requestId++;
Vector<int32_t> captureStreamIds; Vector<int32_t> captureStreamIds;
captureStreamIds.push(captureStreamId); captureStreamIds.push(captureStreamId);
ASSERT_EQ(OK, mDevice->createDefaultRequest( ASSERT_EQ(OK, mDevice->createDefaultRequest(
@ -315,9 +312,6 @@ public:
ASSERT_EQ(OK, captureRequest.update( ASSERT_EQ(OK, captureRequest.update(
ANDROID_REQUEST_OUTPUT_STREAMS, ANDROID_REQUEST_OUTPUT_STREAMS,
captureStreamIds)); captureStreamIds));
ASSERT_EQ(OK, captureRequest.update(
ANDROID_REQUEST_ID,
&requestId, 1));
ASSERT_EQ(OK, captureRequest.update( ASSERT_EQ(OK, captureRequest.update(
ANDROID_CONTROL_MODE, ANDROID_CONTROL_MODE,
&cmOff, 1)); &cmOff, 1));
@ -345,21 +339,23 @@ public:
const Vector<int64_t>& exposures, const Vector<int64_t>& exposures,
const Vector<int32_t>& sensitivities, const Vector<int32_t>& sensitivities,
const sp<CameraStream>& stream, const sp<CameraStream>& stream,
int64_t minFrameDuration) { int64_t minFrameDuration,
int32_t* requestIdStart) {
ASSERT_EQ(OK, request.update(ANDROID_SENSOR_FRAME_DURATION, ASSERT_EQ(OK, request.update(ANDROID_SENSOR_FRAME_DURATION,
&minFrameDuration, 1)); &minFrameDuration, 1));
// Submit a series of requests with the specified exposure/gain values. // Submit a series of requests with the specified exposure/gain values.
int32_t targetRequestId = *requestIdStart;
for (size_t i = 0; i < requestCount; i++) { for (size_t i = 0; i < requestCount; i++) {
ASSERT_EQ(OK, request.update(ANDROID_SENSOR_EXPOSURE_TIME, ASSERT_EQ(OK, request.update(ANDROID_REQUEST_ID, requestIdStart, 1));
&exposures[i], 1)); ASSERT_EQ(OK, request.update(ANDROID_SENSOR_EXPOSURE_TIME, &exposures[i], 1));
ASSERT_EQ(OK, request.update(ANDROID_SENSOR_SENSITIVITY, ASSERT_EQ(OK, request.update(ANDROID_SENSOR_SENSITIVITY, &sensitivities[i], 1));
&sensitivities[i], 1));
ASSERT_EQ(OK, mDevice->capture(request)); ASSERT_EQ(OK, mDevice->capture(request));
ALOGV("Submitting capture %d with exposure %lld, sensitivity %d", ALOGV("Submitting request with: id %d with exposure %lld, sensitivity %d",
i, exposures[i], sensitivities[i]); *requestIdStart, exposures[i], sensitivities[i]);
if (CAMERA_MULTI_STREAM_DEBUGGING) { if (CAMERA_MULTI_STREAM_DEBUGGING) {
request.dump(STDOUT_FILENO); request.dump(STDOUT_FILENO);
} }
(*requestIdStart)++;
} }
// Get capture burst results. // Get capture burst results.
Vector<nsecs_t> captureBurstTimes; Vector<nsecs_t> captureBurstTimes;
@ -379,18 +375,34 @@ public:
waitLimit = exposures[i] * EXP_WAIT_MULTIPLIER; waitLimit = exposures[i] * EXP_WAIT_MULTIPLIER;
} }
ASSERT_EQ(OK, mDevice->waitForNextFrame(waitLimit));
CameraMetadata frameMetadata; CameraMetadata frameMetadata;
int32_t resultRequestId;
do {
ASSERT_EQ(OK, mDevice->waitForNextFrame(waitLimit));
ASSERT_EQ(OK, mDevice->getNextFrame(&frameMetadata)); ASSERT_EQ(OK, mDevice->getNextFrame(&frameMetadata));
camera_metadata_entry_t resultEntry = frameMetadata.find(ANDROID_REQUEST_ID);
ASSERT_EQ(1u, resultEntry.count);
resultRequestId = resultEntry.data.i32[0];
if (CAMERA_MULTI_STREAM_DEBUGGING) {
std::cout << "capture result req id: " << resultRequestId << std::endl;
}
} while (resultRequestId != targetRequestId);
targetRequestId++;
ALOGV("Got capture burst result for request %d", i); ALOGV("Got capture burst result for request %d", i);
// Validate capture result // Validate capture result
if (CAMERA_MULTI_STREAM_DEBUGGING) { if (CAMERA_MULTI_STREAM_DEBUGGING) {
frameMetadata.dump(STDOUT_FILENO); frameMetadata.dump(STDOUT_FILENO);
} }
// TODO: Need revisit it to figure out an accurate margin. // TODO: Need revisit it to figure out an accurate margin.
EXPECT_EQ(sensitivities[i], GetSensitivity(frameMetadata)); int64_t resultExposure = GetExposureValue(frameMetadata);
EXPECT_EQ(exposures[i], GetExposureValue(frameMetadata)); int32_t resultSensitivity = GetSensitivity(frameMetadata);
EXPECT_LE(sensitivities[i] * (1.0 - TOLERANCE_MARGIN), resultSensitivity);
EXPECT_GE(sensitivities[i] * (1.0 + TOLERANCE_MARGIN), resultSensitivity);
EXPECT_LE(exposures[i] * (1.0 - TOLERANCE_MARGIN), resultExposure);
EXPECT_GE(exposures[i] * (1.0 + TOLERANCE_MARGIN), resultExposure);
ASSERT_EQ(OK, listener->waitForFrame(waitLimit)); ASSERT_EQ(OK, listener->waitForFrame(waitLimit));
captureBurstTimes.push_back(systemTime()); captureBurstTimes.push_back(systemTime());
@ -625,6 +637,9 @@ TEST_F(CameraMultiStreamTest, MultiBurst) {
requestCount = exposures.size(); requestCount = exposures.size();
} }
// To maintain the request id uniqueness (preview request id is 0), make burst capture start
// request id 1 here.
int32_t requestIdStart = 1;
/** /**
* Submit metering request, set default frame duration to minimal possible * Submit metering request, set default frame duration to minimal possible
* value, we want the capture to run as fast as possible. HAL should adjust * value, we want the capture to run as fast as possible. HAL should adjust
@ -632,7 +647,7 @@ TEST_F(CameraMultiStreamTest, MultiBurst) {
* exposure value if exposure is larger than frame duration. * exposure value if exposure is larger than frame duration.
*/ */
CaptureBurst(meteringRequest, requestCount, exposures, sensitivities, CaptureBurst(meteringRequest, requestCount, exposures, sensitivities,
meteringStream, minFrameDuration); meteringStream, minFrameDuration, &requestIdStart);
/** /**
* Submit capture request, set default frame duration to minimal possible * Submit capture request, set default frame duration to minimal possible
@ -641,7 +656,7 @@ TEST_F(CameraMultiStreamTest, MultiBurst) {
* exposure value if exposure is larger than frame duration. * exposure value if exposure is larger than frame duration.
*/ */
CaptureBurst(captureRequest, requestCount, exposures, sensitivities, CaptureBurst(captureRequest, requestCount, exposures, sensitivities,
captureStream, minFrameDuration); captureStream, minFrameDuration, &requestIdStart);
ASSERT_EQ(OK, mDevice->clearStreamingRequest()); ASSERT_EQ(OK, mDevice->clearStreamingRequest());
} }