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

分布式相机调整错误码

Browse Source 
Signed-off-by: wangchaole <wangchaole1@huawei.com>
This commit is contained in:
wangchaole
2022-06-29 10:09:01 +08:00
parent 38dad36faf
commit f1bc9e9e4f
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp
+11 -5
View File
@@ -80,7 +80,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, DCAMERA_EVENT_CAMERA_ERROR, std::string("operator stop capture failed"));
DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_DEVICE_ERROR, std::string("operator stop capture failed."));
return ret;
}
@@ -88,7 +88,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, DCAMERA_EVENT_CAMERA_ERROR, std::string("output stop capture failed"));
DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_DEVICE_ERROR, std::string("output stop capture failed"));
return ret;
}
@@ -310,7 +310,7 @@ void DCameraSinkController::OnStateChanged(std::shared_ptr<DCameraEvent>& event)
{
DHLOGI("DCameraSinkController::OnStateChanged dhId: %s, result: %d",
GetAnonyString(dhId_).c_str(), event->eventResult_);
DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_CAMERA_ERROR, std::string("camera error"));
DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_DEVICE_ERROR, std::string("camera error"));
}
void DCameraSinkController::OnMetadataResult(std::vector<std::shared_ptr<DCameraSettings>>& settings)
@@ -418,7 +418,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, DCAMERA_EVENT_CAMERA_ERROR, std::string("output start capture failed"));
DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_DEVICE_ERROR, std::string("output start capture failed"));
return ret;
}
@@ -426,7 +426,13 @@ 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, DCAMERA_EVENT_CAMERA_ERROR, std::string("operator start capture failed"));
if (ret == DCAMERA_ALLOC_ERROR) {
DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_NO_PERMISSION,
std::string("operator start capture permission denial."));
} else if (ret == DCAMERA_DEVICE_BUSY) {
DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_DEVICE_IN_USE,
std::string("operator start capture in used."));
}
return ret;
}