openharmony/multimedia_camera_lite
1
0
Fork 0
mirror of https://github.com/openharmony/multimedia_camera_lite.git synced 2026-06-30 22:07:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

!88 【OpenHarmony开源贡献者计划2022】fix change caemra to camera , change CAEMRA_SERVER_SET_CAMERA_CONFIG to CAMERA_SERVER_SET_CAMERA_CONFIG

Browse Source 
Merge pull request !88 from Kent Feng/fi'x
This commit is contained in:
openharmony_ci
2022-06-15 01:20:43 +00:00
committed by Gitee
parent caad4c7ae2 fae8055e76
commit 9c57a1c659
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/binder/src/camera_device_client.cpp
+2 -2
View File
@@ -95,9 +95,9 @@ int32_t CameraDeviceClient::SetCameraConfig(CameraConfig &cc)
para_->data = this;
para_->cameraConfig = &cc;
CallBackPara para = {};
para.funcId = CAEMRA_SERVER_SET_CAMERA_CONFIG;
para.funcId = CAMERA_SERVER_SET_CAMERA_CONFIG;
para.data = this;
uint32_t ret = proxy_->Invoke(proxy_, CAEMRA_SERVER_SET_CAMERA_CONFIG, &io, &para, Callback);
uint32_t ret = proxy_->Invoke(proxy_, CAMERA_SERVER_SET_CAMERA_CONFIG, &io, &para, Callback);
if (ret != 0) {
MEDIA_ERR_LOG("Set camera config ipc transmission failed. (ret=%d)", ret);
return MEDIA_ERR;
interfaces/kits/camera_info.h
+2 -2
View File
@@ -78,7 +78,7 @@ public:
/**
* @brief Obtains the camera type.
*
* @return Returns the caemra type, whick can be {@link CameraType}.
* @return Returns the camera type, whick can be {@link CameraType}.
*/
virtual int32_t GetCameraType() const
{
@@ -88,7 +88,7 @@ public:
/**
* @brief Obtains the camera type.
*
* @return Returns the caemra type, whick can be {@link FacingType}.
* @return Returns the camera type, whick can be {@link FacingType}.
*/
virtual int32_t GetCameraFacingType() const
{
services/server/include/camera_type.h
+1 -1
View File
@@ -26,7 +26,7 @@ typedef enum {
CAMERA_SERVER_GET_CAMERAIDLIST,
CAMERA_SERVER_CREATE_CAMERA,
CAMERA_SERVER_CLOSE_CAMERA,
CAEMRA_SERVER_SET_CAMERA_CONFIG,
CAMERA_SERVER_SET_CAMERA_CONFIG,
CAMERA_SERVER_TRIGGER_SINGLE_CAPTURE,
CAMERA_SERVER_TRIGGER_LOOPING_CAPTURE,
CAMERA_SERVER_STOP_LOOPING_CAPTURE,
services/server/src/camera_server.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ void CameraServer::CameraServerRequestHandle(int funcId, void *origin, IpcIo *re
case CAMERA_SERVER_CLOSE_CAMERA:
CameraServer::GetInstance()->CloseCamera(req, reply);
break;
case CAEMRA_SERVER_SET_CAMERA_CONFIG:
case CAMERA_SERVER_SET_CAMERA_CONFIG:
CameraServer::GetInstance()->SetCameraConfig(req, reply);
break;
case CAMERA_SERVER_TRIGGER_LOOPING_CAPTURE: