openharmony/distributed_camera
1
0
Fork 0
mirror of https://github.com/openharmony/distributed_camera.git synced 2026-07-21 04:05: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-05-11 14:52:34 +08:00
parent 1094b41596
commit d12baf7798
4 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
camera_hdf/hdi_impl/src/dcamera_device/dcamera_device.cpp
+3 -2
View File
@@ -14,6 +14,7 @@
*/
#include "dcamera_device.h"
#include "anonymous_string.h"
#include <iostream>
#include <iterator>
#include <sstream>
@@ -112,7 +113,7 @@ CamRetCode DCameraDevice::UpdateSettings(const std::shared_ptr<CameraSetting> &s
}
if (!IsOpened()) {
DHLOGE("DCameraDevice::UpdateSettings, dcamera device %s already closed.", dCameraId_.c_str());
DHLOGE("DCameraDevice::UpdateSettings, dcamera device %s already closed.", GetAnonyString(dCameraId_).c_str());
return CamRetCode::CAMERA_CLOSED;
}
@@ -221,7 +222,7 @@ CamRetCode DCameraDevice::DisableResult(const std::vector<MetaType> &results)
void DCameraDevice::Close()
{
DHLOGI("DCameraDevice::Close distributed camera: %s", dCameraId_.c_str());
DHLOGI("DCameraDevice::Close distributed camera: %s", GetAnonyString(dCameraId_).c_str());
std::shared_ptr<DCameraProvider> provider = DCameraProvider::GetInstance();
if (provider != nullptr) {
camera_hdf/hdi_impl/src/dcamera_host/dcamera_host.cpp
+7 -7
View File
@@ -59,7 +59,7 @@ CamRetCode DCameraHost::GetCameraIds(std::vector<std::string> &cameraIds)
CamRetCode DCameraHost::GetCameraAbility(const std::string &cameraId,
std::shared_ptr<CameraAbility> &ability)
{
DHLOGE("DCameraHost::GetCameraAbility for cameraId: %s", cameraId.c_str());
DHLOGE("DCameraHost::GetCameraAbility for cameraId: %s", GetAnonyString(cameraId).c_str());
if (IsCameraIdInvalid(cameraId)) {
DHLOGE("DCameraHost::GetCameraAbility, invalid camera id.");
@@ -74,7 +74,7 @@ CamRetCode DCameraHost::OpenCamera(const std::string &cameraId,
const OHOS::sptr<ICameraDeviceCallback> &callback,
OHOS::sptr<ICameraDevice> &pDevice)
{
DHLOGI("DCameraHost::OpenCamera for cameraId: %s", cameraId.c_str());
DHLOGI("DCameraHost::OpenCamera for cameraId: %s", GetAnonyString(cameraId).c_str());
if (IsCameraIdInvalid(cameraId) || callback == nullptr) {
DHLOGE("DCameraHost::OpenCamera, open camera id is empty or callback is null.");
@@ -94,7 +94,7 @@ CamRetCode DCameraHost::OpenCamera(const std::string &cameraId,
}
if (dcameraDevice->IsOpened()) {
DHLOGE("DCameraHost::OpenCamera, dcamera device %s already opened.", cameraId.c_str());
DHLOGE("DCameraHost::OpenCamera, dcamera device %s already opened.", GetAnonyString(cameraId).c_str());
return CamRetCode::CAMERA_BUSY;
}
@@ -122,7 +122,7 @@ DCamRetCode DCameraHost::AddDCameraDevice(const std::shared_ptr<DHBase> &dhBase,
const sptr<IDCameraProviderCallback> &callback)
{
DHLOGI("DCameraHost::AddDCameraDevice for {devId: %s, dhId: %s}",
GetAnonyString(dhBase->deviceId_).c_str(), dhBase->dhId_.c_str());
GetAnonyString(dhBase->deviceId_).c_str(), GetAnonyString(dhBase->dhId_).c_str());
OHOS::sptr<DCameraDevice> dcameraDevice = new (std::nothrow) DCameraDevice(dhBase, abilityInfo);
if (dcameraDevice == nullptr) {
@@ -140,14 +140,14 @@ DCamRetCode DCameraHost::AddDCameraDevice(const std::shared_ptr<DHBase> &dhBase,
dCameraHostCallback_->OnCameraEvent(dCameraId, CameraEvent::CAMERA_EVENT_DEVICE_ADD);
}
DHLOGI("DCameraHost::AddDCameraDevice, create dcamera device success, dCameraId: %s", dCameraId.c_str());
DHLOGI("DCameraHost::AddDCameraDevice, create dcamera device success, dCameraId: %s", GetAnonyString(dCameraId).c_str());
return DCamRetCode::SUCCESS;
}
DCamRetCode DCameraHost::RemoveDCameraDevice(const std::shared_ptr<DHBase> &dhBase)
{
DHLOGI("DCameraHost::RemoveDCameraDevice for {devId: %s, dhId: %s}",
GetAnonyString(dhBase->deviceId_).c_str(), dhBase->dhId_.c_str());
GetAnonyString(dhBase->deviceId_).c_str(), GetAnonyString(dhBase->dhId_).c_str());
std::string dCameraId = GetCameraIdByDHBase(dhBase);
if (dCameraId.empty()) {
@@ -171,7 +171,7 @@ DCamRetCode DCameraHost::RemoveDCameraDevice(const std::shared_ptr<DHBase> &dhBa
dCameraHostCallback_->OnCameraEvent(dCameraId, CameraEvent::CAMERA_EVENT_DEVICE_RMV);
}
DHLOGI("DCameraHost::RemoveDCameraDevice, remove dcamera device success, dCameraId: %s", dCameraId.c_str());
DHLOGI("DCameraHost::RemoveDCameraDevice, remove dcamera device success, dCameraId: %s", GetAnonyString(dCameraId).c_str());
return DCamRetCode::SUCCESS;
}
camera_hdf/hdi_impl/src/dcamera_provider/dcamera_provider.cpp
+13 -13
View File
@@ -45,7 +45,7 @@ DCamRetCode DCameraProvider::EnableDCameraDevice(const std::shared_ptr<DHBase> &
return DCamRetCode::INVALID_ARGUMENT;
}
DHLOGI("DCameraProvider::EnableDCameraDevice for {devId: %s, dhId: %s, abilityInfo length: %d}.",
GetAnonyString(dhBase->deviceId_).c_str(), dhBase->dhId_.c_str(), abilityInfo.length());
GetAnonyString(dhBase->deviceId_).c_str(), GetAnonyString(dhBase->dhId_).c_str(), abilityInfo.length());
if (IsDhBaseInfoInvalid(dhBase)) {
DHLOGE("DCameraProvider::EnableDCameraDevice, devId or dhId is invalid.");
@@ -80,7 +80,7 @@ DCamRetCode DCameraProvider::DisableDCameraDevice(const std::shared_ptr<DHBase>
return DCamRetCode::INVALID_ARGUMENT;
}
DHLOGI("DCameraProvider::DisableDCameraDevice for {devId: %s, dhId: %s}.",
GetAnonyString(dhBase->deviceId_).c_str(), dhBase->dhId_.c_str());
GetAnonyString(dhBase->deviceId_).c_str(), GetAnonyString(dhBase->dhId_).c_str());
if (IsDhBaseInfoInvalid(dhBase)) {
DHLOGE("DCameraProvider::DisableDCameraDevice, devId or dhId is invalid.");
@@ -109,7 +109,7 @@ DCamRetCode DCameraProvider::AcquireBuffer(const std::shared_ptr<DHBase> &dhBase
return DCamRetCode::INVALID_ARGUMENT;
}
DHLOGI("DCameraProvider::AcquireBuffer for {devId: %s, dhId: %s}, streamId: %d.",
GetAnonyString(dhBase->deviceId_).c_str(), dhBase->dhId_.c_str(), streamId);
GetAnonyString(dhBase->deviceId_).c_str(), GetAnonyString(dhBase->dhId_).c_str(), streamId);
OHOS::sptr<DCameraDevice> device = GetDCameraDevice(dhBase);
if (device == nullptr) {
@@ -132,7 +132,7 @@ DCamRetCode DCameraProvider::ShutterBuffer(const std::shared_ptr<DHBase> &dhBase
return DCamRetCode::INVALID_ARGUMENT;
}
DHLOGI("DCameraProvider::ShutterBuffer for {devId: %s, dhId: %s}, streamId = %d, buffer index = %d.",
GetAnonyString(dhBase->deviceId_).c_str(), dhBase->dhId_.c_str(), streamId, buffer->index_);
GetAnonyString(dhBase->deviceId_).c_str(), GetAnonyString(dhBase->dhId_).c_str(), streamId, buffer->index_);
OHOS::sptr<DCameraDevice> device = GetDCameraDevice(dhBase);
if (device == nullptr) {
@@ -151,7 +151,7 @@ DCamRetCode DCameraProvider::OnSettingsResult(const std::shared_ptr<DHBase> &dhB
return DCamRetCode::INVALID_ARGUMENT;
}
DHLOGI("DCameraProvider::OnSettingsResult for {devId: %s, dhId: %s}.",
GetAnonyString(dhBase->deviceId_).c_str(), dhBase->dhId_.c_str());
GetAnonyString(dhBase->deviceId_).c_str(), GetAnonyString(dhBase->dhId_).c_str());
OHOS::sptr<DCameraDevice> device = GetDCameraDevice(dhBase);
if (device == nullptr) {
@@ -170,7 +170,7 @@ DCamRetCode DCameraProvider::Notify(const std::shared_ptr<DHBase> &dhBase,
return DCamRetCode::INVALID_ARGUMENT;
}
DHLOGI("DCameraProvider::Notify for {devId: %s, dhId: %s}.",
GetAnonyString(dhBase->deviceId_).c_str(), dhBase->dhId_.c_str());
GetAnonyString(dhBase->deviceId_).c_str(), GetAnonyString(dhBase->dhId_).c_str());
OHOS::sptr<DCameraDevice> device = GetDCameraDevice(dhBase);
if (device == nullptr) {
@@ -188,7 +188,7 @@ DCamRetCode DCameraProvider::OpenSession(const std::shared_ptr<DHBase> &dhBase)
return DCamRetCode::INVALID_ARGUMENT;
}
DHLOGI("DCameraProvider::OpenSession for {devId: %s, dhId: %s}.",
GetAnonyString(dhBase->deviceId_).c_str(), dhBase->dhId_.c_str());
GetAnonyString(dhBase->deviceId_).c_str(), GetAnonyString(dhBase->dhId_).c_str());
sptr<IDCameraProviderCallback> callback = GetCallbackBydhBase(dhBase);
if (callback == nullptr) {
@@ -206,7 +206,7 @@ DCamRetCode DCameraProvider::CloseSession(const std::shared_ptr<DHBase> &dhBase)
return DCamRetCode::INVALID_ARGUMENT;
}
DHLOGI("DCameraProvider::CloseSession for {devId: %s, dhId: %s}.",
GetAnonyString(dhBase->deviceId_).c_str(), dhBase->dhId_.c_str());
GetAnonyString(dhBase->deviceId_).c_str(), GetAnonyString(dhBase->dhId_).c_str());
sptr<IDCameraProviderCallback> callback = GetCallbackBydhBase(dhBase);
if (callback == nullptr) {
@@ -225,7 +225,7 @@ DCamRetCode DCameraProvider::ConfigureStreams(const std::shared_ptr<DHBase> &dhB
return DCamRetCode::INVALID_ARGUMENT;
}
DHLOGI("DCameraProvider::ConfigureStreams for {devId: %s, dhId: %s}.",
GetAnonyString(dhBase->deviceId_).c_str(), dhBase->dhId_.c_str());
GetAnonyString(dhBase->deviceId_).c_str(), GetAnonyString(dhBase->dhId_).c_str());
sptr<IDCameraProviderCallback> callback = GetCallbackBydhBase(dhBase);
if (callback == nullptr) {
@@ -248,7 +248,7 @@ DCamRetCode DCameraProvider::ReleaseStreams(const std::shared_ptr<DHBase> &dhBas
return DCamRetCode::INVALID_ARGUMENT;
}
DHLOGI("DCameraProvider::ReleaseStreams for {devId: %s, dhId: %s}.",
GetAnonyString(dhBase->deviceId_).c_str(), dhBase->dhId_.c_str());
GetAnonyString(dhBase->deviceId_).c_str(), GetAnonyString(dhBase->dhId_).c_str());
sptr<IDCameraProviderCallback> callback = GetCallbackBydhBase(dhBase);
if (callback == nullptr) {
@@ -272,7 +272,7 @@ DCamRetCode DCameraProvider::StartCapture(const std::shared_ptr<DHBase> &dhBase,
return DCamRetCode::INVALID_ARGUMENT;
}
DHLOGI("DCameraProvider::StartCapture for {devId: %s, dhId: %s}.",
GetAnonyString(dhBase->deviceId_).c_str(), dhBase->dhId_.c_str());
GetAnonyString(dhBase->deviceId_).c_str(), GetAnonyString(dhBase->dhId_).c_str());
sptr<IDCameraProviderCallback> callback = GetCallbackBydhBase(dhBase);
if (callback == nullptr) {
@@ -299,7 +299,7 @@ DCamRetCode DCameraProvider::StopCapture(const std::shared_ptr<DHBase> &dhBase)
return DCamRetCode::INVALID_ARGUMENT;
}
DHLOGI("DCameraProvider::StopCapture for {devId: %s, dhId: %s}.",
GetAnonyString(dhBase->deviceId_).c_str(), dhBase->dhId_.c_str());
GetAnonyString(dhBase->deviceId_).c_str(), GetAnonyString(dhBase->dhId_).c_str());
sptr<IDCameraProviderCallback> callback = GetCallbackBydhBase(dhBase);
if (callback == nullptr) {
@@ -318,7 +318,7 @@ DCamRetCode DCameraProvider::UpdateSettings(const std::shared_ptr<DHBase> &dhBas
return DCamRetCode::INVALID_ARGUMENT;
}
DHLOGI("DCameraProvider::UpdateSettings for {devId: %s, dhId: %s}.",
GetAnonyString(dhBase->deviceId_).c_str(), dhBase->dhId_.c_str());
GetAnonyString(dhBase->deviceId_).c_str(), GetAnonyString(dhBase->dhId_).c_str());
sptr<IDCameraProviderCallback> callback = GetCallbackBydhBase(dhBase);
if (callback == nullptr) {
services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp
+7 -7
View File
@@ -75,8 +75,8 @@ int32_t DCameraSourceController::StartCapture(std::vector<std::shared_ptr<DCamer
GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str());
return ret;
}
DHLOGI("DCameraSourceController StartCapture devId: %s, dhId: %s captureJson: %s", GetAnonyString(devId).c_str(),
GetAnonyString(dhId).c_str(), jsonStr.c_str());
DHLOGI("DCameraSourceController StartCapture devId: %s, dhId: %s captureCommand: %s", GetAnonyString(devId).c_str(),
GetAnonyString(dhId).c_str(), cmd.command_.c_str());
std::shared_ptr<DataBuffer> buffer = std::make_shared<DataBuffer>(jsonStr.length() + 1);
ret = memcpy_s(buffer->Data(), buffer->Capacity(), (uint8_t *)jsonStr.c_str(), jsonStr.length());
if (ret != EOK) {
@@ -150,8 +150,8 @@ int32_t DCameraSourceController::ChannelNeg(std::shared_ptr<DCameraChannelInfo>&
GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str());
return ret;
}
DHLOGD("DCameraSourceController ChannelNeg devId: %s, dhId: %s channelNegJson: %s", GetAnonyString(devId).c_str(),
GetAnonyString(dhId).c_str(), jsonStr.c_str());
DHLOGD("DCameraSourceController ChannelNeg devId: %s, dhId: %s channelNegCommand: %s", GetAnonyString(devId).c_str(),
GetAnonyString(dhId).c_str(), cmd.command_.c_str());
ret = camSinkSrv->ChannelNeg(dhId, jsonStr);
if (ret != DCAMERA_OK) {
DHLOGE("DCameraSourceController ChannelNeg rpc failed ret: %d, devId: %s, dhId: %s", ret,
@@ -289,15 +289,15 @@ int32_t DCameraSourceController::OpenChannel(std::shared_ptr<DCameraOpenInfo>& o
DHLOGE("DCameraSourceController Marshal OpenInfo failed %d", ret);
return ret;
}
DHLOGD("DCameraSourceController OpenChannel devId: %s, dhId: %s openJson: %s", GetAnonyString(devId).c_str(),
GetAnonyString(dhId).c_str(), jsonStr.c_str());
DHLOGD("DCameraSourceController OpenChannel devId: %s, dhId: %s openCommand: %s", GetAnonyString(devId).c_str(),
GetAnonyString(dhId).c_str(), cmd.command_.c_str());
ret = camSinkSrv->OpenChannel(dhId, jsonStr);
if (ret != DCAMERA_OK) {
DHLOGE("DCameraSourceController SA OpenChannel failed %d", ret);
return ret;
}
DHLOGD("DCameraSourceController OpenChannel devId: %s, dhId: %s success", GetAnonyString(devId).c_str(),
GetAnonyString(dhId).c_str(), jsonStr.c_str());
GetAnonyString(dhId).c_str());
std::vector<DCameraIndex> indexs;
indexs.push_back(DCameraIndex(devId, dhId));