优化日志

serial
Matthew 1 year ago
parent b4b6c001bc
commit ce055c4c77

@ -262,7 +262,7 @@ void CPhoneDevice::SetRecognizationCfg(const IDevice::CFG_RECOGNIZATION* pRecogn
if (m_pRecognizationCfg == NULL && pRecognizationCfg != NULL && (pRecognizationCfg->enabled != 0)) if (m_pRecognizationCfg == NULL && pRecognizationCfg != NULL && (pRecognizationCfg->enabled != 0))
{ {
// TODO // TODO
XYLOG(XYLOG_SEVERITY_DEBUG, "Start init ncnn"); XYLOG(XYLOG_SEVERITY_INFO, "AI Enabled");
ncnn_init(); ncnn_init();
std::string paramFile = m_appPath + (APP_PATH_RECOG_PARAM); std::string paramFile = m_appPath + (APP_PATH_RECOG_PARAM);
std::string binFile = m_appPath + (APP_PATH_RECOG_BIN); std::string binFile = m_appPath + (APP_PATH_RECOG_BIN);
@ -276,6 +276,10 @@ void CPhoneDevice::SetRecognizationCfg(const IDevice::CFG_RECOGNIZATION* pRecogn
XYLOG(XYLOG_SEVERITY_ERROR, "Failed to Init NCNN"); XYLOG(XYLOG_SEVERITY_ERROR, "Failed to Init NCNN");
} }
} }
else
{
XYLOG(XYLOG_SEVERITY_WARNING, "AI Disabled");
}
m_pRecognizationCfg = pRecognizationCfg; m_pRecognizationCfg = pRecognizationCfg;
} }
@ -1151,6 +1155,8 @@ bool CPhoneDevice::OnImageReady(cv::Mat& mat)
if ((m_pRecognizationCfg != NULL) && (m_pRecognizationCfg->enabled != 0) && (mPhotoInfo.recognization != 0)) if ((m_pRecognizationCfg != NULL) && (m_pRecognizationCfg->enabled != 0) && (mPhotoInfo.recognization != 0))
{ {
XYLOG(XYLOG_SEVERITY_INFO, "Channel AI Enabled");
// visualize(ncnnPath.c_str(), in); // visualize(ncnnPath.c_str(), in);
#ifdef _DEBUG #ifdef _DEBUG
double startTime = ncnn::get_current_time(); double startTime = ncnn::get_current_time();
@ -1236,6 +1242,10 @@ bool CPhoneDevice::OnImageReady(cv::Mat& mat)
} }
} }
} }
else
{
XYLOG(XYLOG_SEVERITY_WARNING, "Channel AI Disabled");
}
#ifdef OUTPUT_CAMERA_DBG_INFO #ifdef OUTPUT_CAMERA_DBG_INFO

@ -31,19 +31,19 @@ static void onAvailabilityCallback(void* context, const char* cameraId)
{ {
((NdkCamera*)context)->onAvailabilityCallback(cameraId); ((NdkCamera*)context)->onAvailabilityCallback(cameraId);
// ALOGI("CameraStatus::onAvailability CameraId: %s", cameraId); // ALOGI("CameraStatus::onAvailability CameraId: %s", cameraId);
XYLOG(XYLOG_SEVERITY_INFO, "CameraStatus::onAvailability CameraId: %s", cameraId); XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::onAvailability CameraId: %s", cameraId);
} }
static void onUnavailabilityCallback(void* context, const char* cameraId) static void onUnavailabilityCallback(void* context, const char* cameraId)
{ {
((NdkCamera*)context)->onUnavailabilityCallback(cameraId); ((NdkCamera*)context)->onUnavailabilityCallback(cameraId);
XYLOG(XYLOG_SEVERITY_INFO, "CameraStatus::onUnavailability CameraId: %s", cameraId); XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::onUnavailability CameraId: %s", cameraId);
} }
static void onDisconnected(void* context, ACameraDevice* device) static void onDisconnected(void* context, ACameraDevice* device)
{ {
((NdkCamera*)context)->onDisconnected(device); ((NdkCamera*)context)->onDisconnected(device);
XYLOG(XYLOG_SEVERITY_INFO, "CameraStatus::onDisconnected CameraId: %s", ACameraDevice_getId(device)); XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::onDisconnected CameraId: %s", ACameraDevice_getId(device));
} }
static void onError(void* context, ACameraDevice* device, int error) static void onError(void* context, ACameraDevice* device, int error)
@ -458,7 +458,7 @@ int NdkCamera::open(const std::string& cameraId) {
} }
} }
XYLOG(XYLOG_SEVERITY_INFO, "CameraStatus::Open %s Orientation=%d width=%d height=%d", cameraId.c_str(), camera_orientation, foundRes.width(), foundRes.height()); XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::Open %s Orientation=%d width=%d height=%d", cameraId.c_str(), camera_orientation, foundRes.width(), foundRes.height());
// setup imagereader and its surface // setup imagereader and its surface
{ {
@ -684,7 +684,7 @@ int NdkCamera::open(const std::string& cameraId) {
void NdkCamera::close() void NdkCamera::close()
{ {
XYLOG(XYLOG_SEVERITY_INFO, "CameraStatus::try close %s", mCameraId.c_str()); XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::try close %s", mCameraId.c_str());
camera_status_t res = ACAMERA_OK; camera_status_t res = ACAMERA_OK;
if ((ACameraManager *)camera_manager != NULL) if ((ACameraManager *)camera_manager != NULL)
@ -730,9 +730,9 @@ void NdkCamera::close()
if (camera_device) if (camera_device)
{ {
XYLOG(XYLOG_SEVERITY_INFO, "CameraStatus::close device %s, %p", mCameraId.c_str(), camera_device); XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::close device %s, %p", mCameraId.c_str(), camera_device);
ACameraDevice_close(camera_device); ACameraDevice_close(camera_device);
XYLOG(XYLOG_SEVERITY_INFO, "CameraStatus::closed device %s, %p", mCameraId.c_str(), camera_device); XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::closed device %s, %p", mCameraId.c_str(), camera_device);
camera_device = 0; camera_device = 0;
} }
@ -745,14 +745,14 @@ void NdkCamera::close()
if (image_reader != NULL) if (image_reader != NULL)
{ {
// AImageReader_setImageListener(image_reader, NULL); // AImageReader_setImageListener(image_reader, NULL);
XYLOG(XYLOG_SEVERITY_INFO, "CameraStatus::AImageReader_delete %s", mCameraId.c_str()); XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::AImageReader_delete %s", mCameraId.c_str());
AImageReader_delete(image_reader); AImageReader_delete(image_reader);
XYLOG(XYLOG_SEVERITY_INFO, "CameraStatus::End AImageReader_delete %s", mCameraId.c_str()); XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::End AImageReader_delete %s", mCameraId.c_str());
image_reader = 0; image_reader = 0;
} }
XYLOG(XYLOG_SEVERITY_INFO, "CameraStatus::closed %s", mCameraId.c_str()); XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::closed %s", mCameraId.c_str());
} }
void NdkCamera::onImageAvailable(AImageReader* reader) void NdkCamera::onImageAvailable(AImageReader* reader)

Loading…
Cancel
Save