openharmony/distributed_camera
1
0
Fork 0
mirror of https://github.com/openharmony/distributed_camera.git synced 2026-07-19 16:43:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

reviewbot告警

Browse Source 
Signed-off-by: wangchaole <wangchaole1@huawei.com>
This commit is contained in:
wangchaole
2022-06-16 18:47:29 +08:00
parent 67617a7a7d
commit 9bd77e7eca
4 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/include/constants/distributed_camera_constants.h
-3
View File
@@ -58,9 +58,6 @@ typedef enum {
DCAMERA_EVENT_START_CAPTURE_ERROR = -6,
DCAMERA_EVENT_STOP_CAPTURE_ERROR = -7,
DCAMERA_EVENT_UPDATE_SETTINGS_ERROR = -8,
DCAMERA_EVENT_DEVICE_PREEMPT = -9,
DCAMERA_EVENT_DEVICE_IN_USE = -10,
DCAMERA_EVENT_NO_PERMISSION = -11,
} DCameraEventResult;
typedef enum {
services/cameraservice/cameraoperator/client/src/callback/dcamera_input_callback.cpp
+2 -5
View File
@@ -31,13 +31,10 @@ void DCameraInputCallback::OnError(const int32_t errorType, const int32_t errorM
DHLOGE("DCameraInputCallback::OnError StateCallback is null");
return;
}
std::shared_ptr<DCameraEvent> event = std::make_shared<DCameraEvent>();
event->eventType_ = DCAMERA_MESSAGE;
if (errorType == CamServiceError::) {
event->eventResult_ = DCAMERA_DEVICE_PREEMPT;
} else {
event->eventResult_ = DCAMERA_EVENT_CAMERA_ERROR;
}
event->eventResult_ = DCAMERA_EVENT_CAMERA_ERROR;
callback_->OnStateChanged(event);
}
} // namespace DistributedHardware
services/cameraservice/cameraoperator/client/src/callback/dcamera_photo_callback.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ void DCameraPhotoCallback::OnCaptureError(const int32_t captureId, const int32_t
std::shared_ptr<DCameraEvent> event = std::make_shared<DCameraEvent>();
event->eventType_ = DCAMERA_MESSAGE;
event->eventResult_ = DCAMERA_DEVICE_ERROR;
event->eventResult_ = DCAMERA_EVENT_CAMERA_ERROR;
callback_->OnStateChanged(event);
}
} // namespace DistributedHardware
services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp
+5 -9
View File
@@ -79,7 +79,7 @@ int32_t DCameraSinkController::StopCapture()
if (ret != DCAMERA_OK) {
DHLOGE("DCameraSinkController::StopCapture client stop capture failed, dhId: %s, ret: %d",
GetAnonyString(dhId_).c_str(), ret);
DCameraNotifyInner(DCAMERA_MESSAGE, ret, std::string("operator stop capture failed"));
DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_CAMERA_ERROR, std::string("operator stop capture failed"));
return ret;
}
@@ -87,7 +87,7 @@ int32_t DCameraSinkController::StopCapture()
if (ret != DCAMERA_OK) {
DHLOGE("DCameraSinkController::StopCapture output stop capture failed, dhId: %s, ret: %d",
GetAnonyString(dhId_).c_str(), ret);
DCameraNotifyInner(DCAMERA_MESSAGE, ret, std::string("output stop capture failed"));
DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_CAMERA_ERROR, std::string("output stop capture failed"));
return ret;
}
@@ -309,11 +309,7 @@ void DCameraSinkController::OnStateChanged(std::shared_ptr<DCameraEvent>& event)
{
DHLOGI("DCameraSinkController::OnStateChanged dhId: %s, result: %d",
GetAnonyString(dhId_).c_str(), event->eventResult_);
if (event->eventResult_ == CamServiceError::) {
DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_DEVICE_PREEMPT, std::string("camera preempted"));
} else {
DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_CAMERA_ERROR, std::string("camera error"));
}
DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_CAMERA_ERROR, std::string("camera error"));
}
void DCameraSinkController::OnMetadataResult()
@@ -391,7 +387,7 @@ int32_t DCameraSinkController::StartCaptureInner(std::vector<std::shared_ptr<DCa
if (ret != DCAMERA_OK) {
DHLOGE("DCameraSinkController::StartCaptureInner output start capture failed, dhId: %s, ret: %d",
GetAnonyString(dhId_).c_str(), ret);
DCameraNotifyInner(DCAMERA_MESSAGE, ret, std::string("output start capture failed"));
DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_CAMERA_ERROR, std::string("output start capture failed"));
return ret;
}
@@ -399,7 +395,7 @@ int32_t DCameraSinkController::StartCaptureInner(std::vector<std::shared_ptr<DCa
if (ret != DCAMERA_OK) {
DHLOGE("DCameraSinkController::StartCaptureInner camera client start capture failed, dhId: %s, ret: %d",
GetAnonyString(dhId_).c_str(), ret);
DCameraNotifyInner(DCAMERA_MESSAGE, ret, std::string("operator start capture failed"));
DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_CAMERA_ERROR, std::string("operator start capture failed"));
return ret;
}