diff --git a/services/include/camera_server.h b/services/include/camera_server.h index 5e09b92..c9e3671 100755 --- a/services/include/camera_server.h +++ b/services/include/camera_server.h @@ -45,9 +45,12 @@ public: void OnCameraStatusChange(int32_t ret, SvcIdentity *sid); void OnCameraConfigured(int32_t ret); private: - CameraServer() {} + CameraServer() + { + sid_.cookie = 0; + } SvcIdentity sid_; }; } // namespace Media } // namespace OHOS -#endif // CAMERA_SERVER_H \ No newline at end of file +#endif // CAMERA_SERVER_H diff --git a/services/src/camera_device.cpp b/services/src/camera_device.cpp index 949be55..907b4a5 100755 --- a/services/src/camera_device.cpp +++ b/services/src/camera_device.cpp @@ -356,7 +356,7 @@ int32_t RecordAssistant::SetFrameConfig(FrameConfig &fc, uint32_t *streamId) } for (auto &surface : surfaceList) { CODEC_HANDLETYPE codecHdl = nullptr; - StreamAttr stream; + StreamAttr stream = {}; #ifdef __LINUX__ StreamAttrInitialize(&stream, g_surface, STREAM_VIDEO, FORMAT_YVU420); #else @@ -370,7 +370,7 @@ int32_t RecordAssistant::SetFrameConfig(FrameConfig &fc, uint32_t *streamId) fc.GetVendorParameter(streamInfo.u.data, PRIVATE_TAG_LEN); HalCameraStreamSetInfo(cameraId_, *streamId, &streamInfo); - uint32_t deviceId; + uint32_t deviceId = 0; HalCameraGetDeviceId(cameraId_, *streamId, &deviceId); int32_t ret = CameraCreateVideoEnc(fc, stream, deviceId, &codecHdl); if (ret != MEDIA_OK) { @@ -462,7 +462,7 @@ int32_t PreviewAssistant::SetFrameConfig(FrameConfig &fc, uint32_t *streamId) return MEDIA_ERR; } Surface *surface = surfaceList.front(); - StreamAttr stream; + StreamAttr stream = {}; StreamAttrInitialize(&stream, surface, STREAM_PREVIEW, FORMAT_YVU420); HalCameraStreamCreate(cameraId_, &stream, streamId); StreamInfo streamInfo; @@ -519,10 +519,10 @@ int32_t CaptureAssistant::SetFrameConfig(FrameConfig &fc, uint32_t *streamId) } Surface *surface = surfaceList.front(); - StreamAttr stream; + StreamAttr stream = {}; StreamAttrInitialize(&stream, surface, STREAM_CAPTURE, FORMAT_YVU420); - uint32_t deviceId; + uint32_t deviceId = 0; HalCameraStreamCreate(cameraId_, &stream, streamId); streamId_ = *streamId; HalCameraGetDeviceId(cameraId_, *streamId, &deviceId); @@ -619,7 +619,7 @@ int32_t CallbackAssistant::SetFrameConfig(FrameConfig &fc, uint32_t *streamId) ImageFormat halImageFormat = Convert2HalImageFormat(imageFormat); MEDIA_INFO_LOG("Imageformat is %d", imageFormat); Surface *surface = surfaceList.front(); - StreamAttr stream; + StreamAttr stream = {}; StreamAttrInitialize(&stream, surface, STREAM_CALLBACK, halImageFormat); HalCameraStreamCreate(cameraId_, &stream, streamId); streamId_ = *streamId; @@ -799,4 +799,4 @@ int32_t CameraDevice::SetCameraConfig() return MEDIA_OK; } } // namespace Media -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/services/src/camera_service.cpp b/services/src/camera_service.cpp index cd804bb..91c8421 100755 --- a/services/src/camera_service.cpp +++ b/services/src/camera_service.cpp @@ -56,7 +56,7 @@ CameraAbility *CameraService::GetCameraAbility(std::string &cameraId) if (ability == nullptr) { return nullptr; } - uint32_t streamCapNum; + uint32_t streamCapNum = 0; StreamCap *streamCap = nullptr; int32_t ret = HalCameraGetStreamCapNum(atoi(cameraId.c_str()), &streamCapNum); streamCap = new StreamCap[streamCapNum]; @@ -71,7 +71,7 @@ CameraAbility *CameraService::GetCameraAbility(std::string &cameraId) } ability->SetParameterRange(PARAM_KEY_SIZE, range); - AbilityInfo cameraAbility; + AbilityInfo cameraAbility = {}; HalCameraGetAbility(atoi(cameraId.c_str()), &cameraAbility); // Get supported AF Modes list afModes;