fix issues

Signed-off-by: zhuxu <zhuxu29@huawei.com>

LICENSE

@@ -175,4 +175,3 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-

camera_hdf/hdi_impl/include/dcamera_device/dcamera_device.h

@@ -78,7 +78,6 @@ private:
     bool isOpenSessFailed_ = false;
     std::mutex isOpenSessFailedlock_;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
-
 #endif // DISTRIBUTED_CAMERA_DEVICE_H

camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h

@@ -80,7 +80,6 @@ private:
     // The latest result metadata that replied to the camera service.
     common_metadata_header_t *latestConsumerResultMetadata_;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
-
 #endif // DISTRIBUTED_CAMERA_METADATA_PROCESSOR_H

camera_hdf/hdi_impl/include/dcamera_host/dcamera_host.h

@@ -77,6 +77,6 @@ private:
     std::map<DHBase, std::string> dhBaseHashDCamIdMap_;
     std::map<std::string, OHOS::sptr<DCameraDevice>> dCameraDeviceMap_;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_CAMERA_HOST_H

camera_hdf/hdi_impl/include/dcamera_provider/dcamera_provider.h

@@ -74,6 +74,6 @@ private:
     static AutoRelease autoRelease_;
     static std::shared_ptr<DCameraProvider> instance_;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_CAMERA_PROVIDER_H

camera_hdf/hdi_impl/include/dstream_operator/dbuffer_manager.h

@@ -53,6 +53,6 @@ private:
     std::list<std::shared_ptr<DImageBuffer>> idleList_ = {};
     std::list<std::shared_ptr<DImageBuffer>> busyList_ = {};
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_CAMERA_BUFFER_MANAGER_H

camera_hdf/hdi_impl/include/dstream_operator/dcamera_steam.h

@@ -69,6 +69,6 @@ private:
     int captureBufferCount_ = 0;
     bool isBufferMgrInited_ = false;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_CAMERA_STREAM_H

camera_hdf/hdi_impl/include/dstream_operator/dimage_buffer.h

@@ -84,6 +84,6 @@ private:
 
     std::mutex l_;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_CAMERA_IMAGE_BUFFER_H

camera_hdf/hdi_impl/include/dstream_operator/doffline_stream_operator.h

@@ -35,7 +35,6 @@ public:
     virtual CamRetCode ReleaseStreams(const std::vector<int>& streamIds) override;
     virtual CamRetCode Release() override;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
-
 #endif // DISTRIBUTED_CAMERA_OFFLINE_STREAM_OPERATOR_H

camera_hdf/hdi_impl/include/dstream_operator/dstream_operator.h

@@ -107,7 +107,6 @@ private:
     OperationMode currentOperMode_ = OperationMode::NORMAL;
     std::shared_ptr<CameraStandard::CameraMetadata> latestStreamSetting_;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
-
 #endif // DISTRIBUTED_CAMERA_STREAM_OPERATOR_H

camera_hdf/hdi_impl/include/utils/constants.h

@@ -108,6 +108,6 @@ struct DCResolution {
             (this->width_ == others.width_ && this->height_ < others.height_);
     }
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
-#endif // DISTRIBUTED_CONSTANTS_H
+#endif // DISTRIBUTED_CONSTANTS_H

camera_hdf/hdi_impl/include/utils/dcamera.h

@@ -36,7 +36,6 @@ DCamRetCode MapToInternalRetCode(CamRetCode retCode);
 uint64_t GetCurrentLocalTimeStamp();
 
 void SplitString(const std::string &str, std::vector<std::string> &tokens, const std::string &delimiters);
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
-
+#endif // DISTRIBUTED_CAMERA_H
-#endif // DISTRIBUTED_CAMERA_H

camera_hdf/hdi_impl/src/dcamera_device/dcamera_device.cpp

@@ -442,5 +442,5 @@ bool DCameraDevice::IsOpened()
 {
     return isOpened_;
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp

@@ -604,5 +604,5 @@ void DMetadataProcessor::PrintDCameraMetadata(const common_metadata_header_t *me
         }
     }
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/hdi_impl/src/dcamera_host/dcamera_host.cpp

@@ -228,5 +228,5 @@ void DCameraHost::NotifyDCameraStatus(const std::shared_ptr<DHBase> &dhBase, int
         dCameraHostCallback_->OnCameraStatus(dCameraId, CameraStatus::UN_AVAILABLE);
     }
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/hdi_impl/src/dcamera_provider/dcamera_provider.cpp

@@ -302,5 +302,5 @@ OHOS::sptr<DCameraDevice> DCameraProvider::GetDCameraDevice(const std::shared_pt
     }
     return dCameraHost->GetDCameraDeviceByDHBase(dhBase);
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/hdi_impl/src/dstream_operator/dbuffer_manager.cpp

@@ -158,5 +158,5 @@ RetCode DBufferManager::DImageBufferToDCameraBuffer(const std::shared_ptr<DImage
 
     return RC_OK;
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/hdi_impl/src/dstream_operator/dcamera_steam.cpp

@@ -358,5 +358,5 @@ bool DCameraStream::HasBufferQueue()
     }
     return true;
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/hdi_impl/src/dstream_operator/dimage_buffer.cpp

@@ -238,5 +238,5 @@ bool DImageBuffer::operator==(const DImageBuffer& u)
     }
     return u.GetPhyAddress() == phyAddr_;
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/hdi_impl/src/dstream_operator/doffline_stream_operator.cpp

@@ -34,5 +34,5 @@ CamRetCode DOfflineStreamOperator::Release()
 {
     return CamRetCode::METHOD_NOT_SUPPORTED;
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/hdi_impl/src/dstream_operator/dstream_operator.cpp

@@ -749,5 +749,5 @@ DCEncodeType DStreamOperator::ConvertDCEncodeType(std::string &srcEncodeType)
         return DCEncodeType::ENCODE_TYPE_NULL;
     }
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/hdi_impl/src/utils/dcamera.cpp

@@ -85,5 +85,5 @@ void SplitString(const std::string &str, std::vector<std::string> &tokens, const
         tokens.push_back(str.substr(lastPos));
     }
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/hdi_impl/test/common.cpp

@@ -379,5 +379,5 @@ OHOS::sptr<OHOS::IBufferProducer> Test::StreamConsumer::CreateProducer(std::func
     });
     return producer;
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/hdi_impl/test/common.h

@@ -173,6 +173,6 @@ public:
         return 0;
     }
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
-#endif
+#endif // DISTRIBUTED_CAMERA_TEST_COMMON_H

camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback.cpp

@@ -27,5 +27,5 @@ void DCameraDeviceCallback::OnResult(uint64_t timestamp, const std::shared_ptr<C
 {
     DHLOGW("DCameraDeviceCallback::OnResult enter.");
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback.h

@@ -30,6 +30,6 @@ public:
     virtual void OnError(ErrorType type, int32_t errorMsg) override;
     virtual void OnResult(uint64_t timestamp, const std::shared_ptr<CameraStandard::CameraMetadata> &result) override;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_CAMERA_DEVICE_CALLBACK_H

camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback_stub.cpp

@@ -62,5 +62,5 @@ int32_t DCameraDeviceCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel
     }
     return 0;
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback_stub.h

@@ -31,6 +31,6 @@ public:
     int32_t OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply,
                             MessageOption &option) override;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_CAMERA_DEVICE_CALLBACK_CLIENT_STUB_H

camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_proxy.cpp

@@ -205,5 +205,5 @@ void DCameraDeviceProxy::Close()
         DHLOGE("SendRequest failed, error code is %d.", ret);
     }
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_proxy.h

@@ -48,6 +48,6 @@ private:
 
     static inline BrokerDelegator<DCameraDeviceProxy> delegator_;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_CAMERA_DEVICE_CLIENT_PROXY_H

camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback.cpp

@@ -32,5 +32,5 @@ void DCameraHostCallback::OnCameraEvent(const std::string &cameraId, CameraEvent
 {
     DHLOGW("DCameraHostCallback::OnCameraEvent enter.");
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback.h

@@ -31,6 +31,6 @@ public:
     virtual void OnFlashlightStatus(const std::string &cameraId, FlashlightStatus status) override;
     virtual void OnCameraEvent(const std::string &cameraId, CameraEvent event) override;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_CAMERA_HOST_CALLBACK_H

camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback_stub.cpp

@@ -71,5 +71,5 @@ int32_t DCameraHostCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &d
     }
     return 0;
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback_stub.h

@@ -31,6 +31,6 @@ public:
     int32_t OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply,
                             MessageOption &option) override;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_CAMERA_HOST_CALLBACK_CLIENT_STUB_H

camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_proxy.cpp

@@ -207,5 +207,5 @@ CamRetCode DCameraHostProxy::SetFlashlight(const std::string &cameraId, bool &is
     }
     return static_cast<CamRetCode>(reply.ReadInt32());
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_proxy.h

@@ -45,6 +45,6 @@ private:
 
     static inline BrokerDelegator<DCameraHostProxy> delegator_;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_CAMERA_HOST_CLIENT_PROXY_H

camera_hdf/interfaces/hdi_ipc/client/operator/doffline_stream_operator_proxy.cpp

@@ -87,5 +87,5 @@ CamRetCode DOfflineStreamOperatorProxy::Release()
     }
     return static_cast<CamRetCode>(reply.ReadInt32());
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/client/operator/doffline_stream_operator_proxy.h

@@ -39,6 +39,6 @@ private:
 
     static inline BrokerDelegator<DOfflineStreamOperatorProxy> delegator_;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_OFFLINE_STREAM_OPERATOR_CLIENT_PROXY_H

camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback.cpp

@@ -40,5 +40,5 @@ void DStreamOperatorCallback::OnFrameShutter(int32_t captureId, const std::vecto
 {
     DHLOGW("DStreamOperatorCallback::OnFrameShutter enter.");
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback.h

@@ -35,6 +35,6 @@ public:
     virtual void OnFrameShutter(int32_t captureId,
                                 const std::vector<int32_t> &streamId, uint64_t timestamp) override;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_STREAM_OPERATOR_CALLBACK_H

camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback_stub.cpp

@@ -148,5 +148,5 @@ int32_t DStreamOperatorCallbackStub::OnFrameShutterStub(MessageParcel &data, Mes
     OnFrameShutter(captureId, streamIds, timestamp);
     return HDF_SUCCESS;
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback_stub.h

@@ -36,6 +36,6 @@ private:
     int32_t OnCaptureErrorStub(MessageParcel &data, MessageParcel &reply, MessageOption &option);
     int32_t OnFrameShutterStub(MessageParcel &data, MessageParcel &reply, MessageOption &option);
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_STREAM_OPERATOR_CALLBACK_CLIENT_STUB_H

camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.cpp

@@ -384,5 +384,5 @@ CamRetCode DStreamOperatorProxy::ChangeToOfflineStream(
     offlineOperator = OHOS::iface_cast<IOfflineStreamOperator>(remoteObj);
     return retCode;
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.h

@@ -60,6 +60,6 @@ private:
 
     static inline BrokerDelegator<DStreamOperatorProxy> delegator_;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_STREAM_OPERATOR_CLIENT_PROXY_H

camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_callback.cpp

@@ -63,5 +63,5 @@ DCamRetCode DCameraProviderCallback::UpdateSettings(const std::shared_ptr<DHBase
     DHLOGW("DCameraProviderCallback::UpdateSettings enter.");
     return DCamRetCode::SUCCESS;
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_callback.h

@@ -38,6 +38,6 @@ public:
     virtual DCamRetCode UpdateSettings(const std::shared_ptr<DHBase> &dhBase,
                                        const std::vector<std::shared_ptr<DCameraSettings>> &settings) override;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_CAMERA_PROVIDER_CALLBACK_H

camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_callback_stub.cpp

@@ -251,5 +251,5 @@ int32_t DCameraProviderCallbackStub::DCProviderUpdateSettingsStub(MessageParcel
     }
     return HDF_SUCCESS;
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_callback_stub.h

@@ -39,6 +39,6 @@ private:
     int32_t DCProviderStopCaptureStub(MessageParcel &data, MessageParcel &reply, MessageOption &option);
     int32_t DCProviderUpdateSettingsStub(MessageParcel &data, MessageParcel &reply, MessageOption &option);
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_CAMERA_PROVIDER_CALLBACK_CLIENT_STUB_H

camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_proxy.cpp

@@ -328,5 +328,5 @@ void DCameraProviderProxy::DCameraMemoryUnmap(BufferHandle *buffer)
     buffer->virAddr = nullptr;
     FreeBufferHandle(buffer);
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_proxy.h

@@ -54,6 +54,6 @@ private:
 
     static inline BrokerDelegator<DCameraProviderProxy> delegator_;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_CAMERA_PROVIDER_CLIENT_PROXY_H

camera_hdf/interfaces/hdi_ipc/config/host/dcamera_host_config.cpp

@@ -83,10 +83,10 @@ struct HdfDriverEntry g_dCameraHostDriverEntry = {
 
 #ifndef __cplusplus
 extern "C" {
-#endif
+#endif // __cplusplus
 
 HDF_INIT(g_dCameraHostDriverEntry);
 
 #ifndef __cplusplus
 }
-#endif
+#endif // __cplusplus

camera_hdf/interfaces/hdi_ipc/config/provider/dcamera_provider_config.cpp

@@ -84,10 +84,10 @@ struct HdfDriverEntry g_dCameraProviderConfigEntry = {
 
 #ifndef __cplusplus
 extern "C" {
-#endif
+#endif // __cplusplus
 
 HDF_INIT(g_dCameraProviderConfigEntry);
 
 #ifndef __cplusplus
 }
-#endif
+#endif // __cplusplus

camera_hdf/interfaces/hdi_ipc/ipc_data_utils.h

@@ -102,6 +102,6 @@ public:
         pEvent->content_ = parcel.ReadString();
     }
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // HDI_IPC_DATA_UTILS_H

camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.cpp

@@ -85,5 +85,5 @@ void DCameraDeviceCallbackProxy::OnResult(uint64_t timestamp,
         return;
     }
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.h

@@ -35,6 +35,6 @@ public:
 private:
     static inline BrokerDelegator<DCameraDeviceCallbackProxy> delegator_;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_CAMERA_DEVICE_CALLBACK_PROXY_H

camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_stub.cpp

@@ -232,5 +232,5 @@ int32_t DCameraDeviceStub::DCDeviceStubClose(MessageParcel& data, MessageParcel&
     Close();
     return HDF_SUCCESS;
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_stub.h

@@ -39,6 +39,6 @@ private:
     int32_t DCDeviceStubDisableResult(MessageParcel& data, MessageParcel& reply, MessageOption& option);
     int32_t DCDeviceStubClose(MessageParcel& data, MessageParcel& reply, MessageOption& option);
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_CAMERA_DEVICE_SERVER_STUB_H

camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_callback_proxy.cpp

@@ -104,5 +104,5 @@ void DCameraHostCallbackProxy::OnCameraEvent(const std::string &cameraId, Camera
         DHLOGE("SendRequest failed, error code is %d.", ret);
     }
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_callback_proxy.h

@@ -36,6 +36,6 @@ public:
 private:
     static inline BrokerDelegator<DCameraHostCallbackProxy> delegator_;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_CAMERA_HOST_CALLBACK_PROXY_H

camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.cpp

@@ -211,8 +211,8 @@ int32_t DCameraHostStub::OnRemoteRequest(int cmdId, MessageParcel &data,
     }
     return HDF_SUCCESS;
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 
 void *DCameraHostStubInstance()
 {

camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.h

@@ -57,8 +57,8 @@ private:
 private:
     std::shared_ptr<DCameraHost> dcameraHost_ = nullptr;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 
 void* DCameraHostStubInstance();
 

camera_hdf/interfaces/hdi_ipc/server/operator/doffline_stream_operator_stub.cpp

@@ -104,5 +104,5 @@ int32_t DOfflineStreamOperatorStub::DOfflineStreamOperatorStubRelease(MessagePar
     }
     return HDF_SUCCESS;
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/server/operator/doffline_stream_operator_stub.h

@@ -34,6 +34,6 @@ public:
     int32_t DOfflineStreamOperatorStubReleaseStreams(MessageParcel &data, MessageParcel &reply, MessageOption &option);
     int32_t DOfflineStreamOperatorStubRelease(MessageParcel &data, MessageParcel &reply, MessageOption &option);
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_OFFLINE_STREAM_OPERATOR_SERVER_STUB_H

camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_callback_proxy.cpp

@@ -159,5 +159,5 @@ void DStreamOperatorCallbackProxy::OnFrameShutter(int32_t captureId,
         DHLOGE("SendRequest failed, error code is %d.", ret);
     }
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_callback_proxy.h

@@ -40,6 +40,6 @@ public:
 private:
     static inline BrokerDelegator<DStreamOperatorCallbackProxy> delegator_;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_STREAM_OPERATOR_CALLBACK_PROXY_H

camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.cpp

@@ -352,5 +352,5 @@ int32_t DStreamOperatorStub::DStreamOperatorStubChangeToOfflineStream(MessagePar
     }
     return HDF_SUCCESS;
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.h

@@ -42,6 +42,6 @@ private:
     int32_t DStreamOperatorStubCancelCapture(MessageParcel &data, MessageParcel &reply, MessageOption &option);
     int32_t DStreamOperatorStubChangeToOfflineStream(MessageParcel &data, MessageParcel &reply, MessageOption &option);
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_STREAM_OPERATOR_SERVER_STUB_H

camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_callback_proxy.cpp

@@ -263,5 +263,5 @@ DCamRetCode DCameraProviderCallbackProxy::UpdateSettings(const std::shared_ptr<D
     }
     return static_cast<DCamRetCode>(reply.ReadInt32());
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS

camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_callback_proxy.h

@@ -43,6 +43,6 @@ public:
 private:
     static inline BrokerDelegator<DCameraProviderCallbackProxy> delegator_;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 #endif // DISTRIBUTED_CAMERA_PROVIDER_CALLBACK_PROXY_H

camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.cpp

@@ -244,8 +244,8 @@ int32_t DCameraProviderStub::OnRemoteRequest(uint32_t code, MessageParcel& data,
     }
     return ret;
 }
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 
 void *DCameraProviderStubInstance()
 {

camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.h

@@ -48,8 +48,8 @@ private:
 private:
     std::shared_ptr<DCameraProvider> dcameraProvider_ = nullptr;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
 
 void* DCameraProviderStubInstance();
 

camera_hdf/interfaces/include/idistributed_camera_provider.h

@@ -158,7 +158,6 @@ public:
     virtual DCamRetCode Notify(const std::shared_ptr<DHBase> &dhBase,
         const std::shared_ptr<DCameraHDFEvent> &event) = 0;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
-
 #endif // HDI_DISTRIBUTED_CAMERA_PROVIDER_H

camera_hdf/interfaces/include/idistributed_camera_provider_callback.h

@@ -155,7 +155,6 @@ public:
     virtual DCamRetCode UpdateSettings(const std::shared_ptr<DHBase> &dhBase,
         const std::vector<std::shared_ptr<DCameraSettings>> &settings) = 0;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
-
 #endif // HDI_DISTRIBUTED_CAMERA_PROVIDER_CALLBACK_H

camera_hdf/interfaces/include/types.h

@@ -301,7 +301,6 @@ using DCameraHDFEvent = struct _DCameraHDFEvent {
      */
     std::string content_;
 };
-} // end namespace DistributedHardware
+} // namespace DistributedHardware
-} // end namespace OHOS
+} // namespace OHOS
-
 #endif // DISTRIBUTED_CAMERA_PROVIDER_TYPES_H

common/include/utils/data_buffer.h

@@ -55,6 +55,6 @@ private:
     DataBuffer(const DataBuffer &) = delete;
     DataBuffer &operator = (const DataBuffer &) = delete;
 };
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS
-#endif
+#endif // OHOS_DATA_BUFFER_H

common/include/utils/dcamera_index.h

@@ -38,6 +38,6 @@ public:
     std::string devId_;
     std::string dhId_;
 };
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS
-#endif
+#endif // OHOS_DCAMERA_INDEX_H

common/include/utils/dcamera_utils_tools.h

@@ -30,6 +30,6 @@ int64_t GetNowTimeStampUs();
 std::string Base64Encode(const unsigned char *toEncode, unsigned int len);
 std::string Base64Decode(const std::string& basicString);
 bool IsBase64(unsigned char c);
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS
-#endif
+#endif // OHOS_DCAMERA_UTILS_TOOL_H

common/src/utils/data_buffer.cpp

@@ -115,5 +115,5 @@ DataBuffer::~DataBuffer()
         data_ = nullptr;
     }
 }
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS

common/src/utils/dcamera_utils_tools.cpp

@@ -153,5 +153,5 @@ bool IsBase64(unsigned char c)
 {
     return (isalnum(c) || (c == '+') || (c == '/'));
 }
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS

interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn

@@ -57,4 +57,3 @@ ohos_shared_library("distributed_camera_sink_sdk") {
 
   part_name = "distributed_camera"
 }
-

interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler_ipc.h

@@ -48,6 +48,6 @@ private:
     std::shared_ptr<AppExecFwk::EventHandler> serviceHandler_;
     std::mutex initDmsLock_;
 };
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS
-#endif
+#endif // OHOS_DCAMERA_SINK_HANDLER_IPC_H

interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler_ipc.cpp

@@ -155,5 +155,5 @@ void DCameraSinkHandlerIpc::OnSinkLocalDmsDied(const sptr<IRemoteObject>& remote
     }
     localSink_ = nullptr;
 }
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS

interfaces/inner_kits/native_cpp/camera_source/BUILD.gn

@@ -60,4 +60,3 @@ ohos_shared_library("distributed_camera_source_sdk") {
 
   part_name = "distributed_camera"
 }
-

interfaces/inner_kits/native_cpp/camera_source/include/callback/dcamera_source_callback.h

@@ -41,6 +41,6 @@ private:
     std::map<std::string, std::shared_ptr<RegisterCallback>> regCallbacks_;
     std::map<std::string, std::shared_ptr<UnregisterCallback>> unregCallbacks_;
 };
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS
-#endif
+#endif // OHOS_DCAMERA_SOURCE_CALLBACK_H

interfaces/inner_kits/native_cpp/camera_source/include/callback/dcamera_source_callback_stub.h

@@ -36,6 +36,6 @@ private:
     using DCameraFunc = int32_t (DCameraSourceCallbackStub::*)(MessageParcel &data, MessageParcel &reply);
     std::map<uint32_t, DCameraFunc> memberFuncMap_;
 };
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS
-#endif
+#endif // OHOS_DCAMERA_SOURCE_CALLBACK_STUB_H

interfaces/inner_kits/native_cpp/camera_source/include/callback/idcamera_source_callback.h

@@ -34,6 +34,6 @@ public:
     virtual int32_t OnNotifyUnregResult(const std::string& devId, const std::string& dhId, const std::string& reqId,
         int32_t status, std::string& data) = 0;
 };
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS
-#endif
+#endif // OHOS_IDCAMERA_SOURCE_CALLBACL_H

interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler.h

@@ -51,11 +51,11 @@ private:
 
 #ifdef __cplusplus
 extern "C" {
-#endif
+#endif // __cplusplus
 __attribute__((visibility("default"))) IDistributedHardwareSource *GetSourceHardwareHandler();
 #ifdef __cplusplus
 }
-#endif
+#endif // __cplusplus
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS
-#endif
+#endif // OHOS_DCAMERA_SOURCE_HANDLER_H

interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler_ipc.h

@@ -48,6 +48,6 @@ private:
     std::shared_ptr<AppExecFwk::EventHandler> serviceHandler_;
     std::mutex initDmsLock_;
 };
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS
-#endif
+#endif // OHOS_DCAMERA_SOURCE_HANDLER_IPC_H

interfaces/inner_kits/native_cpp/camera_source/include/distributed_camera_source_proxy.h

@@ -44,7 +44,6 @@ public:
 private:
     static inline BrokerDelegator<DistributedCameraSourceProxy> delegator_;
 };
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS
-
+#endif // OHOS_DISTRIBUTED_CAMERA_SOURCE_PROXY_H
-#endif

interfaces/inner_kits/native_cpp/camera_source/include/idistributed_camera_source.h

@@ -43,6 +43,6 @@ public:
         const std::string& reqId) = 0;
     virtual int32_t DCameraNotify(const std::string& devId, const std::string& dhId, std::string& events) = 0;
 };
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS
-#endif
+#endif // OHOS_IDISTRIBUTED_CAMERA_SOURCE_H

interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback.cpp

@@ -86,5 +86,5 @@ void DCameraSourceCallback::PopUnregCallback(std::string& reqId)
 {
     unregCallbacks_.erase(reqId);
 }
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS

interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp

@@ -78,5 +78,5 @@ int32_t DCameraSourceCallbackStub::NotifyUnregResultInner(MessageParcel &data, M
     reply.WriteInt32(ret);
     return ret;
 }
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS

interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp

@@ -122,5 +122,5 @@ IDistributedHardwareSource *GetSourceHardwareHandler()
     DHLOGI("DCameraSourceHandler GetSourceHardwareHandler Start");
     return &DCameraSourceHandler::GetInstance();
 }
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS

interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler_ipc.cpp

@@ -155,5 +155,5 @@ void DCameraSourceHandlerIpc::OnSourceLocalDmsDied(const sptr<IRemoteObject>& re
     }
     localSource_ = nullptr;
 }
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS

interfaces/inner_kits/native_cpp/camera_source/src/distributed_camera_source_proxy.cpp

@@ -156,5 +156,5 @@ int32_t DistributedCameraSourceProxy::DCameraNotify(const std::string& devId, co
     int32_t result = reply.ReadInt32();
     return result;
 }
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS

services/cameraservice/base/include/dcamera_capture_info_cmd.h

@@ -49,6 +49,6 @@ private:
     int32_t UmarshalValue(Json::Value& rootValue);
     int32_t UmarshalSettings(Json::Value& valueJson, std::shared_ptr<DCameraCaptureInfo>& captureInfo);
 };
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS
-#endif
+#endif // OHOS_DCAMERA_CAPTURE_INFO_H

services/cameraservice/base/include/dcamera_channel_info_cmd.h

@@ -52,6 +52,6 @@ public:
     int32_t Marshal(std::string& jsonStr);
     int32_t Unmarshal(const std::string& jsonStr);
 };
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS
-#endif
+#endif // OHOS_DCAMERA_CHANNEL_INFO_H

services/cameraservice/base/include/dcamera_event_cmd.h

@@ -39,6 +39,6 @@ public:
     int32_t Marshal(std::string& jsonStr);
     int32_t Unmarshal(const std::string& jsonStr);
 };
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS
-#endif
+#endif // OHOS_DCAMERA_EVENT_H

services/cameraservice/base/include/dcamera_info_cmd.h

@@ -43,6 +43,6 @@ public:
     int32_t Marshal(std::string& jsonStr);
     int32_t Unmarshal(const std::string& jsonStr);
 };
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS
-#endif
+#endif // OHOS_DCAMERA_INFO_H

services/cameraservice/base/include/dcamera_metadata_setting_cmd.h

@@ -31,6 +31,6 @@ public:
     int32_t Marshal(std::string& jsonStr);
     int32_t Unmarshal(const std::string& jsonStr);
 };
-}
+} // namespace DistributedHardware
-}
+} // namespace OHOS
-#endif
+#endif // OHOS_DCAMERA_METADATA_SETTING_H