xymp
/
TermApp
3
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

优化代码

Browse Source
serial
Matthew 1 year ago
parent bf5383fa10
commit 6742e6dcc0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

8
app/src/main/cpp/camera2/ndkcamera.cpp
Unescape Escape View File

@ -793,14 +793,14 @@ void NdkCamera::onImageAvailable(AImageReader* reader)
uint8_t aeMode = ACAMERA_CONTROL_AE_MODE_OFF; uint8_t aeMode = ACAMERA_CONTROL_AE_MODE_OFF;
camera_status_t status = ACaptureRequest_setEntry_u8(capture_request, ACAMERA_CONTROL_AE_MODE, 1, &aeMode); camera_status_t status = ACaptureRequest_setEntry_u8(capture_request, ACAMERA_CONTROL_AE_MODE, 1, &aeMode);
int32_t sensitivity = (avgY < 5) ? 2000 : (mResult.sensitibity * 60.0 / avgY); int32_t sensitivity = (avgY < 5) ? 2000 : (mResult.sensitivity * 60.0 / avgY);
status = ACaptureRequest_setEntry_i32(capture_request, ACAMERA_SENSOR_SENSITIVITY, 1, &sensitivity); status = ACaptureRequest_setEntry_i32(capture_request, ACAMERA_SENSOR_SENSITIVITY, 1, &sensitivity);
int64_t exposureTime = (avgY < 5) ? 200 * 1000000 : (mResult.exposureTime * 120.0 / avgY); int64_t exposureTime = (avgY < 5) ? 200 * 1000000 : (mResult.exposureTime * 120.0 / avgY);
status = ACaptureRequest_setEntry_i64(capture_request, ACAMERA_SENSOR_EXPOSURE_TIME, 1, &exposureTime); status = ACaptureRequest_setEntry_i64(capture_request, ACAMERA_SENSOR_EXPOSURE_TIME, 1, &exposureTime);
XYLOG(XYLOG_SEVERITY_WARNING, "YUV Light: %u EXPO:%lld => %lld ISO: %u => %u", (uint32_t)avgY, XYLOG(XYLOG_SEVERITY_WARNING, "YUV Light: %u EXPO:%lld => %lld ISO: %u => %u", (uint32_t)avgY,
mResult.exposureTime, exposureTime, mResult.sensitibity, sensitivity); mResult.exposureTime, exposureTime, mResult.sensitivity, sensitivity);
} }
AImage_delete(image); AImage_delete(image);
return; return;
@ -1097,7 +1097,7 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque
val = {0}; val = {0};
status = ACameraMetadata_getConstEntry(result, ACAMERA_SENSOR_SENSITIVITY, &val); status = ACameraMetadata_getConstEntry(result, ACAMERA_SENSOR_SENSITIVITY, &val);
mResult.sensitibity = *(val.data.i32); mResult.sensitivity = *(val.data.i32);
} }
if (afSupported && (m_params.autoFocus != 0)) if (afSupported && (m_params.autoFocus != 0))
@ -1218,7 +1218,7 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque
val = {0}; val = {0};
status = ACameraMetadata_getConstEntry(result, ACAMERA_SENSOR_SENSITIVITY, &val); status = ACameraMetadata_getConstEntry(result, ACAMERA_SENSOR_SENSITIVITY, &val);
mResult.sensitibity = *(val.data.i32); mResult.sensitivity = *(val.data.i32);
val = {0}; val = {0};
status = ACameraMetadata_getConstEntry(result, ACAMERA_CONTROL_SCENE_MODE, &val); status = ACameraMetadata_getConstEntry(result, ACAMERA_CONTROL_SCENE_MODE, &val);

2
app/src/main/cpp/camera2/ndkcamera.h
Unescape Escape View File

@ -91,7 +91,7 @@ public:
uint8_t awbState; uint8_t awbState;
int64_t exposureTime; int64_t exposureTime;
float FocusDistance; float FocusDistance;
int32_t sensitibity; int32_t sensitivity;
int32_t compensation; int32_t compensation;
uint8_t sceneMode; uint8_t sceneMode;
float zoomRatio; float zoomRatio;

Write Preview
Loading…
Cancel
Save