From 46b7caab1e13b71cf6a1d4cefc01a34de993fd3b Mon Sep 17 00:00:00 2001 From: zhuxu Date: Tue, 22 Mar 2022 15:59:17 +0800 Subject: [PATCH 1/2] fix issues Signed-off-by: zhuxu --- LICENSE | 1 - .../hdi_impl/include/dcamera_device/dcamera_device.h | 5 ++--- .../include/dcamera_device/dmetadata_processor.h | 5 ++--- .../hdi_impl/include/dcamera_host/dcamera_host.h | 4 ++-- .../include/dcamera_provider/dcamera_provider.h | 4 ++-- .../include/dstream_operator/dbuffer_manager.h | 4 ++-- .../hdi_impl/include/dstream_operator/dcamera_steam.h | 4 ++-- .../hdi_impl/include/dstream_operator/dimage_buffer.h | 4 ++-- .../dstream_operator/doffline_stream_operator.h | 5 ++--- .../include/dstream_operator/dstream_operator.h | 5 ++--- camera_hdf/hdi_impl/include/utils/constants.h | 6 +++--- camera_hdf/hdi_impl/include/utils/dcamera.h | 7 +++---- .../hdi_impl/src/dcamera_device/dcamera_device.cpp | 4 ++-- .../src/dcamera_device/dmetadata_processor.cpp | 4 ++-- camera_hdf/hdi_impl/src/dcamera_host/dcamera_host.cpp | 4 ++-- .../hdi_impl/src/dcamera_provider/dcamera_provider.cpp | 4 ++-- .../hdi_impl/src/dstream_operator/dbuffer_manager.cpp | 4 ++-- .../hdi_impl/src/dstream_operator/dcamera_steam.cpp | 4 ++-- .../hdi_impl/src/dstream_operator/dimage_buffer.cpp | 4 ++-- .../src/dstream_operator/doffline_stream_operator.cpp | 4 ++-- .../hdi_impl/src/dstream_operator/dstream_operator.cpp | 4 ++-- camera_hdf/hdi_impl/src/utils/dcamera.cpp | 4 ++-- camera_hdf/hdi_impl/test/common.cpp | 4 ++-- camera_hdf/hdi_impl/test/common.h | 6 +++--- .../hdi_ipc/client/device/dcamera_device_callback.cpp | 4 ++-- .../hdi_ipc/client/device/dcamera_device_callback.h | 4 ++-- .../client/device/dcamera_device_callback_stub.cpp | 4 ++-- .../client/device/dcamera_device_callback_stub.h | 4 ++-- .../hdi_ipc/client/device/dcamera_device_proxy.cpp | 4 ++-- .../hdi_ipc/client/device/dcamera_device_proxy.h | 4 ++-- .../hdi_ipc/client/host/dcamera_host_callback.cpp | 4 ++-- .../hdi_ipc/client/host/dcamera_host_callback.h | 4 ++-- .../hdi_ipc/client/host/dcamera_host_callback_stub.cpp | 4 ++-- .../hdi_ipc/client/host/dcamera_host_callback_stub.h | 4 ++-- .../hdi_ipc/client/host/dcamera_host_proxy.cpp | 4 ++-- .../hdi_ipc/client/host/dcamera_host_proxy.h | 4 ++-- .../client/operator/doffline_stream_operator_proxy.cpp | 4 ++-- .../client/operator/doffline_stream_operator_proxy.h | 4 ++-- .../client/operator/dstream_operator_callback.cpp | 4 ++-- .../client/operator/dstream_operator_callback.h | 4 ++-- .../client/operator/dstream_operator_callback_stub.cpp | 4 ++-- .../client/operator/dstream_operator_callback_stub.h | 4 ++-- .../hdi_ipc/client/operator/dstream_operator_proxy.cpp | 4 ++-- .../hdi_ipc/client/operator/dstream_operator_proxy.h | 4 ++-- .../client/provider/dcamera_provider_callback.cpp | 4 ++-- .../client/provider/dcamera_provider_callback.h | 4 ++-- .../client/provider/dcamera_provider_callback_stub.cpp | 4 ++-- .../client/provider/dcamera_provider_callback_stub.h | 4 ++-- .../hdi_ipc/client/provider/dcamera_provider_proxy.cpp | 4 ++-- .../hdi_ipc/client/provider/dcamera_provider_proxy.h | 4 ++-- .../hdi_ipc/config/host/dcamera_host_config.cpp | 4 ++-- .../config/provider/dcamera_provider_config.cpp | 4 ++-- camera_hdf/interfaces/hdi_ipc/ipc_data_utils.h | 4 ++-- .../server/device/dcamera_device_callback_proxy.cpp | 4 ++-- .../server/device/dcamera_device_callback_proxy.h | 4 ++-- .../hdi_ipc/server/device/dcamera_device_stub.cpp | 4 ++-- .../hdi_ipc/server/device/dcamera_device_stub.h | 4 ++-- .../server/host/dcamera_host_callback_proxy.cpp | 4 ++-- .../hdi_ipc/server/host/dcamera_host_callback_proxy.h | 4 ++-- .../hdi_ipc/server/host/dcamera_host_stub.cpp | 4 ++-- .../interfaces/hdi_ipc/server/host/dcamera_host_stub.h | 4 ++-- .../server/operator/doffline_stream_operator_stub.cpp | 4 ++-- .../server/operator/doffline_stream_operator_stub.h | 4 ++-- .../operator/dstream_operator_callback_proxy.cpp | 4 ++-- .../server/operator/dstream_operator_callback_proxy.h | 4 ++-- .../hdi_ipc/server/operator/dstream_operator_stub.cpp | 4 ++-- .../hdi_ipc/server/operator/dstream_operator_stub.h | 4 ++-- .../provider/dcamera_provider_callback_proxy.cpp | 4 ++-- .../server/provider/dcamera_provider_callback_proxy.h | 4 ++-- .../hdi_ipc/server/provider/dcamera_provider_stub.cpp | 4 ++-- .../hdi_ipc/server/provider/dcamera_provider_stub.h | 4 ++-- .../interfaces/include/idistributed_camera_provider.h | 5 ++--- .../include/idistributed_camera_provider_callback.h | 5 ++--- camera_hdf/interfaces/include/types.h | 5 ++--- common/include/utils/data_buffer.h | 6 +++--- common/include/utils/dcamera_index.h | 6 +++--- common/include/utils/dcamera_utils_tools.h | 6 +++--- common/src/utils/data_buffer.cpp | 4 ++-- common/src/utils/dcamera_utils_tools.cpp | 4 ++-- interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn | 1 - .../camera_sink/include/dcamera_sink_handler_ipc.h | 6 +++--- .../camera_sink/src/dcamera_sink_handler_ipc.cpp | 4 ++-- .../inner_kits/native_cpp/camera_source/BUILD.gn | 1 - .../include/callback/dcamera_source_callback.h | 6 +++--- .../include/callback/dcamera_source_callback_stub.h | 6 +++--- .../include/callback/idcamera_source_callback.h | 6 +++--- .../camera_source/include/dcamera_source_handler.h | 10 +++++----- .../camera_source/include/dcamera_source_handler_ipc.h | 6 +++--- .../include/distributed_camera_source_proxy.h | 7 +++---- .../camera_source/include/idistributed_camera_source.h | 6 +++--- .../src/callback/dcamera_source_callback.cpp | 4 ++-- .../src/callback/dcamera_source_callback_stub.cpp | 4 ++-- .../camera_source/src/dcamera_source_handler.cpp | 4 ++-- .../camera_source/src/dcamera_source_handler_ipc.cpp | 4 ++-- .../src/distributed_camera_source_proxy.cpp | 4 ++-- .../base/include/dcamera_capture_info_cmd.h | 6 +++--- .../base/include/dcamera_channel_info_cmd.h | 6 +++--- .../cameraservice/base/include/dcamera_event_cmd.h | 6 +++--- services/cameraservice/base/include/dcamera_info_cmd.h | 6 +++--- .../base/include/dcamera_metadata_setting_cmd.h | 6 +++--- .../cameraservice/base/include/dcamera_open_info_cmd.h | 6 +++--- services/cameraservice/base/include/dcamera_protocol.h | 6 +++--- .../cameraservice/base/include/icamera_controller.h | 7 ++++--- .../base/src/dcamera_capture_info_cmd.cpp | 4 ++-- .../base/src/dcamera_channel_info_cmd.cpp | 4 ++-- services/cameraservice/base/src/dcamera_event_cmd.cpp | 4 ++-- services/cameraservice/base/src/dcamera_info_cmd.cpp | 4 ++-- .../base/src/dcamera_metadata_setting_cmd.cpp | 4 ++-- .../cameraservice/base/src/dcamera_open_info_cmd.cpp | 4 ++-- .../common/dcameraprotocol/dcamera_protocol_test.cpp | 4 ++-- .../cameraoperator/handler/include/dcamera_handler.h | 4 ++-- .../distributedcameramgr/dcamera_sink_service_ipc.h | 6 +++--- .../distributedcameramgr/dcamera_sink_service_ipc.cpp | 4 ++-- .../common/distributedcameramgr/mock_camera_channel.h | 3 +-- .../common/distributedcameramgr/mock_camera_operator.h | 3 +-- .../distributedcameramgr/mock_data_process_pipeline.h | 3 +-- .../mock_dcamera_sink_controller.h | 3 +-- .../mock_dcamera_sink_data_process.h | 3 +-- .../distributedcameramgr/mock_dcamera_sink_output.h | 3 +-- .../distributedcamera/dcamera_service_state_listener.h | 6 +++--- .../distributedcamera/dcamera_source_callback_proxy.h | 6 +++--- .../distributed_camera_source_service.h | 7 +++---- .../distributedcamera/distributed_camera_source_stub.h | 7 +++---- .../include/distributedcameramgr/dcamera_source_dev.h | 6 +++--- .../distributedcameramgr/dcamera_source_event.h | 6 +++--- .../distributedcameramgr/dcamera_source_service_ipc.h | 6 +++--- .../dcameracontrol/dcamera_source_controller.h | 6 +++--- .../dcamera_source_controller_channel_listener.h | 6 +++--- .../dcameradata/dcamera_source_data_process.h | 6 +++--- .../dcameradata/dcamera_source_input.h | 6 +++--- .../dcamera_source_input_channel_listener.h | 6 +++--- .../dcameradata/dcamera_stream_data_process.h | 6 +++--- .../dcamera_stream_data_process_pipeline_listener.h | 6 +++--- .../dcameradata/dcamera_stream_data_process_producer.h | 6 +++--- .../dcamerahdf/dcamera_provider_callback_impl.h | 6 +++--- .../dcamerainterface/icamera_input.h | 6 +++--- .../dcamerainterface/icamera_source_data_process.h | 6 +++--- .../dcamerainterface/icamera_state_listener.h | 6 +++--- .../dcamerastate/dcamera_source_capture_state.h | 6 +++--- .../dcamerastate/dcamera_source_config_stream_state.h | 6 +++--- .../dcamerastate/dcamera_source_init_state.h | 6 +++--- .../dcamerastate/dcamera_source_opened_state.h | 6 +++--- .../dcamerastate/dcamera_source_regist_state.h | 6 +++--- .../dcamerastate/dcamera_source_state.h | 6 +++--- .../dcamerastate/dcamera_source_state_factory.h | 6 +++--- .../dcamerastate/dcamera_source_state_machine.h | 6 +++--- .../dcamera_service_state_listener.cpp | 4 ++-- .../dcamera_source_callback_proxy.cpp | 4 ++-- .../distributed_camera_source_service.cpp | 4 ++-- .../distributed_camera_source_stub.cpp | 4 ++-- .../src/distributedcameramgr/dcamera_source_dev.cpp | 4 ++-- .../src/distributedcameramgr/dcamera_source_event.cpp | 4 ++-- .../dcamera_source_service_ipc.cpp | 4 ++-- .../dcameracontrol/dcamera_source_controller.cpp | 4 ++-- .../dcamera_source_controller_channel_listener.cpp | 4 ++-- .../dcameradata/dcamera_source_data_process.cpp | 4 ++-- .../dcameradata/dcamera_source_input.cpp | 4 ++-- .../dcamera_source_input_channel_listener.cpp | 4 ++-- .../dcameradata/dcamera_stream_data_process.cpp | 4 ++-- .../dcamera_stream_data_process_pipeline_listener.cpp | 4 ++-- .../dcamera_stream_data_process_producer.cpp | 4 ++-- .../dcamerahdf/dcamera_provider_callback_impl.cpp | 4 ++-- .../dcamerastate/dcamera_source_capture_state.cpp | 4 ++-- .../dcamera_source_config_stream_state.cpp | 4 ++-- .../dcamerastate/dcamera_source_init_state.cpp | 4 ++-- .../dcamerastate/dcamera_source_opened_state.cpp | 4 ++-- .../dcamerastate/dcamera_source_regist_state.cpp | 4 ++-- .../dcamerastate/dcamera_source_state_factory.cpp | 4 ++-- .../dcamerastate/dcamera_source_state_machine.cpp | 4 ++-- .../dcamera_source_state_machine_test.cpp | 4 ++-- .../distributedcameramgr/mock_dcamera_source_dev.h | 3 +-- .../mock_dcamera_source_state_listener.h | 6 +++--- services/channel/include/dcamera_channel_sink_impl.h | 6 +++--- services/channel/include/dcamera_channel_source_impl.h | 6 +++--- services/channel/include/dcamera_softbus_adapter.h | 6 +++--- services/channel/include/dcamera_softbus_session.h | 6 +++--- services/channel/include/icamera_channel.h | 6 +++--- services/channel/include/icamera_channel_listener.h | 6 +++--- services/channel/src/dcamera_channel_sink_impl.cpp | 4 ++-- services/channel/src/dcamera_channel_source_impl.cpp | 4 ++-- services/channel/src/dcamera_softbus_adapter.cpp | 4 ++-- services/channel/src/dcamera_softbus_session.cpp | 4 ++-- .../include/eventbus/dcamera_codec_event.h | 6 +++--- .../include/eventbus/dcamera_pipeline_event.h | 6 +++--- .../include/interfaces/data_process_listener.h | 6 +++--- .../include/interfaces/idata_process_pipeline.h | 6 +++--- .../include/pipeline/abstract_data_process.h | 6 +++--- .../include/pipeline/dcamera_pipeline_sink.h | 6 +++--- .../include/pipeline/dcamera_pipeline_source.h | 6 +++--- .../colorspace_conversion/convert_nv12_to_nv21.h | 6 +++--- .../fpscontroller/fps_controller_process.h | 6 +++--- .../multimedia_codec/decode_data_process.h | 6 +++--- .../multimedia_codec/decode_video_callback.h | 6 +++--- .../multimedia_codec/encode_data_process.h | 6 +++--- .../multimedia_codec/encode_video_callback.h | 6 +++--- .../data_process/include/utils/image_common_type.h | 6 +++--- .../src/pipeline/abstract_data_process.cpp | 4 ++-- .../src/pipeline/dcamera_pipeline_sink.cpp | 4 ++-- .../src/pipeline/dcamera_pipeline_source.cpp | 4 ++-- .../colorspace_conversion/convert_nv12_to_nv21.cpp | 4 ++-- .../fpscontroller/fps_controller_process.cpp | 4 ++-- .../multimedia_codec/decode_data_process.cpp | 4 ++-- .../multimedia_codec/decode_data_process_common.cpp | 4 ++-- .../multimedia_codec/decode_video_callback.cpp | 4 ++-- .../multimedia_codec/encode_data_process.cpp | 4 ++-- .../multimedia_codec/encode_data_process_common.cpp | 4 ++-- .../multimedia_codec/encode_video_callback.cpp | 4 ++-- services/data_process/src/utils/image_common_type.cpp | 4 ++-- 208 files changed, 477 insertions(+), 497 deletions(-) diff --git a/LICENSE b/LICENSE index e454a525..f433b1a5 100644 --- a/LICENSE +++ b/LICENSE @@ -175,4 +175,3 @@ of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS - diff --git a/camera_hdf/hdi_impl/include/dcamera_device/dcamera_device.h b/camera_hdf/hdi_impl/include/dcamera_device/dcamera_device.h index 9a42c19f..49b1f32e 100644 --- a/camera_hdf/hdi_impl/include/dcamera_device/dcamera_device.h +++ b/camera_hdf/hdi_impl/include/dcamera_device/dcamera_device.h @@ -78,7 +78,6 @@ private: bool isOpenSessFailed_ = false; std::mutex isOpenSessFailedlock_; }; -} // end namespace DistributedHardware -} // end namespace OHOS - +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_DEVICE_H \ No newline at end of file diff --git a/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h b/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h index c434ae6a..8630380a 100644 --- a/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h +++ b/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 -} // end namespace OHOS - +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_METADATA_PROCESSOR_H \ No newline at end of file diff --git a/camera_hdf/hdi_impl/include/dcamera_host/dcamera_host.h b/camera_hdf/hdi_impl/include/dcamera_host/dcamera_host.h index b9947727..b8429fc4 100644 --- a/camera_hdf/hdi_impl/include/dcamera_host/dcamera_host.h +++ b/camera_hdf/hdi_impl/include/dcamera_host/dcamera_host.h @@ -77,6 +77,6 @@ private: std::map dhBaseHashDCamIdMap_; std::map> dCameraDeviceMap_; }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_HOST_H \ No newline at end of file diff --git a/camera_hdf/hdi_impl/include/dcamera_provider/dcamera_provider.h b/camera_hdf/hdi_impl/include/dcamera_provider/dcamera_provider.h index 24fe1d21..7a25f388 100644 --- a/camera_hdf/hdi_impl/include/dcamera_provider/dcamera_provider.h +++ b/camera_hdf/hdi_impl/include/dcamera_provider/dcamera_provider.h @@ -74,6 +74,6 @@ private: static AutoRelease autoRelease_; static std::shared_ptr instance_; }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_PROVIDER_H \ No newline at end of file diff --git a/camera_hdf/hdi_impl/include/dstream_operator/dbuffer_manager.h b/camera_hdf/hdi_impl/include/dstream_operator/dbuffer_manager.h index a07d671d..a6c5a6c4 100644 --- a/camera_hdf/hdi_impl/include/dstream_operator/dbuffer_manager.h +++ b/camera_hdf/hdi_impl/include/dstream_operator/dbuffer_manager.h @@ -53,6 +53,6 @@ private: std::list> idleList_ = {}; std::list> busyList_ = {}; }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_BUFFER_MANAGER_H \ No newline at end of file diff --git a/camera_hdf/hdi_impl/include/dstream_operator/dcamera_steam.h b/camera_hdf/hdi_impl/include/dstream_operator/dcamera_steam.h index ac1d1f20..ecbceda6 100644 --- a/camera_hdf/hdi_impl/include/dstream_operator/dcamera_steam.h +++ b/camera_hdf/hdi_impl/include/dstream_operator/dcamera_steam.h @@ -69,6 +69,6 @@ private: int captureBufferCount_ = 0; bool isBufferMgrInited_ = false; }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_STREAM_H \ No newline at end of file diff --git a/camera_hdf/hdi_impl/include/dstream_operator/dimage_buffer.h b/camera_hdf/hdi_impl/include/dstream_operator/dimage_buffer.h index 00cd31c1..10134379 100644 --- a/camera_hdf/hdi_impl/include/dstream_operator/dimage_buffer.h +++ b/camera_hdf/hdi_impl/include/dstream_operator/dimage_buffer.h @@ -84,6 +84,6 @@ private: std::mutex l_; }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_IMAGE_BUFFER_H diff --git a/camera_hdf/hdi_impl/include/dstream_operator/doffline_stream_operator.h b/camera_hdf/hdi_impl/include/dstream_operator/doffline_stream_operator.h index 6dde3f15..62c6d624 100644 --- a/camera_hdf/hdi_impl/include/dstream_operator/doffline_stream_operator.h +++ b/camera_hdf/hdi_impl/include/dstream_operator/doffline_stream_operator.h @@ -35,7 +35,6 @@ public: virtual CamRetCode ReleaseStreams(const std::vector& streamIds) override; virtual CamRetCode Release() override; }; -} // end namespace DistributedHardware -} // end namespace OHOS - +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_OFFLINE_STREAM_OPERATOR_H \ No newline at end of file diff --git a/camera_hdf/hdi_impl/include/dstream_operator/dstream_operator.h b/camera_hdf/hdi_impl/include/dstream_operator/dstream_operator.h index 3885d503..dc6cdce4 100644 --- a/camera_hdf/hdi_impl/include/dstream_operator/dstream_operator.h +++ b/camera_hdf/hdi_impl/include/dstream_operator/dstream_operator.h @@ -107,7 +107,6 @@ private: OperationMode currentOperMode_ = OperationMode::NORMAL; std::shared_ptr latestStreamSetting_; }; -} // end namespace DistributedHardware -} // end namespace OHOS - +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_STREAM_OPERATOR_H diff --git a/camera_hdf/hdi_impl/include/utils/constants.h b/camera_hdf/hdi_impl/include/utils/constants.h index a9a07b88..818115cb 100644 --- a/camera_hdf/hdi_impl/include/utils/constants.h +++ b/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 -} // end namespace OHOS -#endif // DISTRIBUTED_CONSTANTS_H \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // DISTRIBUTED_CONSTANTS_H diff --git a/camera_hdf/hdi_impl/include/utils/dcamera.h b/camera_hdf/hdi_impl/include/utils/dcamera.h index de4f61a1..c6a7c82d 100644 --- a/camera_hdf/hdi_impl/include/utils/dcamera.h +++ b/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 &tokens, const std::string &delimiters); -} // end namespace DistributedHardware -} // end namespace OHOS - -#endif // DISTRIBUTED_CAMERA_H \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // DISTRIBUTED_CAMERA_H diff --git a/camera_hdf/hdi_impl/src/dcamera_device/dcamera_device.cpp b/camera_hdf/hdi_impl/src/dcamera_device/dcamera_device.cpp index 7d602127..c5c245bd 100644 --- a/camera_hdf/hdi_impl/src/dcamera_device/dcamera_device.cpp +++ b/camera_hdf/hdi_impl/src/dcamera_device/dcamera_device.cpp @@ -442,5 +442,5 @@ bool DCameraDevice::IsOpened() { return isOpened_; } -} // end namespace DistributedHardware -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp b/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp index 44fa7a12..75838fa5 100644 --- a/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp +++ b/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 -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/hdi_impl/src/dcamera_host/dcamera_host.cpp b/camera_hdf/hdi_impl/src/dcamera_host/dcamera_host.cpp index dfc23c9a..c0df9a1f 100644 --- a/camera_hdf/hdi_impl/src/dcamera_host/dcamera_host.cpp +++ b/camera_hdf/hdi_impl/src/dcamera_host/dcamera_host.cpp @@ -228,5 +228,5 @@ void DCameraHost::NotifyDCameraStatus(const std::shared_ptr &dhBase, int dCameraHostCallback_->OnCameraStatus(dCameraId, CameraStatus::UN_AVAILABLE); } } -} // end namespace DistributedHardware -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/hdi_impl/src/dcamera_provider/dcamera_provider.cpp b/camera_hdf/hdi_impl/src/dcamera_provider/dcamera_provider.cpp index 009d6fe8..6f21e2bc 100644 --- a/camera_hdf/hdi_impl/src/dcamera_provider/dcamera_provider.cpp +++ b/camera_hdf/hdi_impl/src/dcamera_provider/dcamera_provider.cpp @@ -302,5 +302,5 @@ OHOS::sptr DCameraProvider::GetDCameraDevice(const std::shared_pt } return dCameraHost->GetDCameraDeviceByDHBase(dhBase); } -} // end namespace DistributedHardware -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/hdi_impl/src/dstream_operator/dbuffer_manager.cpp b/camera_hdf/hdi_impl/src/dstream_operator/dbuffer_manager.cpp index 4514863b..0b7e38d6 100644 --- a/camera_hdf/hdi_impl/src/dstream_operator/dbuffer_manager.cpp +++ b/camera_hdf/hdi_impl/src/dstream_operator/dbuffer_manager.cpp @@ -158,5 +158,5 @@ RetCode DBufferManager::DImageBufferToDCameraBuffer(const std::shared_ptr &tokens, const tokens.push_back(str.substr(lastPos)); } } -} // end namespace DistributedHardware -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/hdi_impl/test/common.cpp b/camera_hdf/hdi_impl/test/common.cpp index 178d893b..7d604207 100644 --- a/camera_hdf/hdi_impl/test/common.cpp +++ b/camera_hdf/hdi_impl/test/common.cpp @@ -379,5 +379,5 @@ OHOS::sptr Test::StreamConsumer::CreateProducer(std::func }); return producer; } -} // end namespace DistributedHardware -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/hdi_impl/test/common.h b/camera_hdf/hdi_impl/test/common.h index 5a247638..d4f8c1e7 100644 --- a/camera_hdf/hdi_impl/test/common.h +++ b/camera_hdf/hdi_impl/test/common.h @@ -173,6 +173,6 @@ public: return 0; } }; -} // end namespace DistributedHardware -} // end namespace OHOS -#endif +} // namespace DistributedHardware +} // namespace OHOS +#endif // DISTRIBUTED_CAMERA_TEST_COMMON_H diff --git a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback.cpp b/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback.cpp index 935a83ed..83835244 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback.cpp +++ b/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 &result) override; }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_DEVICE_CALLBACK_H \ No newline at end of file diff --git a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback_stub.cpp b/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback_stub.cpp index a72665e4..4f07271b 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback_stub.cpp +++ b/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 -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback_stub.h b/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback_stub.h index 50312699..6ddad5a9 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback_stub.h +++ b/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 -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_DEVICE_CALLBACK_CLIENT_STUB_H \ No newline at end of file diff --git a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_proxy.cpp b/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_proxy.cpp index 5f4dc2ed..9defbad2 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_proxy.cpp +++ b/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 -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_proxy.h b/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_proxy.h index 985f2c03..077c8ae3 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_proxy.h +++ b/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_proxy.h @@ -48,6 +48,6 @@ private: static inline BrokerDelegator delegator_; }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_DEVICE_CLIENT_PROXY_H \ No newline at end of file diff --git a/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback.cpp b/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback.cpp index b85c50c6..c748e2ed 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback.cpp +++ b/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 -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback.h b/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback.h index 5bf37cf6..913f7c07 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback.h +++ b/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 -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_HOST_CALLBACK_H \ No newline at end of file diff --git a/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback_stub.cpp b/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback_stub.cpp index 957b7d0c..c1398619 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback_stub.cpp +++ b/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 -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback_stub.h b/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback_stub.h index 232a3f31..b9ff4738 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback_stub.h +++ b/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 -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_HOST_CALLBACK_CLIENT_STUB_H \ No newline at end of file diff --git a/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_proxy.cpp b/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_proxy.cpp index 8074be6f..f18c3204 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_proxy.cpp +++ b/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(reply.ReadInt32()); } -} // end namespace DistributedHardware -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_proxy.h b/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_proxy.h index e851ae0f..42ad99b7 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_proxy.h +++ b/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_proxy.h @@ -45,6 +45,6 @@ private: static inline BrokerDelegator delegator_; }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_HOST_CLIENT_PROXY_H \ No newline at end of file diff --git a/camera_hdf/interfaces/hdi_ipc/client/operator/doffline_stream_operator_proxy.cpp b/camera_hdf/interfaces/hdi_ipc/client/operator/doffline_stream_operator_proxy.cpp index 5500c5d0..0310e86b 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/operator/doffline_stream_operator_proxy.cpp +++ b/camera_hdf/interfaces/hdi_ipc/client/operator/doffline_stream_operator_proxy.cpp @@ -87,5 +87,5 @@ CamRetCode DOfflineStreamOperatorProxy::Release() } return static_cast(reply.ReadInt32()); } -} // end namespace DistributedHardware -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/interfaces/hdi_ipc/client/operator/doffline_stream_operator_proxy.h b/camera_hdf/interfaces/hdi_ipc/client/operator/doffline_stream_operator_proxy.h index 6984eb8d..3dde7a60 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/operator/doffline_stream_operator_proxy.h +++ b/camera_hdf/interfaces/hdi_ipc/client/operator/doffline_stream_operator_proxy.h @@ -39,6 +39,6 @@ private: static inline BrokerDelegator delegator_; }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_OFFLINE_STREAM_OPERATOR_CLIENT_PROXY_H \ No newline at end of file diff --git a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback.cpp b/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback.cpp index 5bc0d758..cf1c3c9d 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback.cpp +++ b/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 -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback.h b/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback.h index 7c4145a2..0780fd99 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback.h +++ b/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 &streamId, uint64_t timestamp) override; }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_STREAM_OPERATOR_CALLBACK_H \ No newline at end of file diff --git a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback_stub.cpp b/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback_stub.cpp index ebc6b256..c87faffc 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback_stub.cpp +++ b/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 -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback_stub.h b/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback_stub.h index 095132be..de70093f 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback_stub.h +++ b/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 -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_STREAM_OPERATOR_CALLBACK_CLIENT_STUB_H diff --git a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.cpp b/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.cpp index c30915d2..00bcaff6 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.cpp +++ b/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.cpp @@ -384,5 +384,5 @@ CamRetCode DStreamOperatorProxy::ChangeToOfflineStream( offlineOperator = OHOS::iface_cast(remoteObj); return retCode; } -} // end namespace DistributedHardware -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.h b/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.h index 340b6cac..11843db6 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.h +++ b/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.h @@ -60,6 +60,6 @@ private: static inline BrokerDelegator delegator_; }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_STREAM_OPERATOR_CLIENT_PROXY_H \ No newline at end of file diff --git a/camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_callback.cpp b/camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_callback.cpp index 9d7683da..fb93aed1 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_callback.cpp +++ b/camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_callback.cpp @@ -63,5 +63,5 @@ DCamRetCode DCameraProviderCallback::UpdateSettings(const std::shared_ptr &dhBase, const std::vector> &settings) override; }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_PROVIDER_CALLBACK_H \ No newline at end of file diff --git a/camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_callback_stub.cpp b/camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_callback_stub.cpp index f8145fe1..607f5def 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_callback_stub.cpp +++ b/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 -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_callback_stub.h b/camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_callback_stub.h index 48f2fa51..769555d2 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_callback_stub.h +++ b/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 -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_PROVIDER_CALLBACK_CLIENT_STUB_H diff --git a/camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_proxy.cpp b/camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_proxy.cpp index ec5e2120..4fa418cc 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_proxy.cpp +++ b/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 -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_proxy.h b/camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_proxy.h index 5c41f334..393e7e9b 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_proxy.h +++ b/camera_hdf/interfaces/hdi_ipc/client/provider/dcamera_provider_proxy.h @@ -54,6 +54,6 @@ private: static inline BrokerDelegator delegator_; }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_PROVIDER_CLIENT_PROXY_H \ No newline at end of file diff --git a/camera_hdf/interfaces/hdi_ipc/config/host/dcamera_host_config.cpp b/camera_hdf/interfaces/hdi_ipc/config/host/dcamera_host_config.cpp index da30b84d..bd97bfb7 100644 --- a/camera_hdf/interfaces/hdi_ipc/config/host/dcamera_host_config.cpp +++ b/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 \ No newline at end of file +#endif // __cplusplus \ No newline at end of file diff --git a/camera_hdf/interfaces/hdi_ipc/config/provider/dcamera_provider_config.cpp b/camera_hdf/interfaces/hdi_ipc/config/provider/dcamera_provider_config.cpp index 75933736..acd1cd70 100644 --- a/camera_hdf/interfaces/hdi_ipc/config/provider/dcamera_provider_config.cpp +++ b/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 diff --git a/camera_hdf/interfaces/hdi_ipc/ipc_data_utils.h b/camera_hdf/interfaces/hdi_ipc/ipc_data_utils.h index e657d632..e2a994ad 100644 --- a/camera_hdf/interfaces/hdi_ipc/ipc_data_utils.h +++ b/camera_hdf/interfaces/hdi_ipc/ipc_data_utils.h @@ -102,6 +102,6 @@ public: pEvent->content_ = parcel.ReadString(); } }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // HDI_IPC_DATA_UTILS_H \ No newline at end of file diff --git a/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.cpp b/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.cpp index 44b7e834..a68f9b13 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.cpp +++ b/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 -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.h b/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.h index 764feb4a..76112868 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.h +++ b/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.h @@ -35,6 +35,6 @@ public: private: static inline BrokerDelegator delegator_; }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_DEVICE_CALLBACK_PROXY_H diff --git a/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_stub.cpp b/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_stub.cpp index f2691921..55c7c4f6 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_stub.cpp +++ b/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 -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_stub.h b/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_stub.h index 7e8cf2ed..ab4fa7f8 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_stub.h +++ b/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 -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_DEVICE_SERVER_STUB_H \ No newline at end of file diff --git a/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_callback_proxy.cpp b/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_callback_proxy.cpp index 2fdae24c..652f689e 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_callback_proxy.cpp +++ b/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 -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_callback_proxy.h b/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_callback_proxy.h index 07801f35..4b3267c2 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_callback_proxy.h +++ b/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_callback_proxy.h @@ -36,6 +36,6 @@ public: private: static inline BrokerDelegator delegator_; }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_HOST_CALLBACK_PROXY_H diff --git a/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.cpp b/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.cpp index 32eadba3..ad3acbd1 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.cpp +++ b/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 -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS void *DCameraHostStubInstance() { diff --git a/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.h b/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.h index bae5d68b..465c0a4a 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.h +++ b/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.h @@ -57,8 +57,8 @@ private: private: std::shared_ptr dcameraHost_ = nullptr; }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS void* DCameraHostStubInstance(); diff --git a/camera_hdf/interfaces/hdi_ipc/server/operator/doffline_stream_operator_stub.cpp b/camera_hdf/interfaces/hdi_ipc/server/operator/doffline_stream_operator_stub.cpp index d5be009c..b40c014b 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/operator/doffline_stream_operator_stub.cpp +++ b/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 -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/interfaces/hdi_ipc/server/operator/doffline_stream_operator_stub.h b/camera_hdf/interfaces/hdi_ipc/server/operator/doffline_stream_operator_stub.h index 53d1a8e1..5f5ad7f7 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/operator/doffline_stream_operator_stub.h +++ b/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 -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_OFFLINE_STREAM_OPERATOR_SERVER_STUB_H \ No newline at end of file diff --git a/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_callback_proxy.cpp b/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_callback_proxy.cpp index b971960a..f8e68f7b 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_callback_proxy.cpp +++ b/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 -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_callback_proxy.h b/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_callback_proxy.h index 15d270cd..2c8e169a 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_callback_proxy.h +++ b/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_callback_proxy.h @@ -40,6 +40,6 @@ public: private: static inline BrokerDelegator delegator_; }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_STREAM_OPERATOR_CALLBACK_PROXY_H \ No newline at end of file diff --git a/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.cpp b/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.cpp index 8a3132b9..0966d677 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.cpp +++ b/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 -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.h b/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.h index 654c2ce1..f8bd5b72 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.h +++ b/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 -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_STREAM_OPERATOR_SERVER_STUB_H \ No newline at end of file diff --git a/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_callback_proxy.cpp b/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_callback_proxy.cpp index 8a9acc63..a97e665c 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_callback_proxy.cpp +++ b/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_callback_proxy.cpp @@ -263,5 +263,5 @@ DCamRetCode DCameraProviderCallbackProxy::UpdateSettings(const std::shared_ptr(reply.ReadInt32()); } -} // end namespace DistributedHardware -} // end namespace OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_callback_proxy.h b/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_callback_proxy.h index 4930eed6..a7f5e3ed 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_callback_proxy.h +++ b/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_callback_proxy.h @@ -43,6 +43,6 @@ public: private: static inline BrokerDelegator delegator_; }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_PROVIDER_CALLBACK_PROXY_H diff --git a/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.cpp b/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.cpp index b4c00961..9a7fe369 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.cpp +++ b/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 -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS void *DCameraProviderStubInstance() { diff --git a/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.h b/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.h index 33330adb..4756446a 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.h +++ b/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.h @@ -48,8 +48,8 @@ private: private: std::shared_ptr dcameraProvider_ = nullptr; }; -} // end namespace DistributedHardware -} // end namespace OHOS +} // namespace DistributedHardware +} // namespace OHOS void* DCameraProviderStubInstance(); diff --git a/camera_hdf/interfaces/include/idistributed_camera_provider.h b/camera_hdf/interfaces/include/idistributed_camera_provider.h index e9365b5b..61e41270 100644 --- a/camera_hdf/interfaces/include/idistributed_camera_provider.h +++ b/camera_hdf/interfaces/include/idistributed_camera_provider.h @@ -158,7 +158,6 @@ public: virtual DCamRetCode Notify(const std::shared_ptr &dhBase, const std::shared_ptr &event) = 0; }; -} // end namespace DistributedHardware -} // end namespace OHOS - +} // namespace DistributedHardware +} // namespace OHOS #endif // HDI_DISTRIBUTED_CAMERA_PROVIDER_H \ No newline at end of file diff --git a/camera_hdf/interfaces/include/idistributed_camera_provider_callback.h b/camera_hdf/interfaces/include/idistributed_camera_provider_callback.h index a6ec4d76..6f4f5210 100644 --- a/camera_hdf/interfaces/include/idistributed_camera_provider_callback.h +++ b/camera_hdf/interfaces/include/idistributed_camera_provider_callback.h @@ -155,7 +155,6 @@ public: virtual DCamRetCode UpdateSettings(const std::shared_ptr &dhBase, const std::vector> &settings) = 0; }; -} // end namespace DistributedHardware -} // end namespace OHOS - +} // namespace DistributedHardware +} // namespace OHOS #endif // HDI_DISTRIBUTED_CAMERA_PROVIDER_CALLBACK_H \ No newline at end of file diff --git a/camera_hdf/interfaces/include/types.h b/camera_hdf/interfaces/include/types.h index d49e2d95..ae00c5c1 100644 --- a/camera_hdf/interfaces/include/types.h +++ b/camera_hdf/interfaces/include/types.h @@ -301,7 +301,6 @@ using DCameraHDFEvent = struct _DCameraHDFEvent { */ std::string content_; }; -} // end namespace DistributedHardware -} // end namespace OHOS - +} // namespace DistributedHardware +} // namespace OHOS #endif // DISTRIBUTED_CAMERA_PROVIDER_TYPES_H \ No newline at end of file diff --git a/common/include/utils/data_buffer.h b/common/include/utils/data_buffer.h index 3c35a462..121fb108 100644 --- a/common/include/utils/data_buffer.h +++ b/common/include/utils/data_buffer.h @@ -55,6 +55,6 @@ private: DataBuffer(const DataBuffer &) = delete; DataBuffer &operator = (const DataBuffer &) = delete; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DATA_BUFFER_H diff --git a/common/include/utils/dcamera_index.h b/common/include/utils/dcamera_index.h index d9c69ceb..db474500 100644 --- a/common/include/utils/dcamera_index.h +++ b/common/include/utils/dcamera_index.h @@ -38,6 +38,6 @@ public: std::string devId_; std::string dhId_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_INDEX_H diff --git a/common/include/utils/dcamera_utils_tools.h b/common/include/utils/dcamera_utils_tools.h index 4068f4e1..13892032 100644 --- a/common/include/utils/dcamera_utils_tools.h +++ b/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); -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_UTILS_TOOL_H diff --git a/common/src/utils/data_buffer.cpp b/common/src/utils/data_buffer.cpp index 6e4ae71f..3566c061 100644 --- a/common/src/utils/data_buffer.cpp +++ b/common/src/utils/data_buffer.cpp @@ -115,5 +115,5 @@ DataBuffer::~DataBuffer() data_ = nullptr; } } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/common/src/utils/dcamera_utils_tools.cpp b/common/src/utils/dcamera_utils_tools.cpp index 62513dcf..65a701ee 100644 --- a/common/src/utils/dcamera_utils_tools.cpp +++ b/common/src/utils/dcamera_utils_tools.cpp @@ -153,5 +153,5 @@ bool IsBase64(unsigned char c) { return (isalnum(c) || (c == '+') || (c == '/')); } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn index 8c8d618c..10b81214 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn @@ -57,4 +57,3 @@ ohos_shared_library("distributed_camera_sink_sdk") { part_name = "distributed_camera" } - diff --git a/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler_ipc.h b/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler_ipc.h index 38593c51..e0f9308c 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler_ipc.h +++ b/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler_ipc.h @@ -48,6 +48,6 @@ private: std::shared_ptr serviceHandler_; std::mutex initDmsLock_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SINK_HANDLER_IPC_H diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler_ipc.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler_ipc.cpp index 77a1888b..e2ea2098 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler_ipc.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler_ipc.cpp @@ -155,5 +155,5 @@ void DCameraSinkHandlerIpc::OnSinkLocalDmsDied(const sptr& remote } localSink_ = nullptr; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn index d7a463a3..76ddf6e5 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn @@ -60,4 +60,3 @@ ohos_shared_library("distributed_camera_source_sdk") { part_name = "distributed_camera" } - diff --git a/interfaces/inner_kits/native_cpp/camera_source/include/callback/dcamera_source_callback.h b/interfaces/inner_kits/native_cpp/camera_source/include/callback/dcamera_source_callback.h index 97288bd4..644c00c3 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/include/callback/dcamera_source_callback.h +++ b/interfaces/inner_kits/native_cpp/camera_source/include/callback/dcamera_source_callback.h @@ -41,6 +41,6 @@ private: std::map> regCallbacks_; std::map> unregCallbacks_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_CALLBACK_H diff --git a/interfaces/inner_kits/native_cpp/camera_source/include/callback/dcamera_source_callback_stub.h b/interfaces/inner_kits/native_cpp/camera_source/include/callback/dcamera_source_callback_stub.h index d4ed3bc4..6fa37803 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/include/callback/dcamera_source_callback_stub.h +++ b/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 memberFuncMap_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_CALLBACK_STUB_H diff --git a/interfaces/inner_kits/native_cpp/camera_source/include/callback/idcamera_source_callback.h b/interfaces/inner_kits/native_cpp/camera_source/include/callback/idcamera_source_callback.h index 1c095392..00325e84 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/include/callback/idcamera_source_callback.h +++ b/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; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_IDCAMERA_SOURCE_CALLBACL_H diff --git a/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler.h b/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler.h index ea9f10f1..a1f47f6c 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler.h +++ b/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 \ No newline at end of file +#endif // __cplusplus +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_HANDLER_H diff --git a/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler_ipc.h b/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler_ipc.h index cdee7ccd..a26531b5 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler_ipc.h +++ b/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler_ipc.h @@ -48,6 +48,6 @@ private: std::shared_ptr serviceHandler_; std::mutex initDmsLock_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_HANDLER_IPC_H diff --git a/interfaces/inner_kits/native_cpp/camera_source/include/distributed_camera_source_proxy.h b/interfaces/inner_kits/native_cpp/camera_source/include/distributed_camera_source_proxy.h index 2da59697..651f8eaa 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/include/distributed_camera_source_proxy.h +++ b/interfaces/inner_kits/native_cpp/camera_source/include/distributed_camera_source_proxy.h @@ -44,7 +44,6 @@ public: private: static inline BrokerDelegator delegator_; }; -} -} - -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DISTRIBUTED_CAMERA_SOURCE_PROXY_H diff --git a/interfaces/inner_kits/native_cpp/camera_source/include/idistributed_camera_source.h b/interfaces/inner_kits/native_cpp/camera_source/include/idistributed_camera_source.h index d7f98a29..13cf1467 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/include/idistributed_camera_source.h +++ b/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; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_IDISTRIBUTED_CAMERA_SOURCE_H diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback.cpp index 9117994f..fcb1a120 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback.cpp +++ b/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); } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp index 9da85fb0..05fe5e7b 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp +++ b/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; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp index 5c22664a..ddee107f 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp +++ b/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(); } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler_ipc.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler_ipc.cpp index ccf062d2..d8eae04f 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler_ipc.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler_ipc.cpp @@ -155,5 +155,5 @@ void DCameraSourceHandlerIpc::OnSourceLocalDmsDied(const sptr& re } localSource_ = nullptr; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/distributed_camera_source_proxy.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/distributed_camera_source_proxy.cpp index 07d5ddf3..113bdbda 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/distributed_camera_source_proxy.cpp +++ b/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; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/base/include/dcamera_capture_info_cmd.h b/services/cameraservice/base/include/dcamera_capture_info_cmd.h index 4f54f8b7..ce04fe5a 100644 --- a/services/cameraservice/base/include/dcamera_capture_info_cmd.h +++ b/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& captureInfo); }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_CAPTURE_INFO_H diff --git a/services/cameraservice/base/include/dcamera_channel_info_cmd.h b/services/cameraservice/base/include/dcamera_channel_info_cmd.h index fe6506d4..5c8e548a 100644 --- a/services/cameraservice/base/include/dcamera_channel_info_cmd.h +++ b/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); }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_CHANNEL_INFO_H diff --git a/services/cameraservice/base/include/dcamera_event_cmd.h b/services/cameraservice/base/include/dcamera_event_cmd.h index cf940603..0469c944 100644 --- a/services/cameraservice/base/include/dcamera_event_cmd.h +++ b/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); }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_EVENT_H diff --git a/services/cameraservice/base/include/dcamera_info_cmd.h b/services/cameraservice/base/include/dcamera_info_cmd.h index 1519de6f..d5468d0f 100644 --- a/services/cameraservice/base/include/dcamera_info_cmd.h +++ b/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); }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_INFO_H diff --git a/services/cameraservice/base/include/dcamera_metadata_setting_cmd.h b/services/cameraservice/base/include/dcamera_metadata_setting_cmd.h index b6ea22e0..c2b571d5 100644 --- a/services/cameraservice/base/include/dcamera_metadata_setting_cmd.h +++ b/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); }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_METADATA_SETTING_H diff --git a/services/cameraservice/base/include/dcamera_open_info_cmd.h b/services/cameraservice/base/include/dcamera_open_info_cmd.h index eeda2644..d40a414e 100644 --- a/services/cameraservice/base/include/dcamera_open_info_cmd.h +++ b/services/cameraservice/base/include/dcamera_open_info_cmd.h @@ -41,6 +41,6 @@ public: int32_t Marshal(std::string& jsonStr); int32_t Unmarshal(const std::string& jsonStr); }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_OPEN_INFO_H diff --git a/services/cameraservice/base/include/dcamera_protocol.h b/services/cameraservice/base/include/dcamera_protocol.h index 7cbdb4b7..f47c3409 100644 --- a/services/cameraservice/base/include/dcamera_protocol.h +++ b/services/cameraservice/base/include/dcamera_protocol.h @@ -32,6 +32,6 @@ static const std::string DCAMERA_PROTOCOL_CMD_CAPTURE = "CAPTURE"; static const std::string DCAMERA_PROTOCOL_CMD_STOP_CAPTURE = "STOP_CAPTURE"; static const std::string DCAMERA_PROTOCOL_CMD_OPEN_CHANNEL = "OPEN_CHANNEL"; static const std::string DCAMERA_PROTOCOL_CMD_CLOSE_CHANNEL = "CLOSE_CHANNEL"; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_PROTOCOL_H diff --git a/services/cameraservice/base/include/icamera_controller.h b/services/cameraservice/base/include/icamera_controller.h index 47da557a..4f493465 100644 --- a/services/cameraservice/base/include/icamera_controller.h +++ b/services/cameraservice/base/include/icamera_controller.h @@ -15,6 +15,7 @@ #ifndef OHOS_ICAMERA_CONTROLLER_H #define OHOS_ICAMERA_CONTROLLER_H + #include "dcamera_capture_info_cmd.h" #include "dcamera_channel_info_cmd.h" #include "dcamera_event_cmd.h" @@ -40,6 +41,6 @@ public: virtual int32_t Init(std::vector& indexs) = 0; virtual int32_t UnInit() = 0; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_ICAMERA_CONTROLLER_H diff --git a/services/cameraservice/base/src/dcamera_capture_info_cmd.cpp b/services/cameraservice/base/src/dcamera_capture_info_cmd.cpp index 9d5665dc..104de856 100644 --- a/services/cameraservice/base/src/dcamera_capture_info_cmd.cpp +++ b/services/cameraservice/base/src/dcamera_capture_info_cmd.cpp @@ -166,5 +166,5 @@ int32_t DCameraCaptureInfoCmd::UmarshalSettings(Json::Value& valueJson, } return DCAMERA_OK; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/base/src/dcamera_channel_info_cmd.cpp b/services/cameraservice/base/src/dcamera_channel_info_cmd.cpp index 20adf00a..71d63c97 100644 --- a/services/cameraservice/base/src/dcamera_channel_info_cmd.cpp +++ b/services/cameraservice/base/src/dcamera_channel_info_cmd.cpp @@ -104,5 +104,5 @@ int32_t DCameraChannelInfoCmd::Unmarshal(const std::string& jsonStr) value_ = channelInfo; return DCAMERA_OK; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/base/src/dcamera_event_cmd.cpp b/services/cameraservice/base/src/dcamera_event_cmd.cpp index d7629fa9..74bc41ad 100644 --- a/services/cameraservice/base/src/dcamera_event_cmd.cpp +++ b/services/cameraservice/base/src/dcamera_event_cmd.cpp @@ -91,5 +91,5 @@ int32_t DCameraEventCmd::Unmarshal(const std::string& jsonStr) value_ = event; return DCAMERA_OK; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/base/src/dcamera_info_cmd.cpp b/services/cameraservice/base/src/dcamera_info_cmd.cpp index ee34a4b3..c785b323 100644 --- a/services/cameraservice/base/src/dcamera_info_cmd.cpp +++ b/services/cameraservice/base/src/dcamera_info_cmd.cpp @@ -79,5 +79,5 @@ int32_t DCameraInfoCmd::Unmarshal(const std::string& jsonStr) value_ = info; return DCAMERA_OK; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/base/src/dcamera_metadata_setting_cmd.cpp b/services/cameraservice/base/src/dcamera_metadata_setting_cmd.cpp index 9c11e677..2599cd8d 100644 --- a/services/cameraservice/base/src/dcamera_metadata_setting_cmd.cpp +++ b/services/cameraservice/base/src/dcamera_metadata_setting_cmd.cpp @@ -89,5 +89,5 @@ int32_t DCameraMetadataSettingCmd::Unmarshal(const std::string& jsonStr) } return DCAMERA_OK; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/base/src/dcamera_open_info_cmd.cpp b/services/cameraservice/base/src/dcamera_open_info_cmd.cpp index d8024026..ce88c25f 100644 --- a/services/cameraservice/base/src/dcamera_open_info_cmd.cpp +++ b/services/cameraservice/base/src/dcamera_open_info_cmd.cpp @@ -78,5 +78,5 @@ int32_t DCameraOpenInfoCmd::Unmarshal(const std::string& jsonStr) value_ = openInfo; return DCAMERA_OK; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/base/test/unittest/common/dcameraprotocol/dcamera_protocol_test.cpp b/services/cameraservice/base/test/unittest/common/dcameraprotocol/dcamera_protocol_test.cpp index 8527053a..26192f4f 100644 --- a/services/cameraservice/base/test/unittest/common/dcameraprotocol/dcamera_protocol_test.cpp +++ b/services/cameraservice/base/test/unittest/common/dcameraprotocol/dcamera_protocol_test.cpp @@ -194,5 +194,5 @@ HWTEST_F(DCameraProtocolTest, dcamera_protocol_test_006, TestSize.Level1) ret = cmd.Marshal(jsonStr); EXPECT_EQ(DCAMERA_OK, ret); } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/cameraoperator/handler/include/dcamera_handler.h b/services/cameraservice/cameraoperator/handler/include/dcamera_handler.h index 4167d4f3..45f51089 100644 --- a/services/cameraservice/cameraoperator/handler/include/dcamera_handler.h +++ b/services/cameraservice/cameraoperator/handler/include/dcamera_handler.h @@ -63,11 +63,11 @@ private: #ifdef __cplusplus extern "C" { -#endif +#endif // __cplusplus __attribute__((visibility("default"))) IHardwareHandler* GetHardwareHandler(); #ifdef __cplusplus } -#endif +#endif // __cplusplus } // namespace DistributedHardware } // namespace OHOS #endif // OHOS_DCAMERA_HANDLER_H \ No newline at end of file diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_service_ipc.h b/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_service_ipc.h index ee19ae09..fffa2f99 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_service_ipc.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_service_ipc.h @@ -49,6 +49,6 @@ private: std::shared_ptr serviceHandler_; std::mutex initDmsLock_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SINK_SERVICE_IPC_H diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_service_ipc.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_service_ipc.cpp index 7cc2b1dd..dd0b83b9 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_service_ipc.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_service_ipc.cpp @@ -187,5 +187,5 @@ void DCameraSinkServiceIpc::OnSourceRemoteDmsDied(const sptr& rem } remoteSources_.erase(iter); } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_camera_channel.h b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_camera_channel.h index 479caf75..31154308 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_camera_channel.h +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_camera_channel.h @@ -59,5 +59,4 @@ public: }; } // namespace DistributedHardware } // namespace OHOS - -#endif \ No newline at end of file +#endif // OHOS_MOCK_CAMERA_CHANNEL_H diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_camera_operator.h b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_camera_operator.h index 48deca9a..0a931b3c 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_camera_operator.h +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_camera_operator.h @@ -78,5 +78,4 @@ public: }; } // namespace DistributedHardware } // namespace OHOS - -#endif \ No newline at end of file +#endif // OHOS_MOCK_CAMERA_OPERATOR_H \ No newline at end of file diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_data_process_pipeline.h b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_data_process_pipeline.h index dca14bbf..767f941a 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_data_process_pipeline.h +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_data_process_pipeline.h @@ -52,5 +52,4 @@ public: }; } // namespace DistributedHardware } // namespace OHOS - -#endif \ No newline at end of file +#endif // OHOS_MOCK_DATA_PROCESS_PIPELINE_H diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_dcamera_sink_controller.h b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_dcamera_sink_controller.h index abb5601d..39a67d4e 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_dcamera_sink_controller.h +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_dcamera_sink_controller.h @@ -74,5 +74,4 @@ public: }; } // namespace DistributedHardware } // namespace OHOS - -#endif \ No newline at end of file +#endif // OHOS_MOCK_DCAMERA_SINK_CONTROLLER_H diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_dcamera_sink_data_process.h b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_dcamera_sink_data_process.h index 7096cd47..f8e7217c 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_dcamera_sink_data_process.h +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_dcamera_sink_data_process.h @@ -74,5 +74,4 @@ public: }; } // namespace DistributedHardware } // namespace OHOS - -#endif \ No newline at end of file +#endif // OHOS_MOCK_DCAMERA_SINK_DATA_PROCESS_H diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_dcamera_sink_output.h b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_dcamera_sink_output.h index 56ca76b0..f2b9a639 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_dcamera_sink_output.h +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_dcamera_sink_output.h @@ -59,5 +59,4 @@ public: }; } // namespace DistributedHardware } // namespace OHOS - -#endif \ No newline at end of file +#endif // OHOS_MOCK_DCAMERA_SINK_OUTPUT_H diff --git a/services/cameraservice/sourceservice/include/distributedcamera/dcamera_service_state_listener.h b/services/cameraservice/sourceservice/include/distributedcamera/dcamera_service_state_listener.h index 938e5662..92e7530a 100644 --- a/services/cameraservice/sourceservice/include/distributedcamera/dcamera_service_state_listener.h +++ b/services/cameraservice/sourceservice/include/distributedcamera/dcamera_service_state_listener.h @@ -34,6 +34,6 @@ public: private: sptr callbackProxy_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SERVICE_STATE_LISTENER_H diff --git a/services/cameraservice/sourceservice/include/distributedcamera/dcamera_source_callback_proxy.h b/services/cameraservice/sourceservice/include/distributedcamera/dcamera_source_callback_proxy.h index e2afe9ba..fa9dcbef 100644 --- a/services/cameraservice/sourceservice/include/distributedcamera/dcamera_source_callback_proxy.h +++ b/services/cameraservice/sourceservice/include/distributedcamera/dcamera_source_callback_proxy.h @@ -39,6 +39,6 @@ public: private: static inline BrokerDelegator delegator_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_CALLBACK_PROXY_H diff --git a/services/cameraservice/sourceservice/include/distributedcamera/distributed_camera_source_service.h b/services/cameraservice/sourceservice/include/distributedcamera/distributed_camera_source_service.h index 6dfb6ee5..7b543b36 100644 --- a/services/cameraservice/sourceservice/include/distributedcamera/distributed_camera_source_service.h +++ b/services/cameraservice/sourceservice/include/distributedcamera/distributed_camera_source_service.h @@ -62,7 +62,6 @@ private: sptr callbackProxy_; std::string sourceVer_; }; -} -} - -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DISTRIBUTED_CAMERA_SOURCE_SERVICE_H diff --git a/services/cameraservice/sourceservice/include/distributedcamera/distributed_camera_source_stub.h b/services/cameraservice/sourceservice/include/distributedcamera/distributed_camera_source_stub.h index 60eee154..1951816d 100644 --- a/services/cameraservice/sourceservice/include/distributedcamera/distributed_camera_source_stub.h +++ b/services/cameraservice/sourceservice/include/distributedcamera/distributed_camera_source_stub.h @@ -39,7 +39,6 @@ private: using DCameraFunc = int32_t (DistributedCameraSourceStub::*)(MessageParcel &data, MessageParcel &reply); std::map memberFuncMap_; }; -} -} - -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DISTRIBUTED_CAMERA_SOURCE_STUB_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h index dbb203ee..cb5b41d9 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h @@ -88,6 +88,6 @@ private: std::map memberFuncMap_; std::map eventResultMap_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_DEV_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h index 7517da9b..64f21b16 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h @@ -119,6 +119,6 @@ private: DCAMERA_EVENT eventType_; EventParam eventParam_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_EVENT_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_service_ipc.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_service_ipc.h index b3bb6ced..1eed568d 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_service_ipc.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_service_ipc.h @@ -49,6 +49,6 @@ private: std::shared_ptr serviceHandler_; std::mutex initDmsLock_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_SERVICE_IPC_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller.h index 3817bce0..27d3b1df 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller.h @@ -65,6 +65,6 @@ private: bool isInit; const std::string SESSION_FLAG = "control"; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_CONTROLLER_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller_channel_listener.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller_channel_listener.h index 316e3831..0a4e1fe1 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller_channel_listener.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller_channel_listener.h @@ -34,6 +34,6 @@ public: private: std::weak_ptr controller_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_CONTROLLER_CHANNEL_LISTENER_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_data_process.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_data_process.h index 8ab873c7..7690058f 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_data_process.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_data_process.h @@ -45,6 +45,6 @@ private: std::string dhId_; DCStreamType streamType_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_DATRA_PROCESS_H \ No newline at end of file diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input.h index c67b59df..072487c4 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input.h @@ -60,6 +60,6 @@ private: std::mutex inputMutex_; bool isCapture_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_INPUT_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input_channel_listener.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input_channel_listener.h index 98f8a510..69bb930c 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input_channel_listener.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input_channel_listener.h @@ -36,6 +36,6 @@ private: std::weak_ptr input_; DCStreamType streamType_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_INPUT_CHANNEL_LISTENER_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process.h index a9f37b50..dea0a58f 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process.h @@ -62,6 +62,6 @@ private: std::shared_ptr listener_; std::map> producers_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_STREAM_DATA_PROCESS_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process_pipeline_listener.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process_pipeline_listener.h index 06c8bfa4..2c6cf8a4 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process_pipeline_listener.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process_pipeline_listener.h @@ -35,6 +35,6 @@ public: private: std::weak_ptr process_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_STREAM_DATA_PROCESS_PIPELINE_LISTENER_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.h index ceb2d27a..450f6db1 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.h @@ -62,6 +62,6 @@ private: DCStreamType streamType_; std::shared_ptr eventHandler_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_ICAMERA_SOURCE_DATA_PROCESS_PRODUCER_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.h index 51c7aac8..ebe3b9d3 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.h @@ -42,6 +42,6 @@ private: std::string dhId_; std::weak_ptr sourceDev_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_PROVIDER_CALLBACK_IMPL_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_input.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_input.h index 13e65810..3733723d 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_input.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_input.h @@ -35,6 +35,6 @@ public: virtual int32_t UnInit() = 0; virtual int32_t UpdateSettings(std::vector>& settings) = 0; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_ICAMERA_INPUT_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_source_data_process.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_source_data_process.h index d8b9693d..12934cac 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_source_data_process.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_source_data_process.h @@ -62,6 +62,6 @@ public: virtual int32_t StopCapture() = 0; virtual void GetAllStreamIds(std::vector& streamIds) = 0; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_ICAMERA_SOURCE_DATA_PROCESS_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_state_listener.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_state_listener.h index 613c2c26..9ed09406 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_state_listener.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_state_listener.h @@ -29,6 +29,6 @@ public: virtual int32_t OnUnregisterNotify(const std::string& devId, const std::string& dhId, const std::string& reqId, int32_t status, std::string& data) = 0; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_ICAMERA_STATE_LISTENER_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_capture_state.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_capture_state.h index b7ce816f..9614f132 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_capture_state.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_capture_state.h @@ -47,6 +47,6 @@ private: std::weak_ptr stateMachine_; std::map memberFuncMap_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_CAPTURE_STATE_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_config_stream_state.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_config_stream_state.h index c50149d3..ab7a1f30 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_config_stream_state.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_config_stream_state.h @@ -50,6 +50,6 @@ private: std::weak_ptr stateMachine_; std::map memberFuncMap_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_CONFIG_STREAM_STATE_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_init_state.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_init_state.h index dc937779..1fd04593 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_init_state.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_init_state.h @@ -41,6 +41,6 @@ private: std::weak_ptr stateMachine_; std::map memberFuncMap_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_INIT_STATE_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_opened_state.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_opened_state.h index b46b9e32..51d68b27 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_opened_state.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_opened_state.h @@ -47,6 +47,6 @@ private: std::weak_ptr stateMachine_; std::map memberFuncMap_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_OPENED_STATE_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_regist_state.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_regist_state.h index 775cdc01..01053d33 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_regist_state.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_regist_state.h @@ -44,6 +44,6 @@ private: std::weak_ptr stateMachine_; std::map memberFuncMap_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_REGIST_STATE_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_state.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_state.h index 1e908c2a..ff880344 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_state.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_state.h @@ -38,6 +38,6 @@ public: DCameraSourceEvent& event) = 0; virtual DCameraStateType GetStateType() = 0; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_STATE_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_state_factory.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_state_factory.h index 44ddf0ad..99fe4bf6 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_state_factory.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_state_factory.h @@ -26,6 +26,6 @@ public: std::shared_ptr CreateState(DCameraStateType stateType, std::shared_ptr& stateMachine); }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_STATE_FACTORY_H diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_state_machine.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_state_machine.h index 030ed940..5056a9e3 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_state_machine.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_state_machine.h @@ -32,6 +32,6 @@ private: std::shared_ptr currentState_; std::weak_ptr camDev_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOURCE_STATE_MACHINE_H diff --git a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_service_state_listener.cpp b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_service_state_listener.cpp index 4eff7096..a4f5e7ae 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_service_state_listener.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_service_state_listener.cpp @@ -88,5 +88,5 @@ int32_t DCameraServiceStateListener::OnUnregisterNotify(const std::string& devId return ret; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_callback_proxy.cpp b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_callback_proxy.cpp index 2ce269d7..3bf4f8da 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_callback_proxy.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_callback_proxy.cpp @@ -74,5 +74,5 @@ int32_t DCameraSourceCallbackProxy::OnNotifyUnregResult(const std::string& devId int32_t result = reply.ReadInt32(); return result; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp index fde25868..1119e87b 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp @@ -194,5 +194,5 @@ int32_t DistributedCameraSourceService::UnLoadCameraHDF() { return DCAMERA_OK; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp index dd45a32a..66ca5efd 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp @@ -131,5 +131,5 @@ int32_t DistributedCameraSourceStub::DCameraNotifyInner(MessageParcel &data, Mes reply.WriteInt32(ret); return ret; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp index 59989035..994e488f 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp @@ -534,5 +534,5 @@ void DCameraSourceDev::NotifyHalResult(DCAMERA_EVENT eventType, DCameraSourceEve ExecuteCameraEventNotify(events); return; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_event.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_event.cpp index fbcefe4c..bb13ff29 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_event.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_event.cpp @@ -102,5 +102,5 @@ DCAMERA_EVENT DCameraSourceEvent::GetEventType() { return eventType_; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_service_ipc.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_service_ipc.cpp index b49c0144..55bec13d 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_service_ipc.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_service_ipc.cpp @@ -187,5 +187,5 @@ void DCameraSourceServiceIpc::OnSinkRemoteDmsDied(const sptr& rem } remoteSinks_.erase(iter); } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp index f993f583..6902c43f 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp @@ -468,5 +468,5 @@ void DCameraSourceController::HandleMetaDataResult(std::string& jsonStr) GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller_channel_listener.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller_channel_listener.cpp index e0792381..289c6024 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller_channel_listener.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller_channel_listener.cpp @@ -63,5 +63,5 @@ void DCameraSourceControllerChannelListener::OnDataReceived(std::vectorOnDataReceived(buffers); } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_data_process.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_data_process.cpp index c383f37d..73497f80 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_data_process.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_data_process.cpp @@ -161,5 +161,5 @@ void DCameraSourceDataProcess::GetAllStreamIds(std::vector& streamIds) { streamIds.assign(streamIds_.begin(), streamIds_.end()); } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input.cpp index 93d97013..c1de16dc 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input.cpp @@ -373,5 +373,5 @@ int32_t DCameraSourceInput::ReleaseAllStreams() } return DCAMERA_OK; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input_channel_listener.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input_channel_listener.cpp index 3bbcf886..1dfe66ef 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input_channel_listener.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input_channel_listener.cpp @@ -63,5 +63,5 @@ void DCameraSourceInputChannelListener::OnDataReceived(std::vectorOnDataReceived(streamType_, buffers); } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process.cpp index 8bf016f5..ac683661 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process.cpp @@ -225,5 +225,5 @@ Videoformat DCameraStreamDataProcess::GetPipelineFormat(int32_t format) { return Videoformat::NV21; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process_pipeline_listener.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process_pipeline_listener.cpp index 0151a8fd..22944375 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process_pipeline_listener.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process_pipeline_listener.cpp @@ -51,5 +51,5 @@ void DCameraStreamDataProcessPipelineListener::OnError(DataProcessErrorType erro } process->OnError(errorType); } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.cpp index 902a2c13..98195202 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.cpp @@ -231,5 +231,5 @@ int32_t DCameraStreamDataProcessProducer::FeedStreamToDriver(const std::shared_p GetAnonyString(dhId_).c_str(), buffer->Size(), streamType_); return ret; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp index 768f41c4..f0014a5b 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp @@ -177,5 +177,5 @@ DCamRetCode DCameraProviderCallbackImpl::UpdateSettings(const std::shared_ptr DCameraSourceStateFactory::CreateState(DCame return state; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_state_machine.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_state_machine.cpp index 95c0fab6..cb7b8a49 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_state_machine.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_state_machine.cpp @@ -59,5 +59,5 @@ void DCameraSourceStateMachine::UpdateState(DCameraStateType stateType) auto stateMachine = std::shared_ptr(shared_from_this()); currentState_ = DCameraSourceStateFactory::GetInstance().CreateState(stateType, stateMachine); } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_state_machine_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_state_machine_test.cpp index e66301b4..2e736ff5 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_state_machine_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_state_machine_test.cpp @@ -355,5 +355,5 @@ HWTEST_F(DCameraSourceStateMachineTest, dcamera_source_state_machine_test_005, T ret = stateMachine_ ->Execute(DCAMERA_EVENT_UNREGIST, event1); EXPECT_EQ(DCAMERA_OK, ret); } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/mock_dcamera_source_dev.h b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/mock_dcamera_source_dev.h index 8e0f1cdb..0f5775fd 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/mock_dcamera_source_dev.h +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/mock_dcamera_source_dev.h @@ -81,5 +81,4 @@ private: }; } // namespace DistributedHardware } // namespace OHOS - -#endif \ No newline at end of file +#endif // OHOS_DISTRIBUTED_CAMERA_MOCKSOURCE_DEV_H diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/mock_dcamera_source_state_listener.h b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/mock_dcamera_source_state_listener.h index d297d34f..0358fa33 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/mock_dcamera_source_state_listener.h +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/mock_dcamera_source_state_listener.h @@ -39,6 +39,6 @@ public: return DCAMERA_OK; } }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DISTRIBUTED_CAMERA_MOCKSOURCE_STATE_LISTENER_H diff --git a/services/channel/include/dcamera_channel_sink_impl.h b/services/channel/include/dcamera_channel_sink_impl.h index 7755a0e9..b60ff77b 100644 --- a/services/channel/include/dcamera_channel_sink_impl.h +++ b/services/channel/include/dcamera_channel_sink_impl.h @@ -41,6 +41,6 @@ private: DCameraSessionMode mode_; const std::string SESSION_HEAD = "ohos.dhardware.dcamera_"; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_CHANNEL_SINK_IMPL_H \ No newline at end of file diff --git a/services/channel/include/dcamera_channel_source_impl.h b/services/channel/include/dcamera_channel_source_impl.h index ee96ab20..75818238 100644 --- a/services/channel/include/dcamera_channel_source_impl.h +++ b/services/channel/include/dcamera_channel_source_impl.h @@ -41,6 +41,6 @@ private: DCameraSessionMode mode_; const std::string SESSION_HEAD = "ohos.dhardware.dcamera_"; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_CHANNEL_SOURCE_IMPL_H diff --git a/services/channel/include/dcamera_softbus_adapter.h b/services/channel/include/dcamera_softbus_adapter.h index 123c8f5f..8f6fbca6 100644 --- a/services/channel/include/dcamera_softbus_adapter.h +++ b/services/channel/include/dcamera_softbus_adapter.h @@ -81,6 +81,6 @@ private: std::mutex idMapLock_; std::map> sessionIdMap_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOFTBUS_ADAPTER_H diff --git a/services/channel/include/dcamera_softbus_session.h b/services/channel/include/dcamera_softbus_session.h index 7d0934b0..0abf7021 100644 --- a/services/channel/include/dcamera_softbus_session.h +++ b/services/channel/include/dcamera_softbus_session.h @@ -115,6 +115,6 @@ private: std::map sendFuncMap_; std::shared_ptr eventHandler_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_SOFTBUS_SESSION_H diff --git a/services/channel/include/icamera_channel.h b/services/channel/include/icamera_channel.h index e05b7a9c..ac5ef5aa 100644 --- a/services/channel/include/icamera_channel.h +++ b/services/channel/include/icamera_channel.h @@ -39,6 +39,6 @@ public: virtual int32_t ReleaseSession(); virtual int32_t SendData(std::shared_ptr& buffer) = 0; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_ICAMERA_CHANNEL_H \ No newline at end of file diff --git a/services/channel/include/icamera_channel_listener.h b/services/channel/include/icamera_channel_listener.h index a1cd2254..3fc269c8 100644 --- a/services/channel/include/icamera_channel_listener.h +++ b/services/channel/include/icamera_channel_listener.h @@ -38,6 +38,6 @@ public: virtual void OnSessionError(int32_t eventType, int32_t eventReason, std::string detail) = 0; virtual void OnDataReceived(std::vector>& buffers) = 0; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_ICAMERA_CHANNEL_LISTENER_H diff --git a/services/channel/src/dcamera_channel_sink_impl.cpp b/services/channel/src/dcamera_channel_sink_impl.cpp index 565c5473..d98e8fab 100644 --- a/services/channel/src/dcamera_channel_sink_impl.cpp +++ b/services/channel/src/dcamera_channel_sink_impl.cpp @@ -122,5 +122,5 @@ int32_t DCameraChannelSinkImpl::SendData(std::shared_ptr& buffer) } return ret; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/channel/src/dcamera_channel_source_impl.cpp b/services/channel/src/dcamera_channel_source_impl.cpp index f3fb7115..688b464c 100644 --- a/services/channel/src/dcamera_channel_source_impl.cpp +++ b/services/channel/src/dcamera_channel_source_impl.cpp @@ -141,5 +141,5 @@ int32_t DCameraChannelSourceImpl::SendData(std::shared_ptr& buffer) } return ret; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index f7bf7963..c42158fd 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -484,5 +484,5 @@ int32_t DCameraSoftbusAdapter::GetLocalNetworkId(std::string& myDevId) myDevId = std::string(basicInfo.networkId); return DCAMERA_OK; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/channel/src/dcamera_softbus_session.cpp b/services/channel/src/dcamera_softbus_session.cpp index e4a562f4..cf51e1e2 100644 --- a/services/channel/src/dcamera_softbus_session.cpp +++ b/services/channel/src/dcamera_softbus_session.cpp @@ -447,5 +447,5 @@ std::string DCameraSoftbusSession::GetMySessionName() { return mySessionName_; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/data_process/include/eventbus/dcamera_codec_event.h b/services/data_process/include/eventbus/dcamera_codec_event.h index 3cb83d27..91a77be9 100644 --- a/services/data_process/include/eventbus/dcamera_codec_event.h +++ b/services/data_process/include/eventbus/dcamera_codec_event.h @@ -85,6 +85,6 @@ private: std::shared_ptr codecPacket_; VideoCodecAction action_; }; -} -} -#endif +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_CODEC_EVENT_H diff --git a/services/data_process/include/eventbus/dcamera_pipeline_event.h b/services/data_process/include/eventbus/dcamera_pipeline_event.h index f01126f7..5c2534cb 100644 --- a/services/data_process/include/eventbus/dcamera_pipeline_event.h +++ b/services/data_process/include/eventbus/dcamera_pipeline_event.h @@ -96,6 +96,6 @@ private: std::shared_ptr pipelineConfig_ = nullptr; PipelineAction action_; }; -} -} -#endif +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_PIPELINE_EVENT_H diff --git a/services/data_process/include/interfaces/data_process_listener.h b/services/data_process/include/interfaces/data_process_listener.h index 15de4e72..ce79eb8e 100644 --- a/services/data_process/include/interfaces/data_process_listener.h +++ b/services/data_process/include/interfaces/data_process_listener.h @@ -33,6 +33,6 @@ public: virtual void OnProcessedVideoBuffer(const std::shared_ptr& videoResult) = 0; virtual void OnError(DataProcessErrorType errorType) = 0; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DATA_PROCESS_LISTENER_H diff --git a/services/data_process/include/interfaces/idata_process_pipeline.h b/services/data_process/include/interfaces/idata_process_pipeline.h index 9355c695..053c1af6 100644 --- a/services/data_process/include/interfaces/idata_process_pipeline.h +++ b/services/data_process/include/interfaces/idata_process_pipeline.h @@ -35,6 +35,6 @@ public: virtual int32_t ProcessData(std::vector>& dataBuffers) = 0; virtual void DestroyDataProcessPipeline() = 0; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_IDATA_PROCESS_PIPELINE_H diff --git a/services/data_process/include/pipeline/abstract_data_process.h b/services/data_process/include/pipeline/abstract_data_process.h index beed1821..7f18737c 100644 --- a/services/data_process/include/pipeline/abstract_data_process.h +++ b/services/data_process/include/pipeline/abstract_data_process.h @@ -39,6 +39,6 @@ protected: std::shared_ptr nextDataProcess_ = nullptr; size_t nodeRank_; }; -} -} -#endif +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_ABSTRACT_DATA_PROCESS_H diff --git a/services/data_process/include/pipeline/dcamera_pipeline_sink.h b/services/data_process/include/pipeline/dcamera_pipeline_sink.h index b23e0870..13df907d 100644 --- a/services/data_process/include/pipeline/dcamera_pipeline_sink.h +++ b/services/data_process/include/pipeline/dcamera_pipeline_sink.h @@ -67,6 +67,6 @@ private: PipelineType piplineType_ = PipelineType::VIDEO; std::vector> pipNodeRanks_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_PIPELINE_SINK_H diff --git a/services/data_process/include/pipeline/dcamera_pipeline_source.h b/services/data_process/include/pipeline/dcamera_pipeline_source.h index a8065f86..3e665141 100644 --- a/services/data_process/include/pipeline/dcamera_pipeline_source.h +++ b/services/data_process/include/pipeline/dcamera_pipeline_source.h @@ -71,6 +71,6 @@ private: PipelineType piplineType_ = PipelineType::VIDEO; std::vector> pipNodeRanks_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_PIPELINE_SOURCE_H diff --git a/services/data_process/include/pipeline_node/colorspace_conversion/convert_nv12_to_nv21.h b/services/data_process/include/pipeline_node/colorspace_conversion/convert_nv12_to_nv21.h index bd0eba5b..515da244 100644 --- a/services/data_process/include/pipeline_node/colorspace_conversion/convert_nv12_to_nv21.h +++ b/services/data_process/include/pipeline_node/colorspace_conversion/convert_nv12_to_nv21.h @@ -43,6 +43,6 @@ private: int32_t CopyYPlane(const ImageUnitInfo& srcImgInfo, const ImageUnitInfo& dstImgInfo); int32_t ColorConvertNV12ToNV21(const ImageUnitInfo& srcImgInfo, const ImageUnitInfo& dstImgInfo); }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_CONVERT_NV12TONV21_H diff --git a/services/data_process/include/pipeline_node/fpscontroller/fps_controller_process.h b/services/data_process/include/pipeline_node/fpscontroller/fps_controller_process.h index 9e9fbbeb..1dec54d6 100644 --- a/services/data_process/include/pipeline_node/fpscontroller/fps_controller_process.h +++ b/services/data_process/include/pipeline_node/fpscontroller/fps_controller_process.h @@ -74,6 +74,6 @@ private: int32_t frameRateOvershootMdf_ = 0; int64_t incomingFrameTimesMs_[INCOME_FRAME_TIME_HISTORY_WINDOWS_SIZE]; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_FPS_CONTROLLER_PROCESS_H \ No newline at end of file diff --git a/services/data_process/include/pipeline_node/multimedia_codec/decode_data_process.h b/services/data_process/include/pipeline_node/multimedia_codec/decode_data_process.h index 0695f92b..25430059 100644 --- a/services/data_process/include/pipeline_node/multimedia_codec/decode_data_process.h +++ b/services/data_process/include/pipeline_node/multimedia_codec/decode_data_process.h @@ -141,6 +141,6 @@ private: sptr surface_; std::weak_ptr decodeVideoNode_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DECODE_DATA_PROCESS_H diff --git a/services/data_process/include/pipeline_node/multimedia_codec/decode_video_callback.h b/services/data_process/include/pipeline_node/multimedia_codec/decode_video_callback.h index 4749a8c8..cec129eb 100644 --- a/services/data_process/include/pipeline_node/multimedia_codec/decode_video_callback.h +++ b/services/data_process/include/pipeline_node/multimedia_codec/decode_video_callback.h @@ -40,6 +40,6 @@ public: private: std::weak_ptr decodeVideoNode_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DECODE_VIDEO_CALLBACK_H diff --git a/services/data_process/include/pipeline_node/multimedia_codec/encode_data_process.h b/services/data_process/include/pipeline_node/multimedia_codec/encode_data_process.h index ba265fa5..29bb7a6b 100644 --- a/services/data_process/include/pipeline_node/multimedia_codec/encode_data_process.h +++ b/services/data_process/include/pipeline_node/multimedia_codec/encode_data_process.h @@ -119,6 +119,6 @@ private: Media::Format metadataFormat_; Media::Format encodeOutputFormat_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_ENCODE_DATA_PROCESS_H diff --git a/services/data_process/include/pipeline_node/multimedia_codec/encode_video_callback.h b/services/data_process/include/pipeline_node/multimedia_codec/encode_video_callback.h index c91055cc..34f6fc11 100644 --- a/services/data_process/include/pipeline_node/multimedia_codec/encode_video_callback.h +++ b/services/data_process/include/pipeline_node/multimedia_codec/encode_video_callback.h @@ -40,6 +40,6 @@ public: private: std::weak_ptr encodeVideoNode_; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DECODE_VIDEO_CALLBACK_H diff --git a/services/data_process/include/utils/image_common_type.h b/services/data_process/include/utils/image_common_type.h index 0b33c4c6..9e302d96 100644 --- a/services/data_process/include/utils/image_common_type.h +++ b/services/data_process/include/utils/image_common_type.h @@ -74,6 +74,6 @@ struct ImageUnitInfo { size_t imgSize; uint8_t *imgData; }; -} -} -#endif \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_IMAGE_COMMON_TYPE_H diff --git a/services/data_process/src/pipeline/abstract_data_process.cpp b/services/data_process/src/pipeline/abstract_data_process.cpp index bfc7b793..0ee2e7cc 100644 --- a/services/data_process/src/pipeline/abstract_data_process.cpp +++ b/services/data_process/src/pipeline/abstract_data_process.cpp @@ -33,5 +33,5 @@ void AbstractDataProcess::SetNodeRank(size_t curNodeRank) { nodeRank_ = curNodeRank; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/data_process/src/pipeline/dcamera_pipeline_sink.cpp b/services/data_process/src/pipeline/dcamera_pipeline_sink.cpp index bda1da7f..afe508fa 100644 --- a/services/data_process/src/pipeline/dcamera_pipeline_sink.cpp +++ b/services/data_process/src/pipeline/dcamera_pipeline_sink.cpp @@ -172,5 +172,5 @@ void DCameraPipelineSink::OnProcessedVideoBuffer(const std::shared_ptrOnProcessedVideoBuffer(videoResult); } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/data_process/src/pipeline/dcamera_pipeline_source.cpp b/services/data_process/src/pipeline/dcamera_pipeline_source.cpp index 5aa728f9..ddb80e5b 100644 --- a/services/data_process/src/pipeline/dcamera_pipeline_source.cpp +++ b/services/data_process/src/pipeline/dcamera_pipeline_source.cpp @@ -205,5 +205,5 @@ void DCameraPipelineSource::OnProcessedVideoBuffer(const std::shared_ptrOnProcessedVideoBuffer(videoResult); } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/data_process/src/pipeline_node/colorspace_conversion/convert_nv12_to_nv21.cpp b/services/data_process/src/pipeline_node/colorspace_conversion/convert_nv12_to_nv21.cpp index b7908312..3a023eff 100644 --- a/services/data_process/src/pipeline_node/colorspace_conversion/convert_nv12_to_nv21.cpp +++ b/services/data_process/src/pipeline_node/colorspace_conversion/convert_nv12_to_nv21.cpp @@ -360,5 +360,5 @@ std::shared_ptr ConvertNV12ToNV21::ProcessData(const std::shared_ptr sourceConfig.GetWidth(), sourceConfig.GetHeight(), dstBuf->Size(), timeStamp); return dstBuf; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/data_process/src/pipeline_node/fpscontroller/fps_controller_process.cpp b/services/data_process/src/pipeline_node/fpscontroller/fps_controller_process.cpp index 090aa045..e86d338a 100644 --- a/services/data_process/src/pipeline_node/fpscontroller/fps_controller_process.cpp +++ b/services/data_process/src/pipeline_node/fpscontroller/fps_controller_process.cpp @@ -327,5 +327,5 @@ int32_t FpsControllerProcess::FpsControllerDone(std::vectorOnProcessedVideoBuffer(outputBuffers[0]); return DCAMERA_OK; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decode_data_process.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decode_data_process.cpp index 52cb298f..3491d993 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decode_data_process.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decode_data_process.cpp @@ -708,5 +708,5 @@ DecodeSurfaceListener::~DecodeSurfaceListener() DHLOGD("DecodeSurfaceListener : ~DecodeSurfaceListener."); surface_ = nullptr; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decode_data_process_common.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decode_data_process_common.cpp index 2847ac56..77de7980 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decode_data_process_common.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decode_data_process_common.cpp @@ -671,5 +671,5 @@ DecodeSurfaceListener::~DecodeSurfaceListener() DHLOGD("DecodeSurfaceListener : ~DecodeSurfaceListener."); surface_ = nullptr; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decode_video_callback.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decode_video_callback.cpp index 401f3672..eb354c2f 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decode_video_callback.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decode_video_callback.cpp @@ -63,5 +63,5 @@ void DecodeVideoCallback::OnOutputBufferAvailable(uint32_t index, Media::AVCodec } targetDecoderNode->OnOutputBufferAvailable(index, info, flag); } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encode_data_process.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encode_data_process.cpp index f5d9c92a..7db3465a 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/encode_data_process.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/encode_data_process.cpp @@ -494,5 +494,5 @@ VideoConfigParams EncodeDataProcess::GetTargetConfig() const { return targetConfig_; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encode_data_process_common.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encode_data_process_common.cpp index 05c91aeb..cadc5177 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/encode_data_process_common.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/encode_data_process_common.cpp @@ -454,5 +454,5 @@ VideoConfigParams EncodeDataProcess::GetTargetConfig() const { return targetConfig_; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encode_video_callback.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encode_video_callback.cpp index 27b05a22..07b80386 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/encode_video_callback.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/encode_video_callback.cpp @@ -62,5 +62,5 @@ void EncodeVideoCallback::OnOutputBufferAvailable(uint32_t index, Media::AVCodec } targetEncoderNode->OnOutputBufferAvailable(index, info, flag); } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/data_process/src/utils/image_common_type.cpp b/services/data_process/src/utils/image_common_type.cpp index 4c96dee4..5990cb40 100644 --- a/services/data_process/src/utils/image_common_type.cpp +++ b/services/data_process/src/utils/image_common_type.cpp @@ -62,5 +62,5 @@ uint32_t VideoConfigParams::GetHeight() const { return height_; } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS -- Gitee From d4b9823e9f68fb25df69f8e913f6d578f3cbe41f Mon Sep 17 00:00:00 2001 From: zhuxu Date: Tue, 22 Mar 2022 17:12:48 +0800 Subject: [PATCH 2/2] fix issues Signed-off-by: zhuxu --- interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn | 7 ++++--- .../inner_kits/native_cpp/camera_source/BUILD.gn | 11 ++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn index 10b81214..f6f5744a 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/distributedhardware/distributedcamera/distributedcamera.gni") +import( + "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") ohos_shared_library("distributed_camera_sink_sdk") { include_dirs = [ @@ -30,14 +31,14 @@ ohos_shared_library("distributed_camera_sink_sdk") { ] sources = [ - "src/dcamera_sink_handler_ipc.cpp", "src/dcamera_sink_handler.cpp", + "src/dcamera_sink_handler_ipc.cpp", "src/distributed_camera_sink_proxy.cpp", ] deps = [ - "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", + "//utils/native/base:utils", ] defines = [ diff --git a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn index 76ddf6e5..f0d2ff91 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/distributedhardware/distributedcamera/distributedcamera.gni") +import( + "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") ohos_shared_library("distributed_camera_source_sdk") { include_dirs = [ @@ -31,16 +32,16 @@ ohos_shared_library("distributed_camera_source_sdk") { ] sources = [ + "src/callback/dcamera_source_callback.cpp", + "src/callback/dcamera_source_callback_stub.cpp", + "src/dcamera_source_handler.cpp", "src/dcamera_source_handler_ipc.cpp", "src/distributed_camera_source_proxy.cpp", - "src/dcamera_source_handler.cpp", - "src/callback/dcamera_source_callback_stub.cpp", - "src/callback/dcamera_source_callback.cpp", ] deps = [ - "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", + "//utils/native/base:utils", ] defines = [ -- Gitee