diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 27de01f1..f8a2578d 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -1563,6 +1563,7 @@ bool CPhoneDevice::onBurstCapture(std::shared_ptr characteristi media_status_t mstatus; std::string cameraInfo; + if (photoInfo.usingRawFormat != 0) { // @@ -1596,25 +1597,6 @@ bool CPhoneDevice::onBurstCapture(std::shared_ptr characteristi std::shared_ptr result = results[0]; std::shared_ptr frame = frames[0]; - if (photoInfo.outputDbgInfo != 0) - { - NdkCamera::CAPTURE_RESULT captureResult = { 0 }; - NdkCamera::EnumCameraResult(result.get(), captureResult); - - char extimeunit[4] = { 0 }; - unsigned int extime = (captureResult.exposureTime >= 1000000) ? ((unsigned int)(captureResult.exposureTime / 1000000)) : ((unsigned int)(captureResult.exposureTime / 1000)); - strcpy(extimeunit, (captureResult.exposureTime >= 1000000) ? "ms" : "μs"); - char str[128] = { 0 }; - snprintf(str, sizeof(str), "AE=%u AF=%u EXPS=%u%s(%d) ISO=%d AFS=%u AES=%u AWBS=%u SCENE=%d LDR=%d(%u) %0.1fx T=%u FD=%lld", - captureResult.autoExposure, captureResult.autoFocus, - extime, extimeunit, captureResult.compensation, captureResult.sensitivity, - // isnan(captureResult.FocusDistance) ? 0 : captureResult.FocusDistance, - (unsigned int)captureResult.afState, (unsigned int)captureResult.aeState, captureResult.awbState, - captureResult.sceneMode, GpioControl::getLightAdc(), ldr, captureResult.zoomRatio, - (uint32_t)captureResult.duration, captureResult.frameDuration); - cameraInfo = str; - } - int32_t format; mstatus = AImage_getFormat(frame.get(), &format); @@ -1693,11 +1675,6 @@ bool CPhoneDevice::onBurstCapture(std::shared_ptr characteristi delete[] nv21; } - - if (photoInfo.outputDbgInfo != 0) - { - - } } } } @@ -1710,6 +1687,28 @@ bool CPhoneDevice::onBurstCapture(std::shared_ptr characteristi closeThread.detach(); } + if (photoInfo.outputDbgInfo != 0) + { + if (!results.empty()) + { + NdkCamera::CAPTURE_RESULT captureResult = { 0 }; + NdkCamera::EnumCameraResult(results[0].get(), captureResult); + + char extimeunit[4] = { 0 }; + unsigned int extime = (captureResult.exposureTime >= 1000000) ? ((unsigned int)(captureResult.exposureTime / 1000000)) : ((unsigned int)(captureResult.exposureTime / 1000)); + strcpy(extimeunit, (captureResult.exposureTime >= 1000000) ? "ms" : "μs"); + char str[128] = { 0 }; + snprintf(str, sizeof(str), "AE=%u AF=%u EXPS=%u%s(%d) ISO=%d AFS=%u AES=%u AWBS=%u SCENE=%d LDR=%d(%u) %0.1fx T=%u FD=%lld", + captureResult.autoExposure, captureResult.autoFocus, + extime, extimeunit, captureResult.compensation, captureResult.sensitivity, + // isnan(captureResult.FocusDistance) ? 0 : captureResult.FocusDistance, + (unsigned int)captureResult.afState, (unsigned int)captureResult.aeState, captureResult.awbState, + captureResult.sceneMode, GpioControl::getLightAdc(), ldr, captureResult.zoomRatio, + (uint32_t)captureResult.duration, captureResult.frameDuration); + cameraInfo = str; + } + } + #ifdef OUTPUT_CAMERA_DBG_INFO #if 0 bool shouldRetry = false; diff --git a/app/src/main/cpp/camera2/ndkcamera.cpp b/app/src/main/cpp/camera2/ndkcamera.cpp index e644d18c..323d0ae2 100644 --- a/app/src/main/cpp/camera2/ndkcamera.cpp +++ b/app/src/main/cpp/camera2/ndkcamera.cpp @@ -1522,7 +1522,7 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque if (readyForCapture/* && mCaptureRequests.size() > 1*/) { - ALOGW("Ready for Capture AFS=%u AES=%u AWBS=%u Time=%u", + XYLOG(XYLOG_SEVERITY_INFO, "Ready for Capture AFS=%u AES=%u AWBS=%u Time=%u", (unsigned int)afState, (unsigned int)aeState, (unsigned int)awbState, (unsigned int)(ts - m_startTime)); uint32_t burstCaptures = getBurstCaptures();