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

!44 新增设置照片质量和GPS位置

Browse Source 
Merge pull request !44 from chen0088/master
This commit is contained in:
openharmony_ci
2022-04-01 09:18:13 +00:00
committed by Gitee
parent 89bf69e1c8 91b0d31e3d
commit da883e1997
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/cameraservice/cameraoperator/client/include/dcamera_client.h
+2
View File
@@ -55,6 +55,8 @@ private:
int32_t StartCaptureInner(std::shared_ptr<DCameraCaptureInfo>& info);
int32_t StartPhotoOutput(std::shared_ptr<DCameraCaptureInfo>& info);
int32_t StartVideoOutput();
void SetQualityAndGpsLocation(const std::shared_ptr<CameraStandard::CameraMetadata>& cameraMetadata,
std::shared_ptr<CameraStandard::PhotoCaptureSetting>& photoCaptureSettings);
bool isInit_;
std::string cameraId_;
services/cameraservice/cameraoperator/client/src/dcamera_client.cpp
+34
View File
@@ -15,7 +15,9 @@
#include "dcamera_client.h"
#include <securec.h>
#include "anonymous_string.h"
#include "camera_metadata_operator.h"
#include "dcamera_input_callback.h"
#include "dcamera_manager_callback.h"
#include "dcamera_photo_callback.h"
@@ -409,6 +411,7 @@ int32_t DCameraClient::StartPhotoOutput(std::shared_ptr<DCameraCaptureInfo>& inf
std::shared_ptr<CameraStandard::PhotoCaptureSetting> photoCaptureSettings =
std::make_shared<CameraStandard::PhotoCaptureSetting>();
photoCaptureSettings->SetRotation(rotation);
SetQualityAndGpsLocation(cameraMetadata, photoCaptureSettings);
ret = ((sptr<CameraStandard::PhotoOutput> &)photoOutput_)->Capture(photoCaptureSettings);
if (ret != DCAMERA_OK) {
DHLOGE("DCameraClient::StartPhotoOutput %s photoOutput capture failed, ret: %d",
@@ -418,6 +421,37 @@ int32_t DCameraClient::StartPhotoOutput(std::shared_ptr<DCameraCaptureInfo>& inf
return DCAMERA_OK;
}
void DCameraClient::SetQualityAndGpsLocation(const std::shared_ptr<CameraStandard::CameraMetadata>& cameraMetadata,
std::shared_ptr<CameraStandard::PhotoCaptureSetting>& photoCaptureSettings)
{
camera_metadata_item_t item;
int32_t ret = CameraStandard::FindCameraMetadataItem(cameraMetadata->get(), OHOS_JPEG_QUALITY, &item);
if (ret == CAM_META_SUCCESS) {
DHLOGI("DCameraClient::SetQualityAndGpsLocation %s find camera quality item",
GetAnonyString(cameraId_).c_str());
CameraStandard::PhotoCaptureSetting::QualityLevel quality =
static_cast<CameraStandard::PhotoCaptureSetting::QualityLevel>(item.data.u8[0]);
DHLOGI("DCameraClient::SetQualityAndGpsLocation %s photo capture settings set quality: %d",
GetAnonyString(cameraId_).c_str(), quality);
photoCaptureSettings->SetQuality(quality);
}
ret = CameraStandard::FindCameraMetadataItem(cameraMetadata->get(), OHOS_JPEG_GPS_COORDINATES, &item);
if (ret == CAM_META_SUCCESS) {
DHLOGI("DCameraClient::SetQualityAndGpsLocation %s find camera gpsCoordinates item",
GetAnonyString(cameraId_).c_str());
double gpsCoordinates[2] = {-1.0, -1.0};
if (memcpy_s(gpsCoordinates, sizeof(gpsCoordinates), item.data.d, sizeof(gpsCoordinates)) != EOK) {
DHLOGE("DCameraClient::SetQualityAndGpsLocation memcpy_s gpsCoordinates failed");
return;
}
DHLOGI("DCameraClient::SetQualityAndGpsLocation %s photo capture settings set "
"gpsCoordinates[0]: %f, gpsCoordinates[1]: %f",
GetAnonyString(cameraId_).c_str(), gpsCoordinates[0], gpsCoordinates[1]);
photoCaptureSettings->SetGpsLocation(gpsCoordinates[0], gpsCoordinates[1]);
}
return;
}
int32_t DCameraClient::StartVideoOutput()
{
DHLOGI("DCameraClient::StartVideoOutput cameraId: %s", GetAnonyString(cameraId_).c_str());