openharmony/multimedia_camera_lite
1
0
Fork 0
mirror of https://github.com/openharmony/multimedia_camera_lite.git synced 2026-07-18 16:14:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix reviewbot & coddex issues in multimedia

Browse Source 
Signed-off-by: Geevarghese V K <geevarghese.v.k1@huawei.com>
This commit is contained in:
Geevarghese V K
2021-09-12 19:51:39 +05:30
parent 1239ff2d01
commit fc4e32bf39
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/include/camera_server.h
+5 -2
View File
@@ -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
#endif // CAMERA_SERVER_H
services/src/camera_device.cpp
+7 -7
View File
@@ -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
} // namespace OHOS
services/src/camera_service.cpp
+2 -2
View File
@@ -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<int32_t> afModes;