diff --git a/common/BUILD.gn b/common/BUILD.gn index 121c84c7948cd3acb065a763a80e755b72c893cf..b9296b3458c001976ea5d91f6c2da26536c8df95 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -45,16 +45,16 @@ ohos_shared_library("distributed_camera_utils") { sources = [ "src/utils/anonymous_string.cpp", "src/utils/data_buffer.cpp", + "src/utils/dc_sa_log.cpp", "src/utils/dcamera_buffer_handle.cpp", "src/utils/dcamera_hisysevent_adapter.cpp", "src/utils/dcamera_hitrace_adapter.cpp", "src/utils/dcamera_utils_tools.cpp", - "src/utils/dh_log.cpp", ] defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"distributedcamerautils\"", + "DC_LOG_TAG=\"distributedcamerautils\"", "LOG_DOMAIN=0xD004100", ] diff --git a/common/include/utils/dh_log.h b/common/include/utils/dc_sa_log.h similarity index 61% rename from common/include/utils/dh_log.h rename to common/include/utils/dc_sa_log.h index 6a8e38014564dce6b3fbf55f023bd9dc6632be1c..f1639cde3d4cd9b6cb768ce089e6031d524b31dd 100644 --- a/common/include/utils/dh_log.h +++ b/common/include/utils/dc_sa_log.h @@ -19,25 +19,25 @@ namespace OHOS { namespace DistributedHardware { typedef enum { - DH_LOG_DEBUG, - DH_LOG_INFO, - DH_LOG_WARN, - DH_LOG_ERROR, -} DHLogLevel; + DC_LOG_DEBUG, + DC_LOG_INFO, + DC_LOG_WARN, + DC_LOG_ERROR, +} DCLogLevel; -void DHLog(DHLogLevel logLevel, const char *fmt, ...); +void DCLog(DCLogLevel logLevel, const char *fmt, ...); -#define ULOGD(fmt, ...) DHLog(DH_LOG_DEBUG, \ - (std::string("[") + DH_LOG_TAG + "][" + __FUNCTION__ + "]:" + fmt).c_str(), ##__VA_ARGS__) +#define UCLOGD(fmt, ...) DCLog(DC_LOG_DEBUG, \ + (std::string("[") + DC_LOG_TAG + "][" + __FUNCTION__ + "]:" + fmt).c_str(), ##__VA_ARGS__) -#define ULOGI(fmt, ...) DHLog(DH_LOG_INFO, \ - (std::string("[") + DH_LOG_TAG + "][" + __FUNCTION__ + "]:" + fmt).c_str(), ##__VA_ARGS__) +#define UCLOGI(fmt, ...) DCLog(DC_LOG_INFO, \ + (std::string("[") + DC_LOG_TAG + "][" + __FUNCTION__ + "]:" + fmt).c_str(), ##__VA_ARGS__) -#define ULOGW(fmt, ...) DHLog(DH_LOG_WARN, \ - (std::string("[") + DH_LOG_TAG + "][" + __FUNCTION__ + "]:" + fmt).c_str(), ##__VA_ARGS__) +#define UCLOGW(fmt, ...) DCLog(DC_LOG_WARN, \ + (std::string("[") + DC_LOG_TAG + "][" + __FUNCTION__ + "]:" + fmt).c_str(), ##__VA_ARGS__) -#define ULOGE(fmt, ...) DHLog(DH_LOG_ERROR, \ - (std::string("[") + DH_LOG_TAG + "][" + __FUNCTION__ + "]:" + fmt).c_str(), ##__VA_ARGS__) +#define UCLOGE(fmt, ...) DCLog(DC_LOG_ERROR, \ + (std::string("[") + DC_LOG_TAG + "][" + __FUNCTION__ + "]:" + fmt).c_str(), ##__VA_ARGS__) } // namespace DistributedHardware } // namespace OHOS #endif // OHOS_DCAMERA_LOG_H diff --git a/common/include/utils/distributed_hardware_log.h b/common/include/utils/dcamera_sa_log.h similarity index 74% rename from common/include/utils/distributed_hardware_log.h rename to common/include/utils/dcamera_sa_log.h index 87940053b01ebc6b36a022771fe578ce5c266b85..23d83173fbe8d5243f0787cfba1e5c35625cb973 100644 --- a/common/include/utils/distributed_hardware_log.h +++ b/common/include/utils/dcamera_sa_log.h @@ -18,7 +18,7 @@ #include -#include "dh_log.h" +#include "dc_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -27,20 +27,20 @@ namespace DistributedHardware { #define _strline_(x) _sl_(x) #define DCAMERA_STR_LINE _strline_(__LINE__) -#define DHLOGD(fmt, ...) DHLog(DH_LOG_DEBUG, \ - (std::string("[") + DH_LOG_TAG + "][" + __FUNCTION__ + "][" + DCAMERA_FILENAME + ":" + DCAMERA_STR_LINE + "]:" + \ +#define DCLOGD(fmt, ...) DCLog(DC_LOG_DEBUG, \ + (std::string("[") + DC_LOG_TAG + "][" + __FUNCTION__ + "][" + DCAMERA_FILENAME + ":" + DCAMERA_STR_LINE + "]:" + \ fmt).c_str(), ##__VA_ARGS__) -#define DHLOGI(fmt, ...) DHLog(DH_LOG_INFO, \ - (std::string("[") + DH_LOG_TAG + "][" + __FUNCTION__ + "][" + DCAMERA_FILENAME + ":" + DCAMERA_STR_LINE + "]:" + \ +#define DCLOGI(fmt, ...) DCLog(DC_LOG_INFO, \ + (std::string("[") + DC_LOG_TAG + "][" + __FUNCTION__ + "][" + DCAMERA_FILENAME + ":" + DCAMERA_STR_LINE + "]:" + \ fmt).c_str(), ##__VA_ARGS__) -#define DHLOGW(fmt, ...) DHLog(DH_LOG_WARN, \ - (std::string("[") + DH_LOG_TAG + "][" + __FUNCTION__ + "][" + DCAMERA_FILENAME + ":" + DCAMERA_STR_LINE + "]:" + \ +#define DCLOGW(fmt, ...) DCLog(DC_LOG_WARN, \ + (std::string("[") + DC_LOG_TAG + "][" + __FUNCTION__ + "][" + DCAMERA_FILENAME + ":" + DCAMERA_STR_LINE + "]:" + \ fmt).c_str(), ##__VA_ARGS__) -#define DHLOGE(fmt, ...) DHLog(DH_LOG_ERROR, \ - (std::string("[") + DH_LOG_TAG + "][" + __FUNCTION__ + "][" + DCAMERA_FILENAME + ":" + DCAMERA_STR_LINE + "]:" + \ +#define DCLOGE(fmt, ...) DCLog(DC_LOG_ERROR, \ + (std::string("[") + DC_LOG_TAG + "][" + __FUNCTION__ + "][" + DCAMERA_FILENAME + ":" + DCAMERA_STR_LINE + "]:" + \ fmt).c_str(), ##__VA_ARGS__) } // namespace DistributedHardware } // namespace OHOS diff --git a/common/src/utils/dh_log.cpp b/common/src/utils/dc_sa_log.cpp similarity index 81% rename from common/src/utils/dh_log.cpp rename to common/src/utils/dc_sa_log.cpp index 4aa9ffa90f4855c949d29b4f65229b873aab9ab1..52b0a7aff42ded95f0096abea03fa5c38a5fd24b 100644 --- a/common/src/utils/dh_log.cpp +++ b/common/src/utils/dc_sa_log.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "dh_log.h" +#include "dc_sa_log.h" #include "cstdlib" #include "string" @@ -31,21 +31,21 @@ namespace DistributedHardware { const std::string DC_LOG_TITLE_TAG = "DCAMERA"; constexpr int32_t LOG_MAX_LEN = 4096; -static void DHLogOut(DHLogLevel logLevel, const char *logBuf) +static void DCLogOut(DCLogLevel logLevel, const char *logBuf) { #ifdef HI_LOG_ENABLE LogLevel hiLogLevel = LOG_INFO; switch (logLevel) { - case DH_LOG_DEBUG: + case DC_LOG_DEBUG: hiLogLevel = LOG_DEBUG; break; - case DH_LOG_INFO: + case DC_LOG_INFO: hiLogLevel = LOG_INFO; break; - case DH_LOG_WARN: + case DC_LOG_WARN: hiLogLevel = LOG_WARN; break; - case DH_LOG_ERROR: + case DC_LOG_ERROR: hiLogLevel = LOG_ERROR; break; default: @@ -54,16 +54,16 @@ static void DHLogOut(DHLogLevel logLevel, const char *logBuf) (void)HiLogPrint(LOG_CORE, hiLogLevel, LOG_DOMAIN, DC_LOG_TITLE_TAG.c_str(), "%{public}s", logBuf); #else switch (logLevel) { - case DH_LOG_DEBUG: + case DC_LOG_DEBUG: printf("[D]%s\n", logBuf); break; - case DH_LOG_INFO: + case DC_LOG_INFO: printf("[I]%s\n", logBuf); break; - case DH_LOG_WARN: + case DC_LOG_WARN: printf("[W]%s\n", logBuf); break; - case DH_LOG_ERROR: + case DC_LOG_ERROR: printf("[E]%s\n", logBuf); break; default: @@ -72,7 +72,7 @@ static void DHLogOut(DHLogLevel logLevel, const char *logBuf) #endif } -void DHLog(DHLogLevel logLevel, const char *fmt, ...) +void DCLog(DCLogLevel logLevel, const char *fmt, ...) { char logBuf[LOG_MAX_LEN] = {0}; va_list arg; @@ -82,10 +82,10 @@ void DHLog(DHLogLevel logLevel, const char *fmt, ...) int32_t ret = vsprintf_s(logBuf, sizeof(logBuf), fmt, arg); va_end(arg); if (ret < 0) { - DHLogOut(logLevel, "DH log length error."); + DCLogOut(logLevel, "DC log length error."); return; } - DHLogOut(logLevel, logBuf); + DCLogOut(logLevel, logBuf); } } // namespace DistributedHardware } // namespace OHOS diff --git a/common/src/utils/dcamera_buffer_handle.cpp b/common/src/utils/dcamera_buffer_handle.cpp index cb91f2c14fe7c4625ce256b11c9b287001dfc89e..fa96991d3b07580399f26fe735edf1bfed7add07 100644 --- a/common/src/utils/dcamera_buffer_handle.cpp +++ b/common/src/utils/dcamera_buffer_handle.cpp @@ -20,20 +20,20 @@ #include #include -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { void* DCameraMemoryMap(const BufferHandle *buffer) { if (buffer == nullptr) { - DHLOGE("mmap the buffer handle is NULL"); + DCLOGE("mmap the buffer handle is NULL"); return nullptr; } void* virAddr = mmap(NULL, buffer->size, PROT_READ | PROT_WRITE, MAP_SHARED, buffer->fd, 0); if (virAddr == MAP_FAILED) { - DHLOGE("mmap failed errno %s, fd : %d", strerror(errno), buffer->fd); + DCLOGE("mmap failed errno %s, fd : %d", strerror(errno), buffer->fd); return nullptr; } return virAddr; @@ -42,13 +42,13 @@ void* DCameraMemoryMap(const BufferHandle *buffer) void DCameraMemoryUnmap(BufferHandle *buffer) { if (buffer == nullptr) { - DHLOGE("unmmap the buffer handle is NULL"); + DCLOGE("unmmap the buffer handle is NULL"); return; } if (buffer->virAddr != nullptr) { int ret = munmap(buffer->virAddr, buffer->size); if (ret != 0) { - DHLOGE("munmap failed err: %s", strerror(errno)); + DCLOGE("munmap failed err: %s", strerror(errno)); } } buffer->virAddr = nullptr; diff --git a/common/src/utils/dcamera_hisysevent_adapter.cpp b/common/src/utils/dcamera_hisysevent_adapter.cpp index 260f0a65b9e1c042f7887ba6b117722946a291a4..84a953c8a99a3ce3848a3db499285aa10dcd62d5 100644 --- a/common/src/utils/dcamera_hisysevent_adapter.cpp +++ b/common/src/utils/dcamera_hisysevent_adapter.cpp @@ -19,7 +19,7 @@ #include "securec.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -42,7 +42,7 @@ void ReportDcamerInitFail(const std::string& eventName, int32_t errCode, const s "ERRCODE", errCode, "MSG", errMsg); if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error ret %d, errMsg %s.", ret, errMsg.c_str()); + DCLOGE("Write HiSysEvent error ret %d, errMsg %s.", ret, errMsg.c_str()); } } @@ -57,7 +57,7 @@ void ReportRegisterCameraFail(const std::string& eventName, const std::string& d "VERSION", version, "MSG", errMsg); if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error ret %d, devId %s, dhId %s, errMsg %s.", ret, devId.c_str(), + DCLOGE("Write HiSysEvent error ret %d, devId %s, dhId %s, errMsg %s.", ret, devId.c_str(), dhId.c_str(), errMsg.c_str()); } } @@ -70,7 +70,7 @@ void ReportDcamerOptFail(const std::string& eventName, int32_t errCode, const st "ERRCODE", errCode, "MSG", errMsg); if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error ret %d, errMsg %s.", ret, errMsg.c_str()); + DCLOGE("Write HiSysEvent error ret %d, errMsg %s.", ret, errMsg.c_str()); } } @@ -82,7 +82,7 @@ void ReportSaEvent(const std::string& eventName, int32_t saId, const std::string "SAID", saId, "MSG", errMsg); if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + DCLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); } } @@ -97,7 +97,7 @@ void ReportRegisterCameraEvent(const std::string& eventName, const std::string& "VERSION", version, "MSG", errMsg); if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + DCLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); } } @@ -111,7 +111,7 @@ void ReportCameraOperaterEvent(const std::string& eventName, const std::string& "DHID", dhId, "MSG", errMsg); if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + DCLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); } } @@ -128,7 +128,7 @@ void ReportStartCaptureEvent(const std::string& eventName, EventCaptureInfo& cap "STREAMTYPE", ENUM_STREAMTYPE_STRINGS[capture.type_], "MSG", errMsg); if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + DCLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); } } @@ -139,7 +139,7 @@ std::string CreateMsg(const char *format, ...) va_start(args, format); char msg[MSG_MAX_LEN] = {0}; if (vsnprintf_s(msg, sizeof(msg), sizeof(msg) - 1, format, args) < 0) { - DHLOGE("failed to call vsnprintf_s"); + DCLOGE("failed to call vsnprintf_s"); va_end(args); return ""; } diff --git a/common/src/utils/dcamera_utils_tools.cpp b/common/src/utils/dcamera_utils_tools.cpp index 1ce1a1745fca9eb78120110a0508df8c4e08787d..1c4195407a2de6c9f0b9a0021a870be7dd1461b6 100644 --- a/common/src/utils/dcamera_utils_tools.cpp +++ b/common/src/utils/dcamera_utils_tools.cpp @@ -20,7 +20,7 @@ #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "softbus_bus_center.h" @@ -44,7 +44,7 @@ int32_t GetLocalDeviceNetworkId(std::string& networkId) NodeBasicInfo basicInfo = { { 0 } }; int32_t ret = GetLocalNodeDeviceInfo(DCAMERA_PKG_NAME.c_str(), &basicInfo); if (ret != DCAMERA_OK) { - DHLOGE("GetLocalNodeDeviceInfo failed ret: %d", ret); + DCLOGE("GetLocalNodeDeviceInfo failed ret: %d", ret); return ret; } @@ -79,8 +79,8 @@ int32_t GetAlignedHeight(int32_t width) std::string Base64Encode(const unsigned char *toEncode, unsigned int len) { std::string ret; - if (len < 0 || toEncode == nullptr || strlen(reinterpret_cast(toEncode)) != len) { - DHLOGE("toEncode is empty or len is zero"); + if (len == 0 || toEncode == nullptr) { + DCLOGE("toEncode is empty or len is zero"); return ret; } int32_t length = len; @@ -128,6 +128,10 @@ std::string Base64Encode(const unsigned char *toEncode, unsigned int len) std::string Base64Decode(const std::string& basicString) { std::string ret; + if (basicString.empty()) { + DCLOGE("basicString is empty"); + return ret; + } uint32_t i = 0; int index = 0; int len = static_cast(basicString.size()); diff --git a/common/test/unittest/common/utils/BUILD.gn b/common/test/unittest/common/utils/BUILD.gn index 9a1e7ef94c77b87b9168f9557940f22be9db1dd6..a92066a859b75291f45b0276adeb91da01a10c02 100644 --- a/common/test/unittest/common/utils/BUILD.gn +++ b/common/test/unittest/common/utils/BUILD.gn @@ -59,7 +59,7 @@ ohos_unittest("CommonUtilsTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"CommonUtilsTest\"", + "DC_LOG_TAG=\"CommonUtilsTest\"", "LOG_DOMAIN=0xD004100", ] cflags_cc = cflags diff --git a/common/test/unittest/common/utils/data_buffer_test.cpp b/common/test/unittest/common/utils/data_buffer_test.cpp index b973c6c55852066ef307798aa804e0ad32b8f0cd..e643d311599c70febc1ec1a8e8dc9bdd6430d6b8 100644 --- a/common/test/unittest/common/utils/data_buffer_test.cpp +++ b/common/test/unittest/common/utils/data_buffer_test.cpp @@ -17,7 +17,7 @@ #include "data_buffer.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" using namespace testing::ext; @@ -36,24 +36,24 @@ public: void DataBufferTest::SetUpTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DataBufferTest::TearDownTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DataBufferTest::SetUp(void) { - DHLOGI("enter"); + DCLOGI("enter"); size_t capacity = 1; dataBuffer_ = std::make_shared(capacity); } void DataBufferTest::TearDown(void) { - DHLOGI("enter"); + DCLOGI("enter"); dataBuffer_ = nullptr; } diff --git a/common/test/unittest/common/utils/dcamera_buffer_handle_test.cpp b/common/test/unittest/common/utils/dcamera_buffer_handle_test.cpp index 991456d1cfb0172f0de3a973fb9ac69cbe905152..3ab0e4e1641b7d6e71899c3c5c7d5e603d322fe4 100644 --- a/common/test/unittest/common/utils/dcamera_buffer_handle_test.cpp +++ b/common/test/unittest/common/utils/dcamera_buffer_handle_test.cpp @@ -17,7 +17,7 @@ #include "dcamera_buffer_handle.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" using namespace testing::ext; @@ -34,22 +34,22 @@ public: void DcameraBufferHandleTest::SetUpTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DcameraBufferHandleTest::TearDownTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DcameraBufferHandleTest::SetUp(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DcameraBufferHandleTest::TearDown(void) { - DHLOGI("enter"); + DCLOGI("enter"); } /** diff --git a/common/test/unittest/common/utils/dcamera_hisysevent_adapter_test.cpp b/common/test/unittest/common/utils/dcamera_hisysevent_adapter_test.cpp index 35416f479f054f12b7515e6c3170e0bb88d5c349..13b8f2abf334e51c15b82d3f303dbe3c4fbf56b3 100644 --- a/common/test/unittest/common/utils/dcamera_hisysevent_adapter_test.cpp +++ b/common/test/unittest/common/utils/dcamera_hisysevent_adapter_test.cpp @@ -21,7 +21,7 @@ #include "securec.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" using namespace testing::ext; @@ -37,22 +37,22 @@ public: void DcameraHisyseventAdapterTest::SetUpTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DcameraHisyseventAdapterTest::TearDownTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DcameraHisyseventAdapterTest::SetUp(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DcameraHisyseventAdapterTest::TearDown(void) { - DHLOGI("enter"); + DCLOGI("enter"); } /** diff --git a/common/test/unittest/common/utils/dcamera_utils_tools_test.cpp b/common/test/unittest/common/utils/dcamera_utils_tools_test.cpp index 93a77a74ddb26af49aa088f2709cc37fedad3ede..143f82046e646fdacf1f9b786e7b4de2ee670511 100644 --- a/common/test/unittest/common/utils/dcamera_utils_tools_test.cpp +++ b/common/test/unittest/common/utils/dcamera_utils_tools_test.cpp @@ -19,7 +19,7 @@ #include "anonymous_string.h" #include "dcamera_utils_tools.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "nativetoken_kit.h" #include "token_setproc.h" @@ -39,22 +39,22 @@ public: void DcameraUtilsToolsTest::SetUpTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DcameraUtilsToolsTest::TearDownTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DcameraUtilsToolsTest::SetUp(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DcameraUtilsToolsTest::TearDown(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DcameraUtilsToolsTest::SetTokenID() diff --git a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn index e39dec9c916c1baf97298b23f841f7c166a0f79e..bad3b64843cda05498b95b1ad7c9ef4c66d0e2de 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn @@ -44,7 +44,7 @@ ohos_shared_library("distributed_camera_sink_sdk") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"dcamerasinkkits\"", + "DC_LOG_TAG=\"dcamerasinkkits\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp index 2e1a622d77bfac838572baee0d0f41e1b2515266..fd3585b50b4e8bd1cf0335ae2be123852347c8fe 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp @@ -25,7 +25,7 @@ #include "dcamera_sink_load_callback.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "if_system_ability_manager.h" #include "iservice_registry.h" #include "idistributed_camera_sink.h" @@ -38,12 +38,12 @@ IMPLEMENT_SINGLE_INSTANCE(DCameraSinkHandler); DCameraSinkHandler::~DCameraSinkHandler() { - DHLOGI("~DCameraSinkHandler"); + DCLOGI("~DCameraSinkHandler"); } int32_t DCameraSinkHandler::InitSink(const std::string& params) { - DHLOGI("start"); + DCLOGI("start"); { std::lock_guard autoLock(producerMutex_); if (state_ == DCAMERA_SA_STATE_START) { @@ -53,14 +53,14 @@ int32_t DCameraSinkHandler::InitSink(const std::string& params) sptr sm = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (sm == nullptr) { - DHLOGE("GetSourceLocalCamSrv GetSystemAbilityManager failed"); + DCLOGE("GetSourceLocalCamSrv GetSystemAbilityManager failed"); return DCAMERA_INIT_ERR; } ReportSaEvent(INIT_SA_EVENT, DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, "init sink sa event."); sptr loadCallback(new DCameraSinkLoadCallback(params)); int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, loadCallback); if (ret != DCAMERA_OK) { - DHLOGE("systemAbilityId: %d load filed, result code: %d.", DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, ret); + DCLOGE("systemAbilityId: %d load filed, result code: %d.", DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, ret); return DCAMERA_INIT_ERR; } { @@ -70,11 +70,11 @@ int32_t DCameraSinkHandler::InitSink(const std::string& params) return (this->state_ == DCAMERA_SA_STATE_START); }); if (state_ == DCAMERA_SA_STATE_STOP) { - DHLOGE("SinkSA Start failed!"); + DCLOGE("SinkSA Start failed!"); return DCAMERA_INIT_ERR; } } - DHLOGI("end, result: %d", ret); + DCLOGI("end, result: %d", ret); return DCAMERA_OK; } @@ -83,7 +83,7 @@ void DCameraSinkHandler::FinishStartSA(const std::string& params) DCameraSinkHandlerIpc::GetInstance().Init(); sptr dCameraSinkSrv = DCameraSinkHandlerIpc::GetInstance().GetSinkLocalCamSrv(); if (dCameraSinkSrv == nullptr) { - DHLOGE("get Service failed"); + DCLOGE("get Service failed"); return; } dCameraSinkSrv->InitSink(params); @@ -94,7 +94,7 @@ void DCameraSinkHandler::FinishStartSA(const std::string& params) void DCameraSinkHandler::FinishStartSAFailed(const int32_t systemAbilityId) { - DHLOGI("SinkSA Start failed, systemAbilityId: %d.", systemAbilityId); + DCLOGI("SinkSA Start failed, systemAbilityId: %d.", systemAbilityId); std::unique_lock lock(producerMutex_); state_ = DCAMERA_SA_STATE_STOP; producerCon_.notify_one(); @@ -102,33 +102,33 @@ void DCameraSinkHandler::FinishStartSAFailed(const int32_t systemAbilityId) int32_t DCameraSinkHandler::ReleaseSink() { - DHLOGI("start"); + DCLOGI("start"); sptr dCameraSinkSrv = DCameraSinkHandlerIpc::GetInstance().GetSinkLocalCamSrv(); if (dCameraSinkSrv == nullptr) { - DHLOGE("get Service failed"); + DCLOGE("get Service failed"); return DCAMERA_BAD_VALUE; } ReportSaEvent(RELEASE_SA_EVENT, DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, "release sink sa event."); int32_t ret = dCameraSinkSrv->ReleaseSink(); if (ret != DCAMERA_OK) { - DHLOGE("sink service release failed, ret: %d", ret); + DCLOGE("sink service release failed, ret: %d", ret); return ret; } DCameraSinkHandlerIpc::GetInstance().UnInit(); std::unique_lock lock(producerMutex_); state_ = DCAMERA_SA_STATE_STOP; - DHLOGI("success"); + DCLOGI("success"); return DCAMERA_OK; } int32_t DCameraSinkHandler::SubscribeLocalHardware(const std::string& dhId, const std::string& parameters) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DCLOGI("dhId: %s", GetAnonyString(dhId).c_str()); sptr dCameraSinkSrv = DCameraSinkHandlerIpc::GetInstance().GetSinkLocalCamSrv(); if (dCameraSinkSrv == nullptr) { - DHLOGE("get Service failed"); + DCLOGE("get Service failed"); return DCAMERA_BAD_VALUE; } return dCameraSinkSrv->SubscribeLocalHardware(dhId, parameters); @@ -136,10 +136,10 @@ int32_t DCameraSinkHandler::SubscribeLocalHardware(const std::string& dhId, cons int32_t DCameraSinkHandler::UnsubscribeLocalHardware(const std::string& dhId) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DCLOGI("dhId: %s", GetAnonyString(dhId).c_str()); sptr dCameraSinkSrv = DCameraSinkHandlerIpc::GetInstance().GetSinkLocalCamSrv(); if (dCameraSinkSrv == nullptr) { - DHLOGE("get Service failed"); + DCLOGE("get Service failed"); return DCAMERA_BAD_VALUE; } return dCameraSinkSrv->UnsubscribeLocalHardware(dhId); @@ -147,7 +147,7 @@ int32_t DCameraSinkHandler::UnsubscribeLocalHardware(const std::string& dhId) IDistributedHardwareSink *GetSinkHardwareHandler() { - DHLOGI("DCameraSinkHandler::GetSinkHardwareHandler"); + DCLOGI("DCameraSinkHandler::GetSinkHardwareHandler"); return &DCameraSinkHandler::GetInstance(); } } // namespace DistributedHardware 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 40c99275c95d61d84a20d8baf07752cdd487cba9..03b5a4ab38ca9900ca1c7683846bed70a050b44a 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 @@ -19,7 +19,7 @@ #include #include "distributed_camera_constants.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "if_system_ability_manager.h" #include "iservice_registry.h" #include "iremote_broker.h" @@ -28,12 +28,12 @@ namespace OHOS { namespace DistributedHardware { DCameraSinkHandlerIpc::DCameraSinkHandlerIpc() : isInit_(false) { - DHLOGI("Create"); + DCLOGI("Create"); } DCameraSinkHandlerIpc::~DCameraSinkHandlerIpc() { - DHLOGI("Delete"); + DCLOGI("Delete"); UnInit(); } @@ -42,29 +42,29 @@ IMPLEMENT_SINGLE_INSTANCE(DCameraSinkHandlerIpc); void DCameraSinkHandlerIpc::Init() { std::lock_guard autoLock(initCamSrvLock_); - DHLOGI("Start"); + DCLOGI("Start"); if (isInit_) { - DHLOGI("DCameraSinkHandlerIpc has already init"); + DCLOGI("DCameraSinkHandlerIpc has already init"); return; } sinkLocalRecipient_ = new SinkLocalRecipient(); isInit_ = true; - DHLOGI("End"); + DCLOGI("End"); } void DCameraSinkHandlerIpc::UnInit() { std::lock_guard autoLock(initCamSrvLock_); - DHLOGI("Start"); + DCLOGI("Start"); if (!isInit_) { - DHLOGI("DCameraSinkHandlerIpc has already UnInit"); + DCLOGI("DCameraSinkHandlerIpc has already UnInit"); return; } DeleteSinkLocalCamSrv(); - DHLOGI("DCameraSinkHandlerIpc Start free recipient"); + DCLOGI("DCameraSinkHandlerIpc Start free recipient"); sinkLocalRecipient_ = nullptr; isInit_ = false; - DHLOGI("End"); + DCLOGI("End"); } sptr DCameraSinkHandlerIpc::GetSinkLocalCamSrv() @@ -72,26 +72,26 @@ sptr DCameraSinkHandlerIpc::GetSinkLocalCamSrv() { std::lock_guard autoLock(sinkLocalCamSrvLock_); if (localSink_ != nullptr) { - DHLOGI("DCameraSinkHandlerIpc GetSinkLocalCamSrv from cache"); + DCLOGI("DCameraSinkHandlerIpc GetSinkLocalCamSrv from cache"); return localSink_; } } - DHLOGI("Start"); + DCLOGI("Start"); sptr sm = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (sm == nullptr) { - DHLOGE("GetSystemAbilityManager failed"); + DCLOGE("GetSystemAbilityManager failed"); return nullptr; } sptr object = sm->GetSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID); if (object == nullptr) { - DHLOGE("GetSystemAbility failed"); + DCLOGE("GetSystemAbility failed"); return nullptr; } int32_t ret = object->AddDeathRecipient(sinkLocalRecipient_); sptr localSink = iface_cast(object); if (localSink == nullptr) { - DHLOGI("GetSinkLocalCamSrv failed, localSink is null ret: %d", ret); + DCLOGI("GetSinkLocalCamSrv failed, localSink is null ret: %d", ret); return nullptr; } { @@ -101,46 +101,46 @@ sptr DCameraSinkHandlerIpc::GetSinkLocalCamSrv() } localSink_ = localSink; } - DHLOGI("GetSinkLocalCamSrv success, AddDeathRecipient ret: %d", ret); + DCLOGI("GetSinkLocalCamSrv success, AddDeathRecipient ret: %d", ret); return localSink; } void DCameraSinkHandlerIpc::DeleteSinkLocalCamSrv() { - DHLOGI("start"); + DCLOGI("start"); std::lock_guard autoLock(sinkLocalCamSrvLock_); if (localSink_ != nullptr) { localSink_->AsObject()->RemoveDeathRecipient(sinkLocalRecipient_); } localSink_ = nullptr; - DHLOGI("end"); + DCLOGI("end"); } void DCameraSinkHandlerIpc::SinkLocalRecipient::OnRemoteDied(const wptr& remote) { - DHLOGI("SinkLocalRecipient OnRemoteDied received died notify!"); + DCLOGI("SinkLocalRecipient OnRemoteDied received died notify!"); DCameraSinkHandlerIpc::GetInstance().OnSinkLocalCamSrvDied(remote); } void DCameraSinkHandlerIpc::OnSinkLocalCamSrvDied(const wptr& remote) { - DHLOGI("OnSinkLocalCamSrvDied delete diedRemoted"); + DCLOGI("OnSinkLocalCamSrvDied delete diedRemoted"); std::lock_guard autoLock(sinkLocalCamSrvLock_); if (localSink_ == nullptr) { - DHLOGE("localSink is null."); + DCLOGE("localSink is null."); return; } sptr diedRemoted = remote.promote(); if (diedRemoted == nullptr) { - DHLOGE("OnSinkLocalCamSrvDied promote failed!"); + DCLOGE("OnSinkLocalCamSrvDied promote failed!"); return; } if (localSink_->AsObject() != diedRemoted) { - DHLOGI("OnSinkLocalCamSrvDied not found remote object."); + DCLOGI("OnSinkLocalCamSrvDied not found remote object."); return; } - DHLOGI("OnSinkLocalCamSrvDied Clear"); + DCLOGI("OnSinkLocalCamSrvDied Clear"); localSink_->AsObject()->RemoveDeathRecipient(sinkLocalRecipient_); localSink_ = nullptr; } diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp index f7ea2632d70eb80331bed7cbb08747b4274f2c2b..fc26372c167e86df5563bb80df7ed8d1d9a6a669 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp @@ -17,7 +17,7 @@ #include "dcamera_hisysevent_adapter.h" #include "dcamera_sink_handler.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "distributed_camera_constants.h" namespace OHOS { class IRemoteObject; } @@ -27,14 +27,14 @@ DCameraSinkLoadCallback::DCameraSinkLoadCallback(const std::string& params) : pa void DCameraSinkLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbilityId, const sptr& remoteObject) { - DHLOGI("OnLoadSystemAbilitySuccess systemAbilityId: %d, IRmoteObject result: %s", + DCLOGI("OnLoadSystemAbilitySuccess systemAbilityId: %d, IRmoteObject result: %s", systemAbilityId, (remoteObject != nullptr) ? "true" : "false"); if (systemAbilityId != DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID) { - DHLOGE("start aystemabilityId is not sinkSAId!"); + DCLOGE("start aystemabilityId is not sinkSAId!"); return; } if (remoteObject == nullptr) { - DHLOGE("remoteObject is null."); + DCLOGE("remoteObject is null."); return; } DCameraSinkHandler::GetInstance().FinishStartSA(params_); @@ -42,9 +42,9 @@ void DCameraSinkLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbilityId void DCameraSinkLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) { - DHLOGI("OnLoadSystemAbilityFail systemAbilityId: %d.", systemAbilityId); + DCLOGI("OnLoadSystemAbilityFail systemAbilityId: %d.", systemAbilityId); if (systemAbilityId != DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID) { - DHLOGE("start aystemabilityId is not sinkSAId!"); + DCLOGE("start aystemabilityId is not sinkSAId!"); ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, CreateMsg("dcamera sink OnLoadSystemAbilityFail, systemAbilityId: %d", systemAbilityId)); return; diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/distributed_camera_sink_proxy.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/distributed_camera_sink_proxy.cpp index eaca8b0d63479f8209cc2765e27323031eaea162..af1351bb772c4b0ad939ae85014ef25f1d7b68ec 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/distributed_camera_sink_proxy.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/distributed_camera_sink_proxy.cpp @@ -20,20 +20,20 @@ #include "anonymous_string.h" #include "dcamera_ipc_interface_code.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { int32_t DistributedCameraSinkProxy::InitSink(const std::string& params) { - DHLOGI("start"); + DCLOGI("start"); if (params.empty() || params.size() > PARAM_MAX_SIZE) { - DHLOGE("params is invalid"); + DCLOGE("params is invalid"); return DCAMERA_BAD_VALUE; } sptr remote = Remote(); if (remote == nullptr) { - DHLOGE("remote service is null"); + DCLOGE("remote service is null"); return DCAMERA_BAD_VALUE; } @@ -41,11 +41,11 @@ int32_t DistributedCameraSinkProxy::InitSink(const std::string& params) MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(DistributedCameraSinkProxy::GetDescriptor())) { - DHLOGE("write token failed"); + DCLOGE("write token failed"); return DCAMERA_BAD_VALUE; } if (!data.WriteString(params)) { - DHLOGE("write params failed"); + DCLOGE("write params failed"); return DCAMERA_BAD_VALUE; } remote->SendRequest(static_cast(IDCameraSinkInterfaceCode::INIT_SINK), data, reply, option); @@ -55,10 +55,10 @@ int32_t DistributedCameraSinkProxy::InitSink(const std::string& params) int32_t DistributedCameraSinkProxy::ReleaseSink() { - DHLOGI("start"); + DCLOGI("start"); sptr remote = Remote(); if (remote == nullptr) { - DHLOGE("remote service is null"); + DCLOGE("remote service is null"); return DCAMERA_BAD_VALUE; } @@ -66,7 +66,7 @@ int32_t DistributedCameraSinkProxy::ReleaseSink() MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(DistributedCameraSinkProxy::GetDescriptor())) { - DHLOGE("write token failed"); + DCLOGE("write token failed"); return DCAMERA_BAD_VALUE; } remote->SendRequest(static_cast(IDCameraSinkInterfaceCode::RELEASE_SINK), data, reply, option); @@ -76,15 +76,15 @@ int32_t DistributedCameraSinkProxy::ReleaseSink() int32_t DistributedCameraSinkProxy::SubscribeLocalHardware(const std::string& dhId, const std::string& parameters) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DCLOGI("dhId: %s", GetAnonyString(dhId).c_str()); if (parameters.empty() || parameters.size() > PARAM_MAX_SIZE || dhId.empty() || dhId.size() > DID_MAX_SIZE) { - DHLOGE("params is invalid"); + DCLOGE("params is invalid"); return DCAMERA_BAD_VALUE; } sptr remote = Remote(); if (remote == nullptr) { - DHLOGE("remote service is null"); + DCLOGE("remote service is null"); return DCAMERA_BAD_VALUE; } @@ -92,11 +92,11 @@ int32_t DistributedCameraSinkProxy::SubscribeLocalHardware(const std::string& dh MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(DistributedCameraSinkProxy::GetDescriptor())) { - DHLOGE("write token failed"); + DCLOGE("write token failed"); return DCAMERA_BAD_VALUE; } if (!data.WriteString(dhId) || !data.WriteString(parameters)) { - DHLOGE("write params failed"); + DCLOGE("write params failed"); return DCAMERA_BAD_VALUE; } remote->SendRequest(static_cast(IDCameraSinkInterfaceCode::SUBSCRIBE_LOCAL_HARDWARE), data, reply, @@ -107,14 +107,14 @@ int32_t DistributedCameraSinkProxy::SubscribeLocalHardware(const std::string& dh int32_t DistributedCameraSinkProxy::UnsubscribeLocalHardware(const std::string& dhId) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DCLOGI("dhId: %s", GetAnonyString(dhId).c_str()); if (dhId.empty() || dhId.size() > DID_MAX_SIZE) { - DHLOGE("params is invalid"); + DCLOGE("params is invalid"); return DCAMERA_BAD_VALUE; } sptr remote = Remote(); if (remote == nullptr) { - DHLOGE("remote service is null"); + DCLOGE("remote service is null"); return DCAMERA_BAD_VALUE; } @@ -122,11 +122,11 @@ int32_t DistributedCameraSinkProxy::UnsubscribeLocalHardware(const std::string& MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(DistributedCameraSinkProxy::GetDescriptor())) { - DHLOGE("write token failed"); + DCLOGE("write token failed"); return DCAMERA_BAD_VALUE; } if (!data.WriteString(dhId)) { - DHLOGE("write params failed"); + DCLOGE("write params failed"); return DCAMERA_BAD_VALUE; } remote->SendRequest(static_cast(IDCameraSinkInterfaceCode::UNSUBSCRIBE_LOCAL_HARDWARE), data, reply, @@ -137,14 +137,14 @@ int32_t DistributedCameraSinkProxy::UnsubscribeLocalHardware(const std::string& int32_t DistributedCameraSinkProxy::StopCapture(const std::string& dhId) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DCLOGI("dhId: %s", GetAnonyString(dhId).c_str()); if (dhId.empty() || dhId.size() > DID_MAX_SIZE) { - DHLOGE("params is invalid"); + DCLOGE("params is invalid"); return DCAMERA_BAD_VALUE; } sptr remote = Remote(); if (remote == nullptr) { - DHLOGE("remote service is null"); + DCLOGE("remote service is null"); return DCAMERA_BAD_VALUE; } @@ -152,30 +152,30 @@ int32_t DistributedCameraSinkProxy::StopCapture(const std::string& dhId) MessageParcel reply; MessageOption option = { MessageOption::TF_ASYNC }; if (!data.WriteInterfaceToken(DistributedCameraSinkProxy::GetDescriptor())) { - DHLOGE("write token failed"); + DCLOGE("write token failed"); return DCAMERA_BAD_VALUE; } if (!data.WriteString(dhId)) { - DHLOGE("write params failed"); + DCLOGE("write params failed"); return DCAMERA_BAD_VALUE; } remote->SendRequest(static_cast(IDCameraSinkInterfaceCode::STOP_CAPTURE), data, reply, option); int32_t result = reply.ReadInt32(); - DHLOGI("async dhId: %s", GetAnonyString(dhId).c_str()); + DCLOGI("async dhId: %s", GetAnonyString(dhId).c_str()); return result; } int32_t DistributedCameraSinkProxy::ChannelNeg(const std::string& dhId, std::string& channelInfo) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DCLOGI("dhId: %s", GetAnonyString(dhId).c_str()); if (dhId.empty() || dhId.size() > DID_MAX_SIZE || channelInfo.empty() || channelInfo.size() > PARAM_MAX_SIZE) { - DHLOGE("params is invalid"); + DCLOGE("params is invalid"); return DCAMERA_BAD_VALUE; } sptr remote = Remote(); if (remote == nullptr) { - DHLOGE("remote service is null"); + DCLOGE("remote service is null"); return DCAMERA_BAD_VALUE; } @@ -183,11 +183,11 @@ int32_t DistributedCameraSinkProxy::ChannelNeg(const std::string& dhId, std::str MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(DistributedCameraSinkProxy::GetDescriptor())) { - DHLOGE("write token failed"); + DCLOGE("write token failed"); return DCAMERA_BAD_VALUE; } if (!data.WriteString(dhId) || !data.WriteString(channelInfo)) { - DHLOGE("write params failed"); + DCLOGE("write params failed"); return DCAMERA_BAD_VALUE; } remote->SendRequest(static_cast(IDCameraSinkInterfaceCode::CHANNEL_NEG), data, reply, option); @@ -197,14 +197,14 @@ int32_t DistributedCameraSinkProxy::ChannelNeg(const std::string& dhId, std::str int32_t DistributedCameraSinkProxy::GetCameraInfo(const std::string& dhId, std::string& cameraInfo) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DCLOGI("dhId: %s", GetAnonyString(dhId).c_str()); if (dhId.empty() || dhId.size() > DID_MAX_SIZE) { - DHLOGE("parmas is invalid"); + DCLOGE("parmas is invalid"); return DCAMERA_BAD_VALUE; } sptr remote = Remote(); if (remote == nullptr) { - DHLOGE("remote service is null"); + DCLOGE("remote service is null"); return DCAMERA_BAD_VALUE; } @@ -212,11 +212,11 @@ int32_t DistributedCameraSinkProxy::GetCameraInfo(const std::string& dhId, std:: MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(DistributedCameraSinkProxy::GetDescriptor())) { - DHLOGE("write token failed"); + DCLOGE("write token failed"); return DCAMERA_BAD_VALUE; } if (!data.WriteString(dhId) || !data.WriteString(cameraInfo)) { - DHLOGE("write params failed"); + DCLOGE("write params failed"); return DCAMERA_BAD_VALUE; } remote->SendRequest(static_cast(IDCameraSinkInterfaceCode::GET_CAMERA_INFO), data, reply, option); @@ -226,15 +226,15 @@ int32_t DistributedCameraSinkProxy::GetCameraInfo(const std::string& dhId, std:: int32_t DistributedCameraSinkProxy::OpenChannel(const std::string& dhId, std::string& openInfo) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DCLOGI("dhId: %s", GetAnonyString(dhId).c_str()); if (dhId.empty() || dhId.size() > DID_MAX_SIZE || openInfo.empty() || openInfo.size() > PARAM_MAX_SIZE) { - DHLOGE("params is invalid"); + DCLOGE("params is invalid"); return DCAMERA_BAD_VALUE; } sptr remote = Remote(); if (remote == nullptr) { - DHLOGE("remote service is null"); + DCLOGE("remote service is null"); return DCAMERA_BAD_VALUE; } @@ -242,11 +242,11 @@ int32_t DistributedCameraSinkProxy::OpenChannel(const std::string& dhId, std::st MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(DistributedCameraSinkProxy::GetDescriptor())) { - DHLOGE("write token failed"); + DCLOGE("write token failed"); return DCAMERA_BAD_VALUE; } if (!data.WriteString(dhId) || !data.WriteString(openInfo)) { - DHLOGE("write params failed"); + DCLOGE("write params failed"); return DCAMERA_BAD_VALUE; } remote->SendRequest(static_cast(IDCameraSinkInterfaceCode::OPEN_CHANNEL), data, reply, option); @@ -256,14 +256,14 @@ int32_t DistributedCameraSinkProxy::OpenChannel(const std::string& dhId, std::st int32_t DistributedCameraSinkProxy::CloseChannel(const std::string& dhId) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DCLOGI("dhId: %s", GetAnonyString(dhId).c_str()); if (dhId.empty() || dhId.size() > DID_MAX_SIZE) { - DHLOGE("params is invalid"); + DCLOGE("params is invalid"); return DCAMERA_BAD_VALUE; } sptr remote = Remote(); if (remote == nullptr) { - DHLOGE("remote service is null"); + DCLOGE("remote service is null"); return DCAMERA_BAD_VALUE; } @@ -271,11 +271,11 @@ int32_t DistributedCameraSinkProxy::CloseChannel(const std::string& dhId) MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(DistributedCameraSinkProxy::GetDescriptor())) { - DHLOGE("write token failed"); + DCLOGE("write token failed"); return DCAMERA_BAD_VALUE; } if (!data.WriteString(dhId)) { - DHLOGE("write params failed"); + DCLOGE("write params failed"); return DCAMERA_BAD_VALUE; } remote->SendRequest(static_cast(IDCameraSinkInterfaceCode::CLOSE_CHANNEL), data, reply, option); diff --git a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn index 8bb26ab3fc38a863f1a64b8f1afc18603757c607..d3916f375ee203419b1ad1996c38f4b83952935f 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn @@ -47,7 +47,7 @@ ohos_shared_library("distributed_camera_source_sdk") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"dcamerasourcekits\"", + "DC_LOG_TAG=\"dcamerasourcekits\"", "LOG_DOMAIN=0xD004100", ] 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 117d29ee3b0d663bed150e9d087c39f42b562e38..4ea217e79bdde99501b6f3dd0350e6e2c5a1ac0a 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 @@ -17,7 +17,7 @@ #include "anonymous_string.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -30,18 +30,18 @@ DCameraSourceCallback::~DCameraSourceCallback() int32_t DCameraSourceCallback::OnNotifyRegResult(const std::string& devId, const std::string& dhId, const std::string& reqId, int32_t status, std::string& data) { - DHLOGI("DCameraSourceCallback OnNotifyRegResult devId: %s dhId: %s", + DCLOGI("DCameraSourceCallback OnNotifyRegResult devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); std::lock_guard lock(mapMutex_); auto iter = regCallbacks_.find(reqId); if (iter == regCallbacks_.end()) { - DHLOGE("DCameraSourceCallback OnNotifyRegResult not found devId: %s dhId: %s", + DCLOGE("DCameraSourceCallback OnNotifyRegResult not found devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return DCAMERA_NOT_FOUND; } int32_t ret = iter->second->OnRegisterResult(devId, dhId, status, data); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceCallback OnNotifyRegResult failed, devId: %s dhId: %s ret: %d", + DCLOGE("DCameraSourceCallback OnNotifyRegResult failed, devId: %s dhId: %s ret: %d", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), ret); } regCallbacks_.erase(iter); @@ -51,18 +51,18 @@ int32_t DCameraSourceCallback::OnNotifyRegResult(const std::string& devId, const int32_t DCameraSourceCallback::OnNotifyUnregResult(const std::string& devId, const std::string& dhId, const std::string& reqId, int32_t status, std::string& data) { - DHLOGI("DCameraSourceCallback OnNotifyUnregResult devId: %s dhId: %s", + DCLOGI("DCameraSourceCallback OnNotifyUnregResult devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); std::lock_guard lock(mapMutex_); auto iter = unregCallbacks_.find(reqId); if (iter == unregCallbacks_.end()) { - DHLOGE("DCameraSourceCallback OnNotifyUnregResult not found devId: %s dhId: %s", + DCLOGE("DCameraSourceCallback OnNotifyUnregResult not found devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return DCAMERA_NOT_FOUND; } int32_t ret = iter->second->OnUnregisterResult(devId, dhId, status, data); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceCallback OnNotifyUnregResult failed, devId: %s dhId: %s ret: %d", + DCLOGE("DCameraSourceCallback OnNotifyUnregResult failed, devId: %s dhId: %s ret: %d", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), ret); } unregCallbacks_.erase(iter); 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 b7b6dd5ade1f3892188a6a22571fbb4e1a16bffc..87d4b2eccc0401a19cf392896c5fe3f4f0106a26 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 @@ -15,7 +15,7 @@ #include "dcamera_source_callback_stub.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "ipc_object_stub.h" #include "ipc_types.h" #include "message_parcel.h" @@ -35,11 +35,11 @@ DCameraSourceCallbackStub::~DCameraSourceCallbackStub() int32_t DCameraSourceCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - DHLOGI("DCameraSourceCallbackStub OnRemoteRequest code: %d", code); + DCLOGI("DCameraSourceCallbackStub OnRemoteRequest code: %d", code); std::u16string desc = DCameraSourceCallbackStub::GetDescriptor(); std::u16string remoteDesc = data.ReadInterfaceToken(); if (desc != remoteDesc) { - DHLOGE("remoteDesc is invalid!"); + DCLOGE("remoteDesc is invalid!"); return ERR_INVALID_DATA; } auto itFunc = memberFuncMap_.find(code); @@ -53,7 +53,7 @@ int32_t DCameraSourceCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel int32_t DCameraSourceCallbackStub::NotifyRegResultInner(MessageParcel &data, MessageParcel &reply) { - DHLOGI("DCameraSourceCallbackStub NotifyRegResultInner"); + DCLOGI("DCameraSourceCallbackStub NotifyRegResultInner"); int32_t ret = DCAMERA_OK; do { std::string devId = data.ReadString(); @@ -62,7 +62,7 @@ int32_t DCameraSourceCallbackStub::NotifyRegResultInner(MessageParcel &data, Mes int32_t status = data.ReadInt32(); std::string result = data.ReadString(); if (!CheckParams(devId, dhId, reqId, result)) { - DHLOGE("input is invalid"); + DCLOGE("input is invalid"); ret = DCAMERA_BAD_VALUE; break; } @@ -74,7 +74,7 @@ int32_t DCameraSourceCallbackStub::NotifyRegResultInner(MessageParcel &data, Mes int32_t DCameraSourceCallbackStub::NotifyUnregResultInner(MessageParcel &data, MessageParcel &reply) { - DHLOGI("DCameraSourceCallbackStub NotifyUnregResultInner"); + DCLOGI("DCameraSourceCallbackStub NotifyUnregResultInner"); int32_t ret = DCAMERA_OK; do { std::string devId = data.ReadString(); @@ -83,7 +83,7 @@ int32_t DCameraSourceCallbackStub::NotifyUnregResultInner(MessageParcel &data, M int32_t status = data.ReadInt32(); std::string result = data.ReadString(); if (!CheckParams(devId, dhId, reqId, result)) { - DHLOGE("input is invalid"); + DCLOGE("input is invalid"); ret = DCAMERA_BAD_VALUE; break; } @@ -97,12 +97,12 @@ bool DCameraSourceCallbackStub::CheckParams(const std::string& devId, const std: const std::string& result) { if (devId.empty() || devId.size() > DID_MAX_SIZE || dhId.empty() || dhId.size() > DID_MAX_SIZE) { - DHLOGE("devId or dhId is invalid"); + DCLOGE("devId or dhId is invalid"); return false; } if (reqId.empty() || reqId.size() > DID_MAX_SIZE || result.size() > PARAM_MAX_SIZE) { - DHLOGE("reqId or result is invalid"); + DCLOGE("reqId or result is invalid"); return false; } return true; 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 cb66085f456149535c027200442ba88b78708908..8bf74f2cc8c05e27a268444b9d0405a500a032e1 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 @@ -22,7 +22,7 @@ #include "dcamera_source_load_callback.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "if_system_ability_manager.h" #include "iservice_registry.h" @@ -32,18 +32,18 @@ IMPLEMENT_SINGLE_INSTANCE(DCameraSourceHandler); DCameraSourceHandler::DCameraSourceHandler() { - DHLOGI("DCameraSourceHandler construct."); + DCLOGI("DCameraSourceHandler construct."); callback_ = new DCameraSourceCallback(); } DCameraSourceHandler::~DCameraSourceHandler() { - DHLOGI("~DCameraSourceHandler"); + DCLOGI("~DCameraSourceHandler"); } int32_t DCameraSourceHandler::InitSource(const std::string& params) { - DHLOGI("Start"); + DCLOGI("Start"); { std::lock_guard autoLock(producerMutex_); if (state_ == DCAMERA_SA_STATE_START) { @@ -52,14 +52,14 @@ int32_t DCameraSourceHandler::InitSource(const std::string& params) } sptr sm = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (sm == nullptr) { - DHLOGE("GetSourceLocalCamSrv GetSystemAbilityManager failed"); + DCLOGE("GetSourceLocalCamSrv GetSystemAbilityManager failed"); return DCAMERA_INIT_ERR; } ReportSaEvent(INIT_SA_EVENT, DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, "init source sa event."); sptr loadCallback(new DCameraSourceLoadCallback(params)); int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, loadCallback); if (ret != ERR_OK) { - DHLOGE("systemAbilityId: %d load failed, result code: %d.", DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, ret); + DCLOGE("systemAbilityId: %d load failed, result code: %d.", DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, ret); return DCAMERA_INIT_ERR; } { @@ -69,11 +69,11 @@ int32_t DCameraSourceHandler::InitSource(const std::string& params) return (this->state_ == DCAMERA_SA_STATE_START); }); if (state_ == DCAMERA_SA_STATE_STOP) { - DHLOGE("SourceSA Start failed!"); + DCLOGE("SourceSA Start failed!"); return DCAMERA_INIT_ERR; } } - DHLOGI("end, result: %d", ret); + DCLOGI("end, result: %d", ret); return DCAMERA_OK; } @@ -82,7 +82,7 @@ void DCameraSourceHandler::FinishStartSA(const std::string ¶ms) DCameraSourceHandlerIpc::GetInstance().Init(); sptr dCameraSourceSrv = DCameraSourceHandlerIpc::GetInstance().GetSourceLocalCamSrv(); if (dCameraSourceSrv == nullptr) { - DHLOGE("get Service failed"); + DCLOGE("get Service failed"); return; } @@ -94,7 +94,7 @@ void DCameraSourceHandler::FinishStartSA(const std::string ¶ms) void DCameraSourceHandler::FinishStartSAFailed(const int32_t systemAbilityId) { - DHLOGE("SourceSA Start failed, systemAbilityId: %d.", systemAbilityId); + DCLOGE("SourceSA Start failed, systemAbilityId: %d.", systemAbilityId); std::unique_lock lock(producerMutex_); state_ = DCAMERA_SA_STATE_STOP; producerCon_.notify_one(); @@ -102,10 +102,10 @@ void DCameraSourceHandler::FinishStartSAFailed(const int32_t systemAbilityId) int32_t DCameraSourceHandler::ReleaseSource() { - DHLOGI("Start"); + DCLOGI("Start"); sptr dCameraSourceSrv = DCameraSourceHandlerIpc::GetInstance().GetSourceLocalCamSrv(); if (dCameraSourceSrv == nullptr) { - DHLOGE("get Service failed"); + DCLOGE("get Service failed"); return DCAMERA_INIT_ERR; } ReportSaEvent(RELEASE_SA_EVENT, DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, "release source sa event."); @@ -113,22 +113,22 @@ int32_t DCameraSourceHandler::ReleaseSource() DCameraSourceHandlerIpc::GetInstance().UnInit(); std::unique_lock lock(producerMutex_); state_ = DCAMERA_SA_STATE_STOP; - DHLOGI("end"); + DCLOGI("end"); return DCAMERA_OK; } int32_t DCameraSourceHandler::RegisterDistributedHardware(const std::string& devId, const std::string& dhId, const EnableParam& param, std::shared_ptr callback) { - DHLOGI("devId: %s dhId: %s", GetAnonyString(devId).c_str(), + DCLOGI("devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); if (callback == nullptr) { - DHLOGI("RegisterCallback is null."); + DCLOGI("RegisterCallback is null."); return DCAMERA_BAD_VALUE; } sptr dCameraSourceSrv = DCameraSourceHandlerIpc::GetInstance().GetSourceLocalCamSrv(); if (dCameraSourceSrv == nullptr) { - DHLOGE("get Service failed"); + DCLOGE("get Service failed"); return DCAMERA_BAD_VALUE; } @@ -140,7 +140,7 @@ int32_t DCameraSourceHandler::RegisterDistributedHardware(const std::string& dev if (ret != DCAMERA_OK) { callback_->PopRegCallback(reqId); } - DHLOGI("end, ret: %d devId: %s dhId: %s version: %s", + DCLOGI("end, ret: %d devId: %s dhId: %s version: %s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.sinkVersion.c_str()); return ret; } @@ -148,15 +148,15 @@ int32_t DCameraSourceHandler::RegisterDistributedHardware(const std::string& dev int32_t DCameraSourceHandler::UnregisterDistributedHardware(const std::string& devId, const std::string& dhId, std::shared_ptr callback) { - DHLOGI("devId: %s dhId: %s", GetAnonyString(devId).c_str(), + DCLOGI("devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); if (callback == nullptr) { - DHLOGI("UnregisterCallback is null."); + DCLOGI("UnregisterCallback is null."); return DCAMERA_BAD_VALUE; } sptr dCameraSourceSrv = DCameraSourceHandlerIpc::GetInstance().GetSourceLocalCamSrv(); if (dCameraSourceSrv == nullptr) { - DHLOGE("get Service failed"); + DCLOGE("get Service failed"); return DCAMERA_BAD_VALUE; } @@ -168,7 +168,7 @@ int32_t DCameraSourceHandler::UnregisterDistributedHardware(const std::string& d if (ret != DCAMERA_OK) { callback_->PopUnregCallback(reqId); } - DHLOGI("end, ret: %d devId: %s dhId: %s", ret, + DCLOGI("end, ret: %d devId: %s dhId: %s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return ret; } @@ -181,7 +181,7 @@ int32_t DCameraSourceHandler::ConfigDistributedHardware(const std::string& devId IDistributedHardwareSource *GetSourceHardwareHandler() { - DHLOGI("DCameraSourceHandler GetSourceHardwareHandler Start"); + DCLOGI("DCameraSourceHandler GetSourceHardwareHandler Start"); return &DCameraSourceHandler::GetInstance(); } } // namespace DistributedHardware 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 16996d8e722d5eb26c7666fbd497fed5f5ed5e98..77d2e5385ba532eb39f2e8148f54a175091e14ff 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 @@ -21,19 +21,19 @@ #include "if_system_ability_manager.h" #include "iservice_registry.h" #include "distributed_camera_constants.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "iremote_broker.h" namespace OHOS { namespace DistributedHardware { DCameraSourceHandlerIpc::DCameraSourceHandlerIpc() : isInit_(false) { - DHLOGI("DCameraSourceHandlerIpc Create"); + DCLOGI("DCameraSourceHandlerIpc Create"); } DCameraSourceHandlerIpc::~DCameraSourceHandlerIpc() { - DHLOGI("DCameraSourceHandlerIpc Delete"); + DCLOGI("DCameraSourceHandlerIpc Delete"); UnInit(); } @@ -42,29 +42,29 @@ IMPLEMENT_SINGLE_INSTANCE(DCameraSourceHandlerIpc); void DCameraSourceHandlerIpc::Init() { std::lock_guard autoLock(initCamSrvLock_); - DHLOGI("Start"); + DCLOGI("Start"); if (isInit_) { - DHLOGI("DCameraSourceHandlerIpc has already init"); + DCLOGI("DCameraSourceHandlerIpc has already init"); return; } sourceLocalRecipient_ = new SourceLocalRecipient(); isInit_ = true; - DHLOGI("End"); + DCLOGI("End"); } void DCameraSourceHandlerIpc::UnInit() { std::lock_guard autoLock(initCamSrvLock_); - DHLOGI("Start"); + DCLOGI("Start"); if (!isInit_) { - DHLOGI("DCameraSourceHandlerIpc has already UnInit"); + DCLOGI("DCameraSourceHandlerIpc has already UnInit"); return; } DeleteSourceLocalCamSrv(); - DHLOGI("DCameraSourceHandlerIpc Start free recipient"); + DCLOGI("DCameraSourceHandlerIpc Start free recipient"); sourceLocalRecipient_ = nullptr; isInit_ = false; - DHLOGI("End"); + DCLOGI("End"); } sptr DCameraSourceHandlerIpc::GetSourceLocalCamSrv() @@ -72,26 +72,26 @@ sptr DCameraSourceHandlerIpc::GetSourceLocalCamSrv() { std::lock_guard autoLock(sourceLocalCamSrvLock_); if (localSource_ != nullptr) { - DHLOGI("DCameraSourceHandlerIpc GetSourceLocalCamSrv from cache"); + DCLOGI("DCameraSourceHandlerIpc GetSourceLocalCamSrv from cache"); return localSource_; } } - DHLOGI("Start"); + DCLOGI("Start"); sptr sm = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (sm == nullptr) { - DHLOGE("GetSystemAbilityManager failed"); + DCLOGE("GetSystemAbilityManager failed"); return nullptr; } sptr object = sm->GetSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID); if (object == nullptr) { - DHLOGE("GetSystemAbility failed"); + DCLOGE("GetSystemAbility failed"); return nullptr; } int32_t ret = object->AddDeathRecipient(sourceLocalRecipient_); sptr localSource = iface_cast(object); if (localSource == nullptr) { - DHLOGI("GetSourceLocalCamSrv failed, localSource is null ret: %d", ret); + DCLOGI("GetSourceLocalCamSrv failed, localSource is null ret: %d", ret); return nullptr; } { @@ -101,45 +101,45 @@ sptr DCameraSourceHandlerIpc::GetSourceLocalCamSrv() } localSource_ = localSource; } - DHLOGI("success, AddDeathRecipient ret: %d", ret); + DCLOGI("success, AddDeathRecipient ret: %d", ret); return localSource; } void DCameraSourceHandlerIpc::DeleteSourceLocalCamSrv() { - DHLOGI("start"); + DCLOGI("start"); std::lock_guard autoLock(sourceLocalCamSrvLock_); if (localSource_ != nullptr) { localSource_->AsObject()->RemoveDeathRecipient(sourceLocalRecipient_); } localSource_ = nullptr; - DHLOGI("end"); + DCLOGI("end"); } void DCameraSourceHandlerIpc::SourceLocalRecipient::OnRemoteDied(const wptr& remote) { - DHLOGI("SourceLocalRecipient OnRemoteDied received died notify!"); + DCLOGI("SourceLocalRecipient OnRemoteDied received died notify!"); DCameraSourceHandlerIpc::GetInstance().OnSourceLocalCamSrvDied(remote); } void DCameraSourceHandlerIpc::OnSourceLocalCamSrvDied(const wptr& remote) { - DHLOGI("OnSourceLocalCamSrvDied delete diedRemoted"); + DCLOGI("OnSourceLocalCamSrvDied delete diedRemoted"); std::lock_guard autoLock(sourceLocalCamSrvLock_); if (localSource_ == nullptr) { - DHLOGE("localSource is null."); + DCLOGE("localSource is null."); return; } sptr diedRemoted = remote.promote(); if (diedRemoted == nullptr) { - DHLOGE("OnSourceLocalCamSrvDied promote failed!"); + DCLOGE("OnSourceLocalCamSrvDied promote failed!"); return; } if (localSource_->AsObject() != diedRemoted) { - DHLOGI("OnSourceLocalCamSrvDied not found remote object."); + DCLOGI("OnSourceLocalCamSrvDied not found remote object."); return; } - DHLOGI("OnSourceLocalCamSrvDied Clear"); + DCLOGI("OnSourceLocalCamSrvDied Clear"); localSource_->AsObject()->RemoveDeathRecipient(sourceLocalRecipient_); localSource_ = nullptr; } diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp index d6e5243482f0897779132edc96f12ca56a9e64ce..e20f909784704a2315401170063a456c657d5273 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp @@ -17,7 +17,7 @@ #include "dcamera_hisysevent_adapter.h" #include "dcamera_source_handler.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "distributed_camera_constants.h" namespace OHOS { class IRemoteObject; } @@ -27,14 +27,14 @@ DCameraSourceLoadCallback::DCameraSourceLoadCallback(const std::string& params) void DCameraSourceLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbilityId, const sptr& remoteObject) { - DHLOGI("OnLoadSystemAbilitySuccess systemAbilityId: %d, IRmoteObject result: %s", + DCLOGI("OnLoadSystemAbilitySuccess systemAbilityId: %d, IRmoteObject result: %s", systemAbilityId, (remoteObject != nullptr) ? "true" : "false"); if (systemAbilityId != DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID) { - DHLOGE("start systemabilityId is not sourceSAId!"); + DCLOGE("start systemabilityId is not sourceSAId!"); return; } if (remoteObject == nullptr) { - DHLOGE("remoteObject is null."); + DCLOGE("remoteObject is null."); return; } DCameraSourceHandler::GetInstance().FinishStartSA(params_); @@ -42,9 +42,9 @@ void DCameraSourceLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbility void DCameraSourceLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) { - DHLOGI("OnLoadSystemAbilityFail systemAbilityId: %d.", systemAbilityId); + DCLOGI("OnLoadSystemAbilityFail systemAbilityId: %d.", systemAbilityId); if (systemAbilityId != DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID) { - DHLOGE("start systemabilityId is not sourceSAId!"); + DCLOGE("start systemabilityId is not sourceSAId!"); ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, CreateMsg("dcamera source OnLoadSystemAbilityFail, systemAbilityId: %d", systemAbilityId)); return; 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 eab9d98eb9dce690822a7b6b61983edc3d6644c4..4562e942c6621e6b74ce4c0095c0c9ed2487fb4c 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 @@ -18,7 +18,7 @@ #include "anonymous_string.h" #include "dcamera_ipc_interface_code.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "iremote_object.h" #include "message_option.h" #include "message_parcel.h" @@ -28,31 +28,31 @@ namespace DistributedHardware { int32_t DistributedCameraSourceProxy::InitSource(const std::string& params, const sptr& callback) { - DHLOGI("start"); + DCLOGI("start"); if (params.empty() || params.size() > PARAM_MAX_SIZE) { - DHLOGE("params is invalid"); + DCLOGE("params is invalid"); return DCAMERA_BAD_VALUE; } sptr remote = Remote(); if (remote == nullptr) { - DHLOGE("DistributedCameraSourceProxy remote service null"); + DCLOGE("DistributedCameraSourceProxy remote service null"); return DCAMERA_BAD_VALUE; } MessageParcel data; MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(DistributedCameraSourceProxy::GetDescriptor())) { - DHLOGE("write token failed"); + DCLOGE("write token failed"); return DCAMERA_BAD_VALUE; } if (!data.WriteString(params)) { - DHLOGE("write params failed"); + DCLOGE("write params failed"); return DCAMERA_BAD_VALUE; } if (!data.WriteRemoteObject(callback->AsObject())) { - DHLOGE("write callback failed"); + DCLOGE("write callback failed"); return DCAMERA_BAD_VALUE; } @@ -63,17 +63,17 @@ int32_t DistributedCameraSourceProxy::InitSource(const std::string& params, int32_t DistributedCameraSourceProxy::ReleaseSource() { - DHLOGI("start"); + DCLOGI("start"); sptr remote = Remote(); if (remote == nullptr) { - DHLOGE("DistributedCameraSourceProxy remote service null"); + DCLOGE("DistributedCameraSourceProxy remote service null"); return DCAMERA_BAD_VALUE; } MessageParcel data; MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(DistributedCameraSourceProxy::GetDescriptor())) { - DHLOGE("write token failed"); + DCLOGE("write token failed"); return DCAMERA_BAD_VALUE; } remote->SendRequest(static_cast(IDCameraSourceInterfaceCode::RELEASE_SOURCE), data, reply, option); @@ -84,28 +84,28 @@ int32_t DistributedCameraSourceProxy::ReleaseSource() int32_t DistributedCameraSourceProxy::RegisterDistributedHardware(const std::string& devId, const std::string& dhId, const std::string& reqId, const EnableParam& param) { - DHLOGI("devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); + DCLOGI("devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); if (!CheckRegParams(devId, dhId, reqId, param)) { - DHLOGE("input is invalid"); + DCLOGE("input is invalid"); return DCAMERA_BAD_VALUE; } sptr remote = Remote(); if (remote == nullptr) { - DHLOGE("DistributedCameraSourceProxy remote service null"); + DCLOGE("DistributedCameraSourceProxy remote service null"); return DCAMERA_BAD_VALUE; } MessageParcel data; MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(DistributedCameraSourceProxy::GetDescriptor())) { - DHLOGE("write token failed"); + DCLOGE("write token failed"); return DCAMERA_BAD_VALUE; } if (!data.WriteString(devId) || !data.WriteString(dhId) || !data.WriteString(reqId) || !data.WriteString(param.sinkVersion) || !data.WriteString(param.sinkAttrs) || !data.WriteString(param.sourceVersion) || !data.WriteString(param.sourceAttrs)) { - DHLOGE("write params failed"); + DCLOGE("write params failed"); return DCAMERA_BAD_VALUE; } remote->SendRequest(static_cast(IDCameraSourceInterfaceCode::REGISTER_DISTRIBUTED_HARDWARE), @@ -118,12 +118,12 @@ bool DistributedCameraSourceProxy::CheckRegParams(const std::string& devId, cons const std::string& reqId, const EnableParam& param) { if (devId.empty() || devId.size() > DID_MAX_SIZE || dhId.empty() || dhId.size() > DID_MAX_SIZE) { - DHLOGE("devId or dhId is invalid"); + DCLOGE("devId or dhId is invalid"); return false; } if (reqId.empty() || reqId.size() > DID_MAX_SIZE) { - DHLOGE("reqId is invalid"); + DCLOGE("reqId is invalid"); return false; } @@ -131,7 +131,7 @@ bool DistributedCameraSourceProxy::CheckRegParams(const std::string& devId, cons param.sinkAttrs.empty() || param.sinkAttrs.size() > PARAM_MAX_SIZE || param.sourceVersion.empty() || param.sourceVersion.size() > PARAM_MAX_SIZE || param.sourceAttrs.empty() || param.sourceAttrs.size() > PARAM_MAX_SIZE) { - DHLOGE("param is invalid"); + DCLOGE("param is invalid"); return false; } return true; @@ -140,26 +140,26 @@ bool DistributedCameraSourceProxy::CheckRegParams(const std::string& devId, cons int32_t DistributedCameraSourceProxy::UnregisterDistributedHardware(const std::string& devId, const std::string& dhId, const std::string& reqId) { - DHLOGI("devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); + DCLOGI("devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); if (!CheckUnregParams(devId, dhId, reqId)) { - DHLOGE("input is invalid"); + DCLOGE("input is invalid"); return DCAMERA_BAD_VALUE; } sptr remote = Remote(); if (remote == nullptr) { - DHLOGE("DistributedCameraSourceProxy remote service null"); + DCLOGE("DistributedCameraSourceProxy remote service null"); return DCAMERA_BAD_VALUE; } MessageParcel data; MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(DistributedCameraSourceProxy::GetDescriptor())) { - DHLOGE("write token failed"); + DCLOGE("write token failed"); return DCAMERA_BAD_VALUE; } if (!data.WriteString(devId) || !data.WriteString(dhId) || !data.WriteString(reqId)) { - DHLOGE("write params failed"); + DCLOGE("write params failed"); return DCAMERA_BAD_VALUE; } remote->SendRequest(static_cast(IDCameraSourceInterfaceCode::UNREGISTER_DISTRIBUTED_HARDWARE), @@ -172,12 +172,12 @@ bool DistributedCameraSourceProxy::CheckUnregParams(const std::string& devId, co const std::string& reqId) { if (devId.empty() || devId.size() > DID_MAX_SIZE || dhId.empty() || dhId.size() > DID_MAX_SIZE) { - DHLOGE("devId or dhId is invalid"); + DCLOGE("devId or dhId is invalid"); return false; } if (reqId.empty() || reqId.size() > DID_MAX_SIZE) { - DHLOGE("reqId is invalid"); + DCLOGE("reqId is invalid"); return false; } return true; @@ -186,27 +186,27 @@ bool DistributedCameraSourceProxy::CheckUnregParams(const std::string& devId, co int32_t DistributedCameraSourceProxy::DCameraNotify(const std::string& devId, const std::string& dhId, std::string& events) { - DHLOGI("DCameraNotify devId: %s dhId: %s events: %s", + DCLOGI("DCameraNotify devId: %s dhId: %s events: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), events.c_str()); if (!CheckNotifyParams(devId, dhId, events)) { - DHLOGE("input is invalid"); + DCLOGE("input is invalid"); return DCAMERA_BAD_VALUE; } sptr remote = Remote(); if (remote == nullptr) { - DHLOGE("DistributedCameraSourceProxy remote service null"); + DCLOGE("DistributedCameraSourceProxy remote service null"); return DCAMERA_BAD_VALUE; } MessageParcel data; MessageParcel reply; MessageOption option; if (!data.WriteInterfaceToken(DistributedCameraSourceProxy::GetDescriptor())) { - DHLOGE("write token failed"); + DCLOGE("write token failed"); return DCAMERA_BAD_VALUE; } if (!data.WriteString(devId) || !data.WriteString(dhId) || !data.WriteString(events)) { - DHLOGE("write params failed"); + DCLOGE("write params failed"); return DCAMERA_BAD_VALUE; } remote->SendRequest(static_cast(IDCameraSourceInterfaceCode::CAMERA_NOTIFY), @@ -219,12 +219,12 @@ bool DistributedCameraSourceProxy::CheckNotifyParams(const std::string& devId, c std::string& events) { if (devId.empty() || devId.size() > DID_MAX_SIZE || dhId.empty() || dhId.size() > DID_MAX_SIZE) { - DHLOGE("devId or dhId is invalid"); + DCLOGE("devId or dhId is invalid"); return false; } if (events.empty() || events.size() > PARAM_MAX_SIZE) { - DHLOGE("events is invalid"); + DCLOGE("events is invalid"); return false; } return true; diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeoninputbufferavailable_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeoninputbufferavailable_fuzzer/BUILD.gn index 9c22de0e5b9b5c6abb65875127c0d5c4a9ecc50c..785a2582f9d12418cae69db90c049876393bc752 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeoninputbufferavailable_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeoninputbufferavailable_fuzzer/BUILD.gn @@ -63,7 +63,7 @@ ohos_fuzztest("EncodeOnInputBufferAvailableFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"EncodeOnInputBufferAvailableFuzzTest\"", + "DC_LOG_TAG=\"EncodeOnInputBufferAvailableFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeonoutputbufferavailable_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeonoutputbufferavailable_fuzzer/BUILD.gn index e25a18e6c428592a9ac45f08f2de91cc6d102c48..1e1008fe5b62dcd2f0ef71ca16c6bfbe952554a7 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeonoutputbufferavailable_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeonoutputbufferavailable_fuzzer/BUILD.gn @@ -63,7 +63,7 @@ ohos_fuzztest("EncodeOnOutputBufferAvailableFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"EncodeOnOutputBufferAvailableFuzzTest\"", + "DC_LOG_TAG=\"EncodeOnOutputBufferAvailableFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/onsinklocalcamsrvdied_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/onsinklocalcamsrvdied_fuzzer/BUILD.gn index 18d49bda4490bb9856f6d69170b414ce5fdff3d0..4bb5043db310d4ec8c2f4faeafb5ff9fe010de1e 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/onsinklocalcamsrvdied_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/onsinklocalcamsrvdied_fuzzer/BUILD.gn @@ -51,7 +51,7 @@ ohos_fuzztest("OnSinkLocalCamSrvDiedFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"OnSinkLocalCamSrvDiedFuzzTest\"", + "DC_LOG_TAG=\"OnSinkLocalCamSrvDiedFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn index 70e9ef8e39fdd0e6dd029af7e051b0e4b9a90c00..ade0110cb2408a2c7624ec97840b5eea60585296 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn @@ -51,7 +51,7 @@ ohos_fuzztest("SinkHandlerInitSinkFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkHandlerInitSinkFuzzTest\"", + "DC_LOG_TAG=\"SinkHandlerInitSinkFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn index bb4a05b83c11101f2c68e171870b63400072296f..ff027e04daee9561c71998e7929c2ff0aa9dac66 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn @@ -51,7 +51,7 @@ ohos_fuzztest("SinkHandlerSubscribeLocalHardwareFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkHandlerSubscribeLocalHardwareFuzzTest\"", + "DC_LOG_TAG=\"SinkHandlerSubscribeLocalHardwareFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn index 063e351eac23fdb9e43b92ac69a9e2b71c144a62..bebd7b1244679589ad1781bb9d21a5bbe05acd86 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn @@ -52,7 +52,7 @@ ohos_fuzztest("SinkHandlerUnsubscribeLocalHardwareFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkHandlerUnsubscribeLocalHardwareFuzzTest\"", + "DC_LOG_TAG=\"SinkHandlerUnsubscribeLocalHardwareFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn index 911ab69a86fa2a7a53c7564ba8b5c4db2e9cef2b..9c7ade251af03e309fb9b311224980f84e8ee1a9 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn @@ -45,7 +45,7 @@ ohos_fuzztest("SinkOnLoadSystemAbilityFailFuzzTest") { [ "${innerkits_path}/native_cpp/camera_sink:distributed_camera_sink_sdk" ] defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkOnLoadSystemAbilityFailFuzzTest\"", + "DC_LOG_TAG=\"SinkOnLoadSystemAbilityFailFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn index e4926aacc1c02f8781ed86f87e11eb957c91c6a8..c4b7b5fea8703b1a3f2b9652a1c51063f0ddad70 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn @@ -46,7 +46,7 @@ ohos_fuzztest("SinkOnLoadSystemAbilitySuccessFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkOnLoadSystemAbilitySuccessFuzzTest\"", + "DC_LOG_TAG=\"SinkOnLoadSystemAbilitySuccessFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxychannelneg_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxychannelneg_fuzzer/BUILD.gn index f3b06f8a30d87efffe0e040e879791f4d7502dba..37709f4c7f63344e2b0f16137ce5444c37a7baaf 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxychannelneg_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxychannelneg_fuzzer/BUILD.gn @@ -48,7 +48,7 @@ ohos_fuzztest("SinkProxyChannelNegFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkProxyChannelNegFuzzTest\"", + "DC_LOG_TAG=\"SinkProxyChannelNegFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyclosechannel_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyclosechannel_fuzzer/BUILD.gn index 794993177036b16e109e33cac3d6b72763c296d6..0fcdcd83aec92618f71f542373a2b4790c721938 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyclosechannel_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyclosechannel_fuzzer/BUILD.gn @@ -48,7 +48,7 @@ ohos_fuzztest("SinkProxyCloseChannelFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkProxyCloseChannelFuzzTest\"", + "DC_LOG_TAG=\"SinkProxyCloseChannelFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxygetcamerainfo_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxygetcamerainfo_fuzzer/BUILD.gn index 25ee98e7ba218f5e1e7d33b0475f6f865621862e..5e4bc7a19ce18436371d645da517256f630757b3 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxygetcamerainfo_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxygetcamerainfo_fuzzer/BUILD.gn @@ -48,7 +48,7 @@ ohos_fuzztest("SinkProxyGetCameraInfoFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkProxyGetCameraInfoFuzzTest\"", + "DC_LOG_TAG=\"SinkProxyGetCameraInfoFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyinitsink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyinitsink_fuzzer/BUILD.gn index e2e30e5e22e52076ee3deae4d612dcb0bcbb59f0..bae2d2557d3d8b91f2575fd8124658c7e32dbfa2 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyinitsink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyinitsink_fuzzer/BUILD.gn @@ -49,7 +49,7 @@ ohos_fuzztest("SinkProxyInitSinkFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkProxyInitSinkFuzzTest\"", + "DC_LOG_TAG=\"SinkProxyInitSinkFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyopenchannel_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyopenchannel_fuzzer/BUILD.gn index 37cbdd20382d133da4a4c767f78d497291edaf24..8b0c106180253252ab18db9c61d0ea8144d39085 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyopenchannel_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyopenchannel_fuzzer/BUILD.gn @@ -48,7 +48,7 @@ ohos_fuzztest("SinkProxyOpenChannelFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkProxyOpenChannelFuzzTest\"", + "DC_LOG_TAG=\"SinkProxyOpenChannelFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxystopcapture_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxystopcapture_fuzzer/BUILD.gn index 614444b13ab7791f7d39284dc5aa01de0fd8c0d9..a2fd26ef4b4322358530da474cdbb7331eabac14 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxystopcapture_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxystopcapture_fuzzer/BUILD.gn @@ -48,7 +48,7 @@ ohos_fuzztest("SinkProxyStopCaptureFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkProxyStopCaptureFuzzTest\"", + "DC_LOG_TAG=\"SinkProxyStopCaptureFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn index 37bc51dca13200560a80402e4a2629de7aa57de3..b8070b5281e63db84ac61f707cc46d326ef8900b 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn @@ -48,7 +48,7 @@ ohos_fuzztest("SinkProxySubscribeLocalHardwareFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkProxySubscribeLocalHardwareFuzzTest\"", + "DC_LOG_TAG=\"SinkProxySubscribeLocalHardwareFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn index 771e59e0ca06159e037df31cd9b0771cf2cf5984..e8b2e1c1a3aa6f982081282190a56f46b559e216 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn @@ -48,7 +48,7 @@ ohos_fuzztest("SinkProxyUnsubscribeLocalHardwareFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkProxyUnsubscribeLocalHardwareFuzzTest\"", + "DC_LOG_TAG=\"SinkProxyUnsubscribeLocalHardwareFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicechannelneg_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicechannelneg_fuzzer/BUILD.gn index 4fd888f44832fa1c4ad9f2835b9ec6980b197980..8b372b863e1c4e6bd089604b1fb8162fe1b2a950 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicechannelneg_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicechannelneg_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("SinkServiceChannelNegFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkServiceChannelNegFuzzTest\"", + "DC_LOG_TAG=\"SinkServiceChannelNegFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceclosechannel_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceclosechannel_fuzzer/BUILD.gn index 531298f47370c5e0cecd75ef8313b93b180ab0cc..eddfab20e1fe8cf3f00b208e5a58c436f28ab330 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceclosechannel_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceclosechannel_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("SinkServiceCloseChannelFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkServiceCloseChannelFuzzTest\"", + "DC_LOG_TAG=\"SinkServiceCloseChannelFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicegetcamerainfo_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicegetcamerainfo_fuzzer/BUILD.gn index 554b22ecb17d51e1ace76322fc2fbef15327c241..0399a047ac0918cbeb914719047ce070ce7bb02c 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicegetcamerainfo_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicegetcamerainfo_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("SinkServiceGetCameraInfoFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkServiceGetCameraInfoFuzzTest\"", + "DC_LOG_TAG=\"SinkServiceGetCameraInfoFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/BUILD.gn index 00bce3862832dcec991b93c5179c6807103fdb67..77747558299e4c3d59423687abbeab6364447289 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("SinkServiceInitSinkFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkServiceInitSinkFuzzTest\"", + "DC_LOG_TAG=\"SinkServiceInitSinkFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceopenchannel_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceopenchannel_fuzzer/BUILD.gn index b17c687118a2b411479b96f7f3b90f1bf76c2bfb..d8e95bbc0a6d90f355c0ea7fecfb2ee16bfa05fc 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceopenchannel_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceopenchannel_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("SinkServiceOpenChannelFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkServiceOpenChannelFuzzTest\"", + "DC_LOG_TAG=\"SinkServiceOpenChannelFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicereleasesink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicereleasesink_fuzzer/BUILD.gn index 57e8536caa1051fe4934c3d87fc24f8e09045af6..a7670f1d4fed9d4c9b95b150417463520176e807 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicereleasesink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicereleasesink_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("SinkServiceReleaseSinkFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkServiceReleaseSinkFuzzTest\"", + "DC_LOG_TAG=\"SinkServiceReleaseSinkFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopcapture_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopcapture_fuzzer/BUILD.gn index b1902c05bd9ca82c799f1ff0f5e0486d2029bcf6..1b189025f110baf0ffafdcca6a314985463e6ee4 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopcapture_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopcapture_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("SinkServiceStopCaptureFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkServiceStopCaptureFuzzTest\"", + "DC_LOG_TAG=\"SinkServiceStopCaptureFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn index 78572b1639b6f787bfdab5ccbaa8fa0cf73d833b..e46cd5032b3c6c4eebd35912049de023d739697c 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("SinkServiceSubscribeLocalHardwareFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkServiceSubscribeLocalHardwareFuzzTest\"", + "DC_LOG_TAG=\"SinkServiceSubscribeLocalHardwareFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn index a323a69853d6d8842b7ae67b2e31a084807744ff..819afaad2faf327195f4dbd31bf38fc5066346e9 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn @@ -55,7 +55,7 @@ ohos_fuzztest("SinkServiceUnsubscribeLocalHardwareFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SinkServiceUnsubscribeLocalHardwareFuzzTest\"", + "DC_LOG_TAG=\"SinkServiceUnsubscribeLocalHardwareFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkbytesreceived_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkbytesreceived_fuzzer/BUILD.gn index e0602106f931f7cbe982b4899b48f751491ed35c..cb8a12f79724a9c874bee1c88024294bf1cd0ac5 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkbytesreceived_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkbytesreceived_fuzzer/BUILD.gn @@ -55,7 +55,7 @@ ohos_fuzztest("SoftbusOnSinkBytesReceivedFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SoftbusOnSinkBytesReceivedFuzzTest\"", + "DC_LOG_TAG=\"SoftbusOnSinkBytesReceivedFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkmessagereceived_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkmessagereceived_fuzzer/BUILD.gn index 8a7aaa560d62207c77fda6fed28c212a62f736ec..53a78dba727e5869c1eb803d8a5c8fd9660a16e6 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkmessagereceived_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkmessagereceived_fuzzer/BUILD.gn @@ -55,7 +55,7 @@ ohos_fuzztest("SoftbusOnSinkMessageReceivedFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SoftbusOnSinkMessageReceivedFuzzTest\"", + "DC_LOG_TAG=\"SoftbusOnSinkMessageReceivedFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinksessionclosed_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinksessionclosed_fuzzer/BUILD.gn index 65e647b87d67de287ce0ef0d72f26078df103b21..03d0b1b3367931457677846f28d8c5e6ae042b62 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinksessionclosed_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinksessionclosed_fuzzer/BUILD.gn @@ -55,7 +55,7 @@ ohos_fuzztest("SoftbusOnSinkSessionClosedFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SoftbusOnSinkSessionClosedFuzzTest\"", + "DC_LOG_TAG=\"SoftbusOnSinkSessionClosedFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinksessionopened_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinksessionopened_fuzzer/BUILD.gn index 20158082e2be8d43299bbc1b1a9e88a7309ecb05..058ed8e64e7923d8fd183efa53915731f9a29674 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinksessionopened_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinksessionopened_fuzzer/BUILD.gn @@ -55,7 +55,7 @@ ohos_fuzztest("SoftbusOnSinkSessionOpenedFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SoftbusOnSinkSessionOpenedFuzzTest\"", + "DC_LOG_TAG=\"SoftbusOnSinkSessionOpenedFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkstreamreceived_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkstreamreceived_fuzzer/BUILD.gn index 560f27575bf91a3414189e0ba4ca2938b6dbd8f8..a764fa6ec224b55cac33dfe8af0bb750a81eac34 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkstreamreceived_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/softbusonsinkstreamreceived_fuzzer/BUILD.gn @@ -55,7 +55,7 @@ ohos_fuzztest("SoftbusOnSinkStreamReceivedFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SoftbusOnSinkStreamReceivedFuzzTest\"", + "DC_LOG_TAG=\"SoftbusOnSinkStreamReceivedFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonnotifyregresult_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonnotifyregresult_fuzzer/BUILD.gn index 49455bc7752df5c6f3a4ca8b010a21d18494e2cf..ef5ae5f7372ce3f71e870e8a8d465baba3643857 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonnotifyregresult_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonnotifyregresult_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("CallbackOnNotifyRegResultFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"CallbackOnNotifyRegResultFuzzTest\"", + "DC_LOG_TAG=\"CallbackOnNotifyRegResultFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonnotifyunregresult_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonnotifyunregresult_fuzzer/BUILD.gn index a899aeef900677fb12fde98e8e079f127adb111d..15b51caffe19ce3eea8630ea8860606f3026d14b 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonnotifyunregresult_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonnotifyunregresult_fuzzer/BUILD.gn @@ -53,7 +53,7 @@ ohos_fuzztest("CallbackOnNotifyUnRegResultFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"CallbackOnNotifyUnRegResultFuzzTest\"", + "DC_LOG_TAG=\"CallbackOnNotifyUnRegResultFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonremoterequest_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonremoterequest_fuzzer/BUILD.gn index 80a7e27566810c4cf970640b8fd98a0600bc5328..e5b3a7421ab979f5ec58c26ebd97b3276fcfa296 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonremoterequest_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/callbackonremoterequest_fuzzer/BUILD.gn @@ -52,7 +52,7 @@ ohos_fuzztest("CallbackOnRemoteRequestFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"CallbackOnRemoteRequestFuzzTest\"", + "DC_LOG_TAG=\"CallbackOnRemoteRequestFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeoninputbufferavailable_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeoninputbufferavailable_fuzzer/BUILD.gn index f89b104adf646f08fda6214842e9da7ac812df0d..c41ddf5d31dd2c2a1889af76823cea61f83566fa 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeoninputbufferavailable_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeoninputbufferavailable_fuzzer/BUILD.gn @@ -24,8 +24,10 @@ ohos_fuzztest("DecodeOnInputBufferAvailableFuzzTest") { fuzz_config_file = "${innerkits_path}/native_cpp/test/sourcefuzztest/decodeoninputbufferavailable_fuzzer" include_dirs = [ + "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/eventbus", + "${fwk_utils_path}/include/log", "${graphicstandard_path}/frameworks/surface/include", "${services_path}/cameraservice/base/include", ] @@ -63,12 +65,13 @@ ohos_fuzztest("DecodeOnInputBufferAvailableFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DecodeOnInputBufferAvailableFuzzTest\"", + "DC_LOG_TAG=\"DecodeOnInputBufferAvailableFuzzTest\"", "LOG_DOMAIN=0xD004100", ] external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "eventhandler:libeventhandler", "graphic_2d:surface", "hitrace:hitrace_meter", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeonoutputbufferavailable_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeonoutputbufferavailable_fuzzer/BUILD.gn index 2150eac02ff294335d239553cc11ffea83fa2c71..8f0dbab2a6d41a56b11a05f4649d947915be01b4 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeonoutputbufferavailable_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeonoutputbufferavailable_fuzzer/BUILD.gn @@ -63,7 +63,7 @@ ohos_fuzztest("DecodeOnOutputBufferAvailableFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DecodeOnOutputBufferAvailableFuzzTest\"", + "DC_LOG_TAG=\"DecodeOnOutputBufferAvailableFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/onsourcelocalcamsrvdied_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/onsourcelocalcamsrvdied_fuzzer/BUILD.gn index ffad785a7b15f494072c438a85041510e5397023..dffa56e917816782737a88325f21c022b146552a 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/onsourcelocalcamsrvdied_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/onsourcelocalcamsrvdied_fuzzer/BUILD.gn @@ -51,7 +51,7 @@ ohos_fuzztest("OnSourceLocalCamSrvDiedFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"OnSourceLocalCamSrvDiedFuzzTest\"", + "DC_LOG_TAG=\"OnSourceLocalCamSrvDiedFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcebytesreceived_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcebytesreceived_fuzzer/BUILD.gn index 88b7c5cfb9f07d685f98484b64947bf26fd77d69..2ef55bf937c4fafef0cea45a8434f51f23c05b77 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcebytesreceived_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcebytesreceived_fuzzer/BUILD.gn @@ -55,7 +55,7 @@ ohos_fuzztest("SoftbusOnSourceBytesReceivedFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SoftbusOnSourceBytesReceivedFuzzTest\"", + "DC_LOG_TAG=\"SoftbusOnSourceBytesReceivedFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcemessagereceived_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcemessagereceived_fuzzer/BUILD.gn index 4d999ef19780e130eafe59298078b418b31f25c1..51bd32d34b1605b53e47d05ad56ae873db036355 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcemessagereceived_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcemessagereceived_fuzzer/BUILD.gn @@ -55,7 +55,7 @@ ohos_fuzztest("SoftbusOnSourceMessageReceivedFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SoftbusOnSourceMessageReceivedFuzzTest\"", + "DC_LOG_TAG=\"SoftbusOnSourceMessageReceivedFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcesessionclosed_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcesessionclosed_fuzzer/BUILD.gn index 3fb87f5a4d74965dbbd5715e6b8fc490f8c12683..d9c2159a3c2581c118fa97bb2f2d34e117426878 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcesessionclosed_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcesessionclosed_fuzzer/BUILD.gn @@ -55,7 +55,7 @@ ohos_fuzztest("SoftbusOnSourceSessionClosedFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SoftbusOnSourceSessionClosedFuzzTest\"", + "DC_LOG_TAG=\"SoftbusOnSourceSessionClosedFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcesessionopened_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcesessionopened_fuzzer/BUILD.gn index 97ddda4fc374e307ccd98c297e0a26253588132d..f682dbbbd9feae48e598c7c0a32fd3004ac3a814 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcesessionopened_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcesessionopened_fuzzer/BUILD.gn @@ -55,7 +55,7 @@ ohos_fuzztest("SoftbusOnSourceSessionOpenedFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SoftbusOnSourceSessionOpenedFuzzTest\"", + "DC_LOG_TAG=\"SoftbusOnSourceSessionOpenedFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcestreamreceived_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcestreamreceived_fuzzer/BUILD.gn index 629232df2b91d3029016dbf763c170d0a6f1bb09..ce9c52e9722a4b3a668241090802eedfdc9b8215 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcestreamreceived_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/softbusonsourcestreamreceived_fuzzer/BUILD.gn @@ -55,7 +55,7 @@ ohos_fuzztest("SoftbusOnSourceStreamReceivedFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SoftbusOnSourceStreamReceivedFuzzTest\"", + "DC_LOG_TAG=\"SoftbusOnSourceStreamReceivedFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn index 6ce2996b4f8adc257c3277f3446b881191dde099..508b6cbc59e4c659669fd438f4695262673c033d 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn @@ -48,7 +48,7 @@ ohos_fuzztest("SourceHandlerConfigDistributedHardwareFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SourceHandlerConfigDistributedHardwareFuzzTest\"", + "DC_LOG_TAG=\"SourceHandlerConfigDistributedHardwareFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn index 5e902737a893c8e91aecea3b01a009cd464ec5cc..eca9560926b5988955a1c5a21264e17d6bc6ea6c 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn @@ -47,7 +47,7 @@ ohos_fuzztest("SourceHandlerInitSourceFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SourceHandlerInitSourceFuzzTest\"", + "DC_LOG_TAG=\"SourceHandlerInitSourceFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn index bd1de85e64d73f9ec4171f3cb28ae73905a71997..f4258d088180a5620d18b7ff6d5e1cb5ab5c3f71 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn @@ -50,7 +50,7 @@ ohos_fuzztest("SourceHandlerRegisterDistributedHardwareFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SourceHandlerRegisterDistributedHardwareFuzzTest\"", + "DC_LOG_TAG=\"SourceHandlerRegisterDistributedHardwareFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn index e93b1a6a4f3853b05db7210730c932a88f1e0b2a..c09afe80e4d39781a5df60b048521e75d68b042c 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn @@ -50,7 +50,7 @@ ohos_fuzztest("SourceHandlerUnregisterDistributedHardwareFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SourceHandlerUnregisterDistributedHardwareFuzzTest\"", + "DC_LOG_TAG=\"SourceHandlerUnregisterDistributedHardwareFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn index 1b2184fdeff06d0dd31e8c33c29bb5f48ea739de..2704b2b59d6060153f509d389ff7daa76d27cb53 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn @@ -50,7 +50,7 @@ ohos_fuzztest("SourceOnLoadSystemAbilityFailFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SourceOnLoadSystemAbilityFailFuzzTest\"", + "DC_LOG_TAG=\"SourceOnLoadSystemAbilityFailFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn index 46dfcc4d6f66309bf54698a0afec6e3bdcdcc3dd..b838b93001a1d95ae6d765336d03bd6211372fc4 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn @@ -50,7 +50,7 @@ ohos_fuzztest("SourceOnLoadSystemAbilitySuccessFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SourceOnLoadSystemAbilitySuccessFuzzTest\"", + "DC_LOG_TAG=\"SourceOnLoadSystemAbilitySuccessFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxydcameranotify_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxydcameranotify_fuzzer/BUILD.gn index d7844508c4fa524594a83b845468c45f1e4e243c..3fdd43934e2435c4b541f1c18dea4cb918dd7845 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxydcameranotify_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxydcameranotify_fuzzer/BUILD.gn @@ -51,7 +51,7 @@ ohos_fuzztest("SourceProxyDCameraNotifyFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SourceProxyDCameraNotifyFuzzTest\"", + "DC_LOG_TAG=\"SourceProxyDCameraNotifyFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyinitsource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyinitsource_fuzzer/BUILD.gn index db3689835e7bdd241f68b86ff853ab1f4e5feb38..db3e0564f83ba262f7ded7272a2bcc451be4820d 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyinitsource_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyinitsource_fuzzer/BUILD.gn @@ -51,7 +51,7 @@ ohos_fuzztest("SourceProxyInitSourceFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SourceProxyInitSourceFuzzTest\"", + "DC_LOG_TAG=\"SourceProxyInitSourceFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn index 1fe85864735e0423ba45e2c4f6d883d4f494066b..da3f8314a51d976ece8e233120f97558031f8178 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn @@ -52,7 +52,7 @@ ohos_fuzztest("SourceProxyRegisterDistributedHardwareFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SourceProxyRegisterDistributedHardwareFuzzTest\"", + "DC_LOG_TAG=\"SourceProxyRegisterDistributedHardwareFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn index 54634dab6eae3877e655e138dbaa9b676e62d428..329cfcb139b31bd33cc4f71a84d057fdaa680c64 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn @@ -52,7 +52,7 @@ ohos_fuzztest("SourceProxyUnregisterDistributedHardwareFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SourceProxyUnregisterDistributedHardwareFuzzTest\"", + "DC_LOG_TAG=\"SourceProxyUnregisterDistributedHardwareFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicedcameranotify_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicedcameranotify_fuzzer/BUILD.gn index 7511de33778da7932ff63a3fdabff7b9ecdcc52f..da1985a381506bb5b5dcd8329aa5f07cfd942f37 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicedcameranotify_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicedcameranotify_fuzzer/BUILD.gn @@ -66,7 +66,7 @@ ohos_fuzztest("SourceServiceDCameraNotifyFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SourceServiceDCameraNotifyFuzzTest\"", + "DC_LOG_TAG=\"SourceServiceDCameraNotifyFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceinitsource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceinitsource_fuzzer/BUILD.gn index 850f411b34b71e1b85f75634e7baa0dcc7499a60..84f784c1c59b193ab499ab2542801262a8d7c725 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceinitsource_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceinitsource_fuzzer/BUILD.gn @@ -67,7 +67,7 @@ ohos_fuzztest("SourceServiceInitSourceFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SourceServiceInitSourceFuzzTest\"", + "DC_LOG_TAG=\"SourceServiceInitSourceFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn index 534f9925774268e02203b288e1b4785c7174d36d..f4239d5a585c5c14af0380ba6f939d56194500cb 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn @@ -67,7 +67,7 @@ ohos_fuzztest("SourceServiceRegisterDistributedHardwareFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SourceServiceRegisterDistributedHardwareFuzzTest\"", + "DC_LOG_TAG=\"SourceServiceRegisterDistributedHardwareFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicereleasesource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicereleasesource_fuzzer/BUILD.gn index 47ce304c348d927b92735d5d9c0461c9dfae46e8..00166d2e3a7fe690bd06f29cddb9fd273f9eef53 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicereleasesource_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicereleasesource_fuzzer/BUILD.gn @@ -66,7 +66,7 @@ ohos_fuzztest("SourceServiceReleaseSourceFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SourceServiceReleaseSourceFuzzTest\"", + "DC_LOG_TAG=\"SourceServiceReleaseSourceFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn index d7a83b1b222a7544b188e777e08e0a284c606593..8e6f92f60ed35f0f5bbbc2f84d7f97732955bb4e 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn @@ -67,7 +67,7 @@ ohos_fuzztest("SourceServiceUnregisterDistributedHardwareFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SourceServiceUnregisterDistributedHardwareFuzzTest\"", + "DC_LOG_TAG=\"SourceServiceUnregisterDistributedHardwareFuzzTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn index 40e2cc442dced64969d2ac0e41c38f2f656437b3..78ddd7bd934411c72aeeca9438a2c4f4019af4b5 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn @@ -53,7 +53,7 @@ ohos_unittest("DCameraSinkHandlerTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DCameraSinkHandlerTest\"", + "DC_LOG_TAG=\"DCameraSinkHandlerTest\"", "LOG_DOMAIN=0xD004100", ] } diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_ipc_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_ipc_test.cpp index dc5a4101754bad56740d5555bc56ef67579b9d48..025ec15a9683898fe13f0302383226b6a34ed1a4 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_ipc_test.cpp +++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_ipc_test.cpp @@ -21,7 +21,7 @@ #undef private #include "distributed_camera_constants.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "if_system_ability_manager.h" #include "iservice_registry.h" #include "iremote_broker.h" @@ -40,22 +40,22 @@ public: void DCameraSinkHandlerIpcTest::SetUpTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraSinkHandlerIpcTest::TearDownTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraSinkHandlerIpcTest::SetUp(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraSinkHandlerIpcTest::TearDown(void) { - DHLOGI("enter"); + DCLOGI("enter"); } /** diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_test.cpp index 7b0677c8d38141003b0ffee84913f24a162aeb5d..6ae11decc2ea1a424f5f1528834ac0fc7056e240 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_test.cpp +++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_test.cpp @@ -25,7 +25,7 @@ #include "dcamera_sink_load_callback.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "if_system_ability_manager.h" #include "iservice_registry.h" #include "idistributed_camera_sink.h" @@ -49,22 +49,22 @@ const std::string TEST_CAMERA_DH_ID_0 = "camera_0"; } void DCameraSinkHandlerTest::SetUpTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraSinkHandlerTest::TearDownTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraSinkHandlerTest::SetUp(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraSinkHandlerTest::TearDown(void) { - DHLOGI("enter"); + DCLOGI("enter"); } /** diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/BUILD.gn b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/BUILD.gn index 3703114e3ae46212ddbaed62ad84cee35a459310..cc6622b61d041a334b2159eec0590fe446331b30 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/BUILD.gn @@ -56,7 +56,7 @@ ohos_unittest("DCameraSourceHandlerTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DCameraSourceHandlerTest\"", + "DC_LOG_TAG=\"DCameraSourceHandlerTest\"", "LOG_DOMAIN=0xD004100", ] } diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/callback/dcamera_source_callback_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/callback/dcamera_source_callback_test.cpp index 6872dd32aad4c1eb2c52d97437767d9c36492f97..74985ff57034c654b5c182ec55ceed5fee1d421a 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/callback/dcamera_source_callback_test.cpp +++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/callback/dcamera_source_callback_test.cpp @@ -21,7 +21,7 @@ #include "anonymous_string.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" using namespace testing::ext; @@ -63,23 +63,23 @@ public: void DCameraSourceCallbackTest::SetUpTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraSourceCallbackTest::TearDownTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraSourceCallbackTest::SetUp(void) { - DHLOGI("enter"); + DCLOGI("enter"); sourceCallback_ = std::make_shared(); } void DCameraSourceCallbackTest::TearDown(void) { - DHLOGI("enter"); + DCLOGI("enter"); sourceCallback_ = nullptr; } diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/dcamera_source_handler_ipc_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/dcamera_source_handler_ipc_test.cpp index a0f2fa77a8d2287fc999c736251c410cf7a2e3e3..ffeaa42b476fe8b6626f61928e414cc19e600c74 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/dcamera_source_handler_ipc_test.cpp +++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/dcamera_source_handler_ipc_test.cpp @@ -21,7 +21,7 @@ #undef private #include "distributed_camera_constants.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "if_system_ability_manager.h" #include "iservice_registry.h" #include "iremote_broker.h" @@ -40,22 +40,22 @@ public: void DCameraSourceHandlerIpcTest::SetUpTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraSourceHandlerIpcTest::TearDownTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraSourceHandlerIpcTest::SetUp(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraSourceHandlerIpcTest::TearDown(void) { - DHLOGI("enter"); + DCLOGI("enter"); } /** diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/dcamera_source_handler_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/dcamera_source_handler_test.cpp index e65d9745d23e246622705ae1076579a367157d47..7f9c906593379f2fe5738f7c686f02c3fb9340a2 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/dcamera_source_handler_test.cpp +++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/dcamera_source_handler_test.cpp @@ -25,7 +25,7 @@ #include "dcamera_source_load_callback.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "mock_component_disable.h" #include "mock_component_enable.h" #include "if_system_ability_manager.h" @@ -51,22 +51,22 @@ const std::string TEST_ATTRS = ""; } void DCameraSourceHandlerTest::SetUpTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraSourceHandlerTest::TearDownTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraSourceHandlerTest::SetUp(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraSourceHandlerTest::TearDown(void) { - DHLOGI("enter"); + DCLOGI("enter"); } /** diff --git a/services/cameraservice/base/src/dcamera_capture_info_cmd.cpp b/services/cameraservice/base/src/dcamera_capture_info_cmd.cpp index a85ff75f285c3b8aec8adfe1bc897bc73e7840a0..8d00919a7da1ace404c8f77e5eab08fe03e2c2bc 100644 --- a/services/cameraservice/base/src/dcamera_capture_info_cmd.cpp +++ b/services/cameraservice/base/src/dcamera_capture_info_cmd.cpp @@ -17,7 +17,7 @@ #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/cameraservice/base/src/dcamera_channel_info_cmd.cpp b/services/cameraservice/base/src/dcamera_channel_info_cmd.cpp index 4057ea91d749b5abefdcffeab431d511270770bf..f09a823bc95c72d6b90f9e28d5c4e65f623dbc77 100644 --- a/services/cameraservice/base/src/dcamera_channel_info_cmd.cpp +++ b/services/cameraservice/base/src/dcamera_channel_info_cmd.cpp @@ -17,7 +17,7 @@ #include "cJSON.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/cameraservice/base/src/dcamera_event_cmd.cpp b/services/cameraservice/base/src/dcamera_event_cmd.cpp index 623dcefa4a1b32ed7a3355c3e6f395edd888c0bc..a35c729a588abf4d1e2cbf3c483d1e91756a76c5 100644 --- a/services/cameraservice/base/src/dcamera_event_cmd.cpp +++ b/services/cameraservice/base/src/dcamera_event_cmd.cpp @@ -17,7 +17,7 @@ #include "cJSON.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/cameraservice/base/src/dcamera_info_cmd.cpp b/services/cameraservice/base/src/dcamera_info_cmd.cpp index 6b2288d54d177d03fb308a77cdd110820898fc24..a6c3c1e892f98a13213953f08abd33bb37c6ede9 100644 --- a/services/cameraservice/base/src/dcamera_info_cmd.cpp +++ b/services/cameraservice/base/src/dcamera_info_cmd.cpp @@ -18,7 +18,7 @@ #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/cameraservice/base/src/dcamera_metadata_setting_cmd.cpp b/services/cameraservice/base/src/dcamera_metadata_setting_cmd.cpp index ee0c5af6d3cd13af29f54a75319ef4b3b0254f3a..ac2fec8716c1ae0ba72aa9c18d75dc85a70a211f 100644 --- a/services/cameraservice/base/src/dcamera_metadata_setting_cmd.cpp +++ b/services/cameraservice/base/src/dcamera_metadata_setting_cmd.cpp @@ -18,7 +18,7 @@ #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/cameraservice/base/src/dcamera_open_info_cmd.cpp b/services/cameraservice/base/src/dcamera_open_info_cmd.cpp index f782224083cc9dd8d61f10eedca3e3e1a96b6dd1..aedb521d99576bb0d02a511058fb4739c92a38d4 100644 --- a/services/cameraservice/base/src/dcamera_open_info_cmd.cpp +++ b/services/cameraservice/base/src/dcamera_open_info_cmd.cpp @@ -18,7 +18,7 @@ #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/cameraservice/base/src/dcamera_sink_frame_info.cpp b/services/cameraservice/base/src/dcamera_sink_frame_info.cpp index f2148627d8a62ed9bc21ab9a9788682874f88866..2107bbf0306365d25081bdd3670151221d0655ed 100644 --- a/services/cameraservice/base/src/dcamera_sink_frame_info.cpp +++ b/services/cameraservice/base/src/dcamera_sink_frame_info.cpp @@ -16,7 +16,7 @@ #include "dcamera_sink_frame_info.h" #include "nlohmann/json.hpp" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" using json = nlohmann::json; namespace OHOS { @@ -38,7 +38,7 @@ int32_t DCameraSinkFrameInfo::Unmarshal(const std::string& jsonStr) { json frameInfo = json::parse(jsonStr, nullptr, false); if (frameInfo.is_discarded()) { - DHLOGE("FrameInfo json::parse error."); + DCLOGE("FrameInfo json::parse error."); return DCAMERA_BAD_VALUE; } diff --git a/services/cameraservice/base/test/unittest/common/base/BUILD.gn b/services/cameraservice/base/test/unittest/common/base/BUILD.gn index dca30f138219f4a5e22f37f2ba2d23c4b1a8d44a..e8f8b68624a31a4ea24c21a822677c400a093f50 100755 --- a/services/cameraservice/base/test/unittest/common/base/BUILD.gn +++ b/services/cameraservice/base/test/unittest/common/base/BUILD.gn @@ -73,7 +73,7 @@ ohos_unittest("DCameraServicesBaseTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DCameraServicesBaseTest\"", + "DC_LOG_TAG=\"DCameraServicesBaseTest\"", "LOG_DOMAIN=0xD004100", ] } diff --git a/services/cameraservice/base/test/unittest/common/base/dcamera_protocol_test.cpp b/services/cameraservice/base/test/unittest/common/base/dcamera_protocol_test.cpp index 26192f4f93c5f85611e1cbe1162ea2b5df9271f3..e30dd7ba3d527b9e61d2edde7252b8a6d04baa72 100755 --- a/services/cameraservice/base/test/unittest/common/base/dcamera_protocol_test.cpp +++ b/services/cameraservice/base/test/unittest/common/base/dcamera_protocol_test.cpp @@ -17,7 +17,7 @@ #include #include "anonymous_string.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "dcamera_capture_info_cmd.h" #include "dcamera_channel_info_cmd.h" diff --git a/services/cameraservice/cameraoperator/client/BUILD.gn b/services/cameraservice/cameraoperator/client/BUILD.gn index 33e7207e1f86afb096f38ae5e45cb0c65a0ffc49..9a83e20224504b7085484ab43d96e4a7cd1ebbb1 100644 --- a/services/cameraservice/cameraoperator/client/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/BUILD.gn @@ -68,7 +68,7 @@ ohos_shared_library("distributed_camera_client") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"dcameraclient\"", + "DC_LOG_TAG=\"dcameraclient\"", "LOG_DOMAIN=0xD004100", ] diff --git a/services/cameraservice/cameraoperator/client/src/callback/dcamera_input_callback.cpp b/services/cameraservice/cameraoperator/client/src/callback/dcamera_input_callback.cpp index 82bdd1e34027221662ed82005b9154ef6f8272c7..a159262f0f9359a68277ae4c4bdfe6b16588c41b 100644 --- a/services/cameraservice/cameraoperator/client/src/callback/dcamera_input_callback.cpp +++ b/services/cameraservice/cameraoperator/client/src/callback/dcamera_input_callback.cpp @@ -17,7 +17,7 @@ #include "camera_util.h" #include "distributed_camera_constants.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -27,9 +27,9 @@ DCameraInputCallback::DCameraInputCallback(const std::shared_ptr& void DCameraInputCallback::OnError(const int32_t errorType, const int32_t errorMsg) const { - DHLOGE("enter, errorType: %d, errorMsg: %d", errorType, errorMsg); + DCLOGE("enter, errorType: %d, errorMsg: %d", errorType, errorMsg); if (callback_ == nullptr) { - DHLOGE("StateCallback is null"); + DCLOGE("StateCallback is null"); return; } diff --git a/services/cameraservice/cameraoperator/client/src/callback/dcamera_manager_callback.cpp b/services/cameraservice/cameraoperator/client/src/callback/dcamera_manager_callback.cpp index 6f90725e7b9bd526f81792ec77d7ad97997561ba..4c3e27bb498a98ae2a768fcaa5cb2728d30ed402 100644 --- a/services/cameraservice/cameraoperator/client/src/callback/dcamera_manager_callback.cpp +++ b/services/cameraservice/cameraoperator/client/src/callback/dcamera_manager_callback.cpp @@ -17,19 +17,19 @@ #include "anonymous_string.h" #include "distributed_camera_constants.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { void DCameraManagerCallback::OnCameraStatusChanged(const CameraStandard::CameraStatusInfo &cameraStatusInfo) const { - DHLOGI("enter, cameraStatus: %d", cameraStatusInfo.cameraStatus); + DCLOGI("enter, cameraStatus: %d", cameraStatusInfo.cameraStatus); } void DCameraManagerCallback::OnFlashlightStatusChanged(const std::string &cameraID, const CameraStandard::FlashStatus flashStatus) const { - DHLOGI("enter, cameraID: %s, flashStatus: %d", GetAnonyString(cameraID).c_str(), flashStatus); + DCLOGI("enter, cameraID: %s, flashStatus: %d", GetAnonyString(cameraID).c_str(), flashStatus); } } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/services/cameraservice/cameraoperator/client/src/callback/dcamera_photo_callback.cpp b/services/cameraservice/cameraoperator/client/src/callback/dcamera_photo_callback.cpp index 3231589aa4d50384c0d36785f2e4c877b1f1cd79..1825d02bdad4b7882fb2d5ed42dce544076afa46 100644 --- a/services/cameraservice/cameraoperator/client/src/callback/dcamera_photo_callback.cpp +++ b/services/cameraservice/cameraoperator/client/src/callback/dcamera_photo_callback.cpp @@ -16,7 +16,7 @@ #include "dcamera_photo_callback.h" #include "distributed_camera_constants.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -26,24 +26,24 @@ DCameraPhotoCallback::DCameraPhotoCallback(const std::shared_ptr& void DCameraPhotoCallback::OnCaptureStarted(const int32_t captureID) const { - DHLOGI("enter, captureID: %d", captureID); + DCLOGI("enter, captureID: %d", captureID); } void DCameraPhotoCallback::OnCaptureEnded(const int32_t captureID, const int32_t frameCount) const { - DHLOGI("enter, captureID: %d, frameCount: %d", captureID, frameCount); + DCLOGI("enter, captureID: %d, frameCount: %d", captureID, frameCount); } void DCameraPhotoCallback::OnFrameShutter(const int32_t captureId, const uint64_t timestamp) const { - DHLOGI("enter, captureId: %d, timestamp: %llu", captureId, timestamp); + DCLOGI("enter, captureId: %d, timestamp: %llu", captureId, timestamp); } void DCameraPhotoCallback::OnCaptureError(const int32_t captureId, const int32_t errorCode) const { - DHLOGE("enter, captureId: %d, errorCode: %d", captureId, errorCode); + DCLOGE("enter, captureId: %d, errorCode: %d", captureId, errorCode); if (callback_ == nullptr) { - DHLOGE("StateCallback is null"); + DCLOGE("StateCallback is null"); return; } diff --git a/services/cameraservice/cameraoperator/client/src/callback/dcamera_preview_callback.cpp b/services/cameraservice/cameraoperator/client/src/callback/dcamera_preview_callback.cpp index 97980d481a526b1b8ff11917e025e4e69a8abbc2..fbae045f723f8ad26290c2acf1f360cbc7471194 100644 --- a/services/cameraservice/cameraoperator/client/src/callback/dcamera_preview_callback.cpp +++ b/services/cameraservice/cameraoperator/client/src/callback/dcamera_preview_callback.cpp @@ -16,7 +16,7 @@ #include "dcamera_preview_callback.h" #include "distributed_camera_constants.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "dcamera_event_cmd.h" namespace OHOS { @@ -27,19 +27,19 @@ DCameraPreviewCallback::DCameraPreviewCallback(const std::shared_ptr cameraMetadata = std::make_shared(itemCapacity, dataCapacity); if (!cameraMetadata->addEntry(OHOS_CONTROL_FOCUS_STATE, &focusState, dataCount)) { - DHLOGE("cameraMetadata add entry failed"); + DCLOGE("cameraMetadata add entry failed"); return; } diff --git a/services/cameraservice/cameraoperator/client/src/callback/dcamera_video_callback.cpp b/services/cameraservice/cameraoperator/client/src/callback/dcamera_video_callback.cpp index 8000eaacb67f22597f9d50425ad90689a01ae040..041fe3589295510117faccd8a7d07ac8bf957886 100644 --- a/services/cameraservice/cameraoperator/client/src/callback/dcamera_video_callback.cpp +++ b/services/cameraservice/cameraoperator/client/src/callback/dcamera_video_callback.cpp @@ -16,7 +16,7 @@ #include "dcamera_video_callback.h" #include "distributed_camera_constants.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -26,19 +26,19 @@ DCameraVideoCallback::DCameraVideoCallback(const std::shared_ptr& void DCameraVideoCallback::OnFrameStarted() const { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraVideoCallback::OnFrameEnded(const int32_t frameCount) const { - DHLOGI("enter, frameCount: %d", frameCount); + DCLOGI("enter, frameCount: %d", frameCount); } void DCameraVideoCallback::OnError(const int32_t errorCode) const { - DHLOGE("enter, errorCode: %d", errorCode); + DCLOGE("enter, errorCode: %d", errorCode); if (callback_ == nullptr) { - DHLOGE("DCameraVideoCallback StateCallback is null"); + DCLOGE("DCameraVideoCallback StateCallback is null"); return; } diff --git a/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp b/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp index 0dd1becd7e441b50b8b161566597bc543945b478..0093bd57e9845b733c3533dbb9bba1b5549eee8e 100644 --- a/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp +++ b/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp @@ -27,14 +27,14 @@ #include "dcamera_video_callback.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "metadata_utils.h" namespace OHOS { namespace DistributedHardware { DCameraClient::DCameraClient(const std::string& dhId) { - DHLOGI("DCameraClient Constructor dhId: %s", GetAnonyString(dhId).c_str()); + DCLOGI("DCameraClient Constructor dhId: %s", GetAnonyString(dhId).c_str()); cameraId_ = dhId.substr(CAMERA_ID_PREFIX.size()); isInit_ = false; } @@ -48,91 +48,91 @@ DCameraClient::~DCameraClient() int32_t DCameraClient::Init() { - DHLOGI("Init cameraId: %s", GetAnonyString(cameraId_).c_str()); + DCLOGI("Init cameraId: %s", GetAnonyString(cameraId_).c_str()); cameraManager_ = CameraStandard::CameraManager::GetInstance(); if (cameraManager_ == nullptr) { - DHLOGE("Init cameraManager getInstance failed"); + DCLOGE("Init cameraManager getInstance failed"); return DCAMERA_BAD_VALUE; } cameraManager_->SetCallback(std::make_shared()); std::vector> cameraList = cameraManager_->GetSupportedCameras(); if (cameraList.empty()) { - DHLOGE("Init no camera device"); + DCLOGE("Init no camera device"); return DCAMERA_BAD_VALUE; } - DHLOGI("Init camera size: %d", cameraList.size()); + DCLOGI("Init camera size: %d", cameraList.size()); for (auto& info : cameraList) { if (info->GetID() == cameraId_) { - DHLOGI("Init cameraInfo get id: %s", GetAnonyString(info->GetID()).c_str()); + DCLOGI("Init cameraInfo get id: %s", GetAnonyString(info->GetID()).c_str()); cameraInfo_ = info; break; } } if (cameraInfo_ == nullptr) { - DHLOGE("Init cameraInfo is null"); + DCLOGE("Init cameraInfo is null"); return DCAMERA_BAD_VALUE; } isInit_ = true; - DHLOGI("Init %s success", GetAnonyString(cameraId_).c_str()); + DCLOGI("Init %s success", GetAnonyString(cameraId_).c_str()); return DCAMERA_OK; } int32_t DCameraClient::UnInit() { - DHLOGI("UnInit cameraId: %s", GetAnonyString(cameraId_).c_str()); + DCLOGI("UnInit cameraId: %s", GetAnonyString(cameraId_).c_str()); if (cameraManager_ != nullptr) { - DHLOGI("UnInit unregister cameraManager callback"); + DCLOGI("UnInit unregister cameraManager callback"); cameraManager_->SetCallback(nullptr); } isInit_ = false; cameraInfo_ = nullptr; cameraManager_ = nullptr; - DHLOGI("UnInit %s success", GetAnonyString(cameraId_).c_str()); + DCLOGI("UnInit %s success", GetAnonyString(cameraId_).c_str()); return DCAMERA_OK; } int32_t DCameraClient::UpdateSettings(std::vector>& settings) { - DHLOGI("UpdateSettings cameraId: %s", GetAnonyString(cameraId_).c_str()); + DCLOGI("UpdateSettings cameraId: %s", GetAnonyString(cameraId_).c_str()); for (auto& setting : settings) { switch (setting->type_) { case UPDATE_METADATA: { - DHLOGI("UpdateSettings %s update metadata settings", GetAnonyString(cameraId_).c_str()); + DCLOGI("UpdateSettings %s update metadata settings", GetAnonyString(cameraId_).c_str()); std::string dcSettingValue = setting->value_; std::string metadataStr = Base64Decode(dcSettingValue); FindCameraMetadata(metadataStr); if (cameraInput_ == nullptr) { - DHLOGE("UpdateSettings %s cameraInput is null", GetAnonyString(cameraId_).c_str()); + DCLOGE("UpdateSettings %s cameraInput is null", GetAnonyString(cameraId_).c_str()); UpdateSettingCache(metadataStr); return DCAMERA_OK; } int32_t ret = ((sptr &)cameraInput_)->SetCameraSettings(metadataStr); if (ret != DCAMERA_OK) { - DHLOGE("UpdateSettings %s update metadata settings failed, ret: %d", + DCLOGE("UpdateSettings %s update metadata settings failed, ret: %d", GetAnonyString(cameraId_).c_str(), ret); return ret; } break; } default: { - DHLOGE("UpdateSettings unknown setting type"); + DCLOGE("UpdateSettings unknown setting type"); break; } } } - DHLOGI("UpdateSettings %s success", GetAnonyString(cameraId_).c_str()); + DCLOGI("UpdateSettings %s success", GetAnonyString(cameraId_).c_str()); return DCAMERA_OK; } void DCameraClient::UpdateSettingCache(const std::string& metadataStr) { if (cameraMetadatas_.size() == DCAMERA_MAX_METADATA_SIZE) { - DHLOGE("UpdateSettingCache %s camera metadata oversize", + DCLOGE("UpdateSettingCache %s camera metadata oversize", GetAnonyString(cameraId_).c_str()); cameraMetadatas_.pop(); } @@ -145,27 +145,27 @@ void DCameraClient::FindCameraMetadata(const std::string& metadataStr) camera_metadata_item_t focusItem; int32_t ret = Camera::FindCameraMetadataItem(cameraMetadata->get(), OHOS_CONTROL_FOCUS_MODE, &focusItem); if (ret == CAM_META_SUCCESS) { - DHLOGI("FindCameraMetadata focus mode: %d", focusItem.data.u8[0]); + DCLOGI("FindCameraMetadata focus mode: %d", focusItem.data.u8[0]); } else { - DHLOGE("FindCameraMetadata %s find focus mode failed, ret: %d", + DCLOGE("FindCameraMetadata %s find focus mode failed, ret: %d", GetAnonyString(cameraId_).c_str(), ret); } camera_metadata_item_t exposureItem; ret = Camera::FindCameraMetadataItem(cameraMetadata->get(), OHOS_CONTROL_EXPOSURE_MODE, &exposureItem); if (ret == CAM_META_SUCCESS) { - DHLOGI("FindCameraMetadata exposure mode: %d", exposureItem.data.u8[0]); + DCLOGI("FindCameraMetadata exposure mode: %d", exposureItem.data.u8[0]); } else { - DHLOGE("FindCameraMetadata %s find exposure mode failed, ret: %d", + DCLOGE("FindCameraMetadata %s find exposure mode failed, ret: %d", GetAnonyString(cameraId_).c_str(), ret); } camera_metadata_item_t stabilityItem; ret = Camera::FindCameraMetadataItem(cameraMetadata->get(), OHOS_CONTROL_VIDEO_STABILIZATION_MODE, &stabilityItem); if (ret == CAM_META_SUCCESS) { - DHLOGI("FindCameraMetadata stabilization mode: %d", stabilityItem.data.u8[0]); + DCLOGI("FindCameraMetadata stabilization mode: %d", stabilityItem.data.u8[0]); } else { - DHLOGE("FindCameraMetadata %s find stabilization mode failed, ret: %d", + DCLOGE("FindCameraMetadata %s find stabilization mode failed, ret: %d", GetAnonyString(cameraId_).c_str(), ret); } } @@ -173,17 +173,17 @@ void DCameraClient::FindCameraMetadata(const std::string& metadataStr) int32_t DCameraClient::StartCapture(std::vector>& captureInfos, sptr& surface) { - DHLOGI("StartCapture cameraId: %s", GetAnonyString(cameraId_).c_str()); + DCLOGI("StartCapture cameraId: %s", GetAnonyString(cameraId_).c_str()); if ((photoOutput_ == nullptr) && (previewOutput_ == nullptr)) { - DHLOGI("StartCapture %s config capture session", GetAnonyString(cameraId_).c_str()); + DCLOGI("StartCapture %s config capture session", GetAnonyString(cameraId_).c_str()); if (surface == nullptr) { - DHLOGE("StartCapture: input surface is nullptr."); + DCLOGE("StartCapture: input surface is nullptr."); return DCAMERA_BAD_VALUE; } previewSurface_ = surface; int32_t ret = ConfigCaptureSession(captureInfos); if (ret != DCAMERA_OK) { - DHLOGE("StartCapture config capture session failed, cameraId: %s, ret: %d", + DCLOGE("StartCapture config capture session failed, cameraId: %s, ret: %d", GetAnonyString(cameraId_).c_str(), ret); return CameraServiceErrorType(ret); } @@ -195,12 +195,12 @@ int32_t DCameraClient::StartCapture(std::vectorClose(); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture cameraInput Close failed, cameraId: %s, ret: %d", + DCLOGE("StopCapture cameraInput Close failed, cameraId: %s, ret: %d", GetAnonyString(cameraId_).c_str(), ret); } ret = cameraInput_->Release(); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture cameraInput Release failed, cameraId: %s, ret: %d", + DCLOGE("StopCapture cameraInput Release failed, cameraId: %s, ret: %d", GetAnonyString(cameraId_).c_str(), ret); } cameraInput_ = nullptr; @@ -236,50 +236,50 @@ int32_t DCameraClient::StopCapture() ReleaseCaptureSession(); if (previewSurface_ != nullptr) { - DHLOGI("StopCapture %s preview surface unregister consumer listener", + DCLOGI("StopCapture %s preview surface unregister consumer listener", GetAnonyString(cameraId_).c_str()); previewSurface_ = nullptr; } if (photoSurface_ != nullptr) { - DHLOGI("StopCapture %s photo surface unregister consumer listener", + DCLOGI("StopCapture %s photo surface unregister consumer listener", GetAnonyString(cameraId_).c_str()); int32_t ret = photoSurface_->UnregisterConsumerListener(); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture %s photo surface unregister consumer listener failed, ret: %d", + DCLOGE("StopCapture %s photo surface unregister consumer listener failed, ret: %d", GetAnonyString(cameraId_).c_str(), ret); } photoListener_ = nullptr; photoSurface_ = nullptr; } - DHLOGI("StopCapture %s success", GetAnonyString(cameraId_).c_str()); + DCLOGI("StopCapture %s success", GetAnonyString(cameraId_).c_str()); return DCAMERA_OK; } void DCameraClient::StopOutput() { if (previewOutput_ != nullptr) { - DHLOGI("StopCapture %s stop previewOutput", GetAnonyString(cameraId_).c_str()); + DCLOGI("StopCapture %s stop previewOutput", GetAnonyString(cameraId_).c_str()); int32_t ret = ((sptr &)previewOutput_)->Stop(); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture videoOutput stop failed, cameraId: %s, ret: %d", + DCLOGE("StopCapture videoOutput stop failed, cameraId: %s, ret: %d", GetAnonyString(cameraId_).c_str(), ret); } - DHLOGI("StopCapture %s release previewOutput", GetAnonyString(cameraId_).c_str()); + DCLOGI("StopCapture %s release previewOutput", GetAnonyString(cameraId_).c_str()); ret = previewOutput_->Release(); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture previewOutput Release failed, cameraId: %s, ret: %d", + DCLOGE("StopCapture previewOutput Release failed, cameraId: %s, ret: %d", GetAnonyString(cameraId_).c_str(), ret); } previewOutput_ = nullptr; } if (photoOutput_ != nullptr) { - DHLOGI("StopCapture %s release photoOutput", GetAnonyString(cameraId_).c_str()); + DCLOGI("StopCapture %s release photoOutput", GetAnonyString(cameraId_).c_str()); int32_t ret = photoOutput_->Release(); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture photoOutput Release failed, cameraId: %s, ret: %d", + DCLOGE("StopCapture photoOutput Release failed, cameraId: %s, ret: %d", GetAnonyString(cameraId_).c_str(), ret); } photoOutput_ = nullptr; @@ -291,16 +291,16 @@ void DCameraClient::ReleaseCaptureSession() if (captureSession_ == nullptr) { return; } - DHLOGI("StopCapture %s stop captureSession", GetAnonyString(cameraId_).c_str()); + DCLOGI("StopCapture %s stop captureSession", GetAnonyString(cameraId_).c_str()); int32_t ret = captureSession_->Stop(); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture captureSession stop failed, cameraId: %s, ret: %d", + DCLOGE("StopCapture captureSession stop failed, cameraId: %s, ret: %d", GetAnonyString(cameraId_).c_str(), ret); } - DHLOGI("StopCapture %s release captureSession", GetAnonyString(cameraId_).c_str()); + DCLOGI("StopCapture %s release captureSession", GetAnonyString(cameraId_).c_str()); ret = captureSession_->Release(); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture captureSession Release failed, cameraId: %s, ret: %d", + DCLOGE("StopCapture captureSession Release failed, cameraId: %s, ret: %d", GetAnonyString(cameraId_).c_str(), ret); } captureSession_ = nullptr; @@ -308,9 +308,9 @@ void DCameraClient::ReleaseCaptureSession() int32_t DCameraClient::SetStateCallback(std::shared_ptr& callback) { - DHLOGI("SetStateCallback cameraId: %s", GetAnonyString(cameraId_).c_str()); + DCLOGI("SetStateCallback cameraId: %s", GetAnonyString(cameraId_).c_str()); if (callback == nullptr) { - DHLOGE("SetStateCallback %s unregistering state callback", GetAnonyString(cameraId_).c_str()); + DCLOGE("SetStateCallback %s unregistering state callback", GetAnonyString(cameraId_).c_str()); } stateCallback_ = callback; return DCAMERA_OK; @@ -318,9 +318,9 @@ int32_t DCameraClient::SetStateCallback(std::shared_ptr& callback int32_t DCameraClient::SetResultCallback(std::shared_ptr& callback) { - DHLOGI("SetResultCallback cameraId: %s", GetAnonyString(cameraId_).c_str()); + DCLOGI("SetResultCallback cameraId: %s", GetAnonyString(cameraId_).c_str()); if (callback == nullptr) { - DHLOGE("SetResultCallback %s unregistering result callback", GetAnonyString(cameraId_).c_str()); + DCLOGE("SetResultCallback %s unregistering result callback", GetAnonyString(cameraId_).c_str()); } resultCallback_ = callback; return DCAMERA_OK; @@ -328,15 +328,15 @@ int32_t DCameraClient::SetResultCallback(std::shared_ptr& callba int32_t DCameraClient::ConfigCaptureSession(std::vector>& captureInfos) { - DHLOGI("ConfigCaptureSession cameraId: %s", GetAnonyString(cameraId_).c_str()); + DCLOGI("ConfigCaptureSession cameraId: %s", GetAnonyString(cameraId_).c_str()); int rv = cameraManager_->CreateCameraInput(cameraInfo_, &((sptr &)cameraInput_)); if (rv != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession %s create cameraInput failed", GetAnonyString(cameraId_).c_str()); + DCLOGE("ConfigCaptureSession %s create cameraInput failed", GetAnonyString(cameraId_).c_str()); return DCAMERA_BAD_VALUE; } int32_t rc = ((sptr &)cameraInput_)->Open(); if (rc != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession cameraInput_ Open failed, cameraId: %s, ret: %d", + DCLOGE("ConfigCaptureSession cameraInput_ Open failed, cameraId: %s, ret: %d", GetAnonyString(cameraId_).c_str(), rc); return DCAMERA_BAD_VALUE; } @@ -348,7 +348,7 @@ int32_t DCameraClient::ConfigCaptureSession(std::vector &)cameraInput_)->SetCameraSettings(metadataStr); if (ret != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession %s set camera settings failed, ret: %d", + DCLOGE("ConfigCaptureSession %s set camera settings failed, ret: %d", GetAnonyString(cameraId_).c_str(), ret); return ret; } @@ -357,7 +357,7 @@ int32_t DCameraClient::ConfigCaptureSession(std::vectorCreateCaptureSession(&captureSession_); if (rv != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession %s create captureSession failed", + DCLOGE("ConfigCaptureSession %s create captureSession failed", GetAnonyString(cameraId_).c_str()); return DCAMERA_BAD_VALUE; } @@ -368,7 +368,7 @@ int32_t DCameraClient::ConfigCaptureSession(std::vectorBeginConfig(); if (ret != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession %s config captureSession failed, ret: %d", + DCLOGE("ConfigCaptureSession %s config captureSession failed, ret: %d", GetAnonyString(cameraId_).c_str(), ret); return ret; } ret = captureSession_->AddInput(cameraInput_); if (ret != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession %s add cameraInput to captureSession failed, ret: %d", + DCLOGE("ConfigCaptureSession %s add cameraInput to captureSession failed, ret: %d", GetAnonyString(cameraId_).c_str(), ret); return ret; } @@ -395,7 +395,7 @@ int32_t DCameraClient::ConfigCaptureSessionInner() if (photoOutput_ != nullptr) { ret = captureSession_->AddOutput(photoOutput_); if (ret != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession %s add photoOutput to captureSession failed, ret: %d", + DCLOGE("ConfigCaptureSession %s add photoOutput to captureSession failed, ret: %d", GetAnonyString(cameraId_).c_str(), ret); return ret; } @@ -404,7 +404,7 @@ int32_t DCameraClient::ConfigCaptureSessionInner() if (previewOutput_ != nullptr) { ret = captureSession_->AddOutput(previewOutput_); if (ret != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession %s add previewOutput to captureSession failed, ret: %d", + DCLOGE("ConfigCaptureSession %s add previewOutput to captureSession failed, ret: %d", GetAnonyString(cameraId_).c_str(), ret); return ret; } @@ -412,25 +412,25 @@ int32_t DCameraClient::ConfigCaptureSessionInner() ret = captureSession_->CommitConfig(); if (ret != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession %s commit captureSession failed, ret: %d", + DCLOGE("ConfigCaptureSession %s commit captureSession failed, ret: %d", GetAnonyString(cameraId_).c_str(), ret); return ret; } ret = captureSession_->Start(); if (ret != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession %s start captureSession failed, ret: %d", + DCLOGE("ConfigCaptureSession %s start captureSession failed, ret: %d", GetAnonyString(cameraId_).c_str(), ret); } - DHLOGI("ConfigCaptureSession %s success", GetAnonyString(cameraId_).c_str()); + DCLOGI("ConfigCaptureSession %s success", GetAnonyString(cameraId_).c_str()); return DCAMERA_OK; } int32_t DCameraClient::CreateCaptureOutput(std::vector>& captureInfos) { if (captureInfos.empty()) { - DHLOGE("CreateCaptureOutput no capture info, cameraId: %s", GetAnonyString(cameraId_).c_str()); + DCLOGE("CreateCaptureOutput no capture info, cameraId: %s", GetAnonyString(cameraId_).c_str()); return DCAMERA_BAD_VALUE; } @@ -438,19 +438,19 @@ int32_t DCameraClient::CreateCaptureOutput(std::vectorstreamType_ == SNAPSHOT_FRAME) { int32_t ret = CreatePhotoOutput(info); if (ret != DCAMERA_OK) { - DHLOGE("CreateCaptureOutput %s create photo output failed, ret: %d", + DCLOGE("CreateCaptureOutput %s create photo output failed, ret: %d", GetAnonyString(cameraId_).c_str(), ret); return ret; } } else if (info->streamType_ == CONTINUOUS_FRAME) { int32_t ret = CreatePreviewOutput(info); if (ret != DCAMERA_OK) { - DHLOGE("CreateCaptureOutput %s create video output failed, ret: %d", + DCLOGE("CreateCaptureOutput %s create video output failed, ret: %d", GetAnonyString(cameraId_).c_str(), ret); return ret; } } else { - DHLOGE("CreateCaptureOutput unknown stream type"); + DCLOGE("CreateCaptureOutput unknown stream type"); return DCAMERA_BAD_VALUE; } } @@ -459,7 +459,7 @@ int32_t DCameraClient::CreateCaptureOutput(std::vector& info) { - DHLOGI("CreatePhotoOutput dhId: %s, width: %d, height: %d, format: %d, stream: %d, isCapture: %d", + DCLOGI("CreatePhotoOutput dhId: %s, width: %d, height: %d, format: %d, stream: %d, isCapture: %d", GetAnonyString(cameraId_).c_str(), info->width_, info->height_, info->format_, info->streamType_, info->isCapture_); photoSurface_ = IConsumerSurface::Create(); @@ -472,18 +472,18 @@ int32_t DCameraClient::CreatePhotoOutput(std::shared_ptr& in int32_t rv = cameraManager_->CreatePhotoOutput( photoProfile, bp, &((sptr &)photoOutput_)); if (rv != DCAMERA_OK) { - DHLOGE("CreatePhotoOutput %s create photo output failed", GetAnonyString(cameraId_).c_str()); + DCLOGE("CreatePhotoOutput %s create photo output failed", GetAnonyString(cameraId_).c_str()); return DCAMERA_BAD_VALUE; } std::shared_ptr photoCallback = std::make_shared(stateCallback_); ((sptr &)photoOutput_)->SetCallback(photoCallback); - DHLOGI("CreatePhotoOutput %s success", GetAnonyString(cameraId_).c_str()); + DCLOGI("CreatePhotoOutput %s success", GetAnonyString(cameraId_).c_str()); return DCAMERA_OK; } int32_t DCameraClient::CreatePreviewOutput(std::shared_ptr& info) { - DHLOGI("CreatePreviewOutput dhId: %s, width: %d, height: %d, format: %d, stream: %d, isCapture: %d", + DCLOGI("CreatePreviewOutput dhId: %s, width: %d, height: %d, format: %d, stream: %d, isCapture: %d", GetAnonyString(cameraId_).c_str(), info->width_, info->height_, info->format_, info->streamType_, info->isCapture_); CameraStandard::CameraFormat previewFormat = ConvertToCameraFormat(info->format_); @@ -492,12 +492,12 @@ int32_t DCameraClient::CreatePreviewOutput(std::shared_ptr& int32_t rv = cameraManager_->CreatePreviewOutput( previewProfile, previewSurface_, &((sptr &)previewOutput_)); if (rv != DCAMERA_OK) { - DHLOGE("CreatePreviewOutput %s create preview output failed", GetAnonyString(cameraId_).c_str()); + DCLOGE("CreatePreviewOutput %s create preview output failed", GetAnonyString(cameraId_).c_str()); return DCAMERA_BAD_VALUE; } auto previewCallback = std::make_shared(stateCallback_); ((sptr &)previewOutput_)->SetCallback(previewCallback); - DHLOGI("CreatePreviewOutput %s success", GetAnonyString(cameraId_).c_str()); + DCLOGI("CreatePreviewOutput %s success", GetAnonyString(cameraId_).c_str()); return DCAMERA_OK; } @@ -527,7 +527,7 @@ CameraStandard::CameraFormat DCameraClient::ConvertToCameraFormat(int32_t format int32_t DCameraClient::StartCaptureInner(std::shared_ptr& info) { if (info->streamType_ != SNAPSHOT_FRAME) { - DHLOGE("StartCaptureInner unknown stream type"); + DCLOGE("StartCaptureInner unknown stream type"); return DCAMERA_BAD_VALUE; } return StartPhotoOutput(info); @@ -535,9 +535,9 @@ int32_t DCameraClient::StartCaptureInner(std::shared_ptr& in int32_t DCameraClient::StartPhotoOutput(std::shared_ptr& info) { - DHLOGI("StartPhotoOutput cameraId: %s", GetAnonyString(cameraId_).c_str()); + DCLOGI("StartPhotoOutput cameraId: %s", GetAnonyString(cameraId_).c_str()); if (photoOutput_ == nullptr) { - DHLOGE("StartPhotoOutput photoOutput is null"); + DCLOGE("StartPhotoOutput photoOutput is null"); return DCAMERA_BAD_VALUE; } @@ -545,16 +545,16 @@ int32_t DCameraClient::StartPhotoOutput(std::shared_ptr& inf std::string metadataSetting; for (const auto& setting : captureSettings) { if (setting->type_ == UPDATE_METADATA) { - DHLOGI("StartPhotoOutput %s update metadata settings", GetAnonyString(cameraId_).c_str()); + DCLOGI("StartPhotoOutput %s update metadata settings", GetAnonyString(cameraId_).c_str()); metadataSetting = setting->value_; } } if (metadataSetting.empty()) { - DHLOGE("StartPhotoOutput no metadata settings to update"); + DCLOGE("StartPhotoOutput no metadata settings to update"); int32_t ret = ((sptr &)photoOutput_)->Capture(); if (ret != DCAMERA_OK) { - DHLOGE("StartPhotoOutput %s photoOutput capture failed, ret: %d", + DCLOGE("StartPhotoOutput %s photoOutput capture failed, ret: %d", GetAnonyString(cameraId_).c_str(), ret); return ret; } @@ -570,7 +570,7 @@ int32_t DCameraClient::StartPhotoOutput(std::shared_ptr& inf SetPhotoCaptureLocation(cameraMetadata, photoCaptureSetting); int32_t ret = ((sptr &)photoOutput_)->Capture(photoCaptureSetting); if (ret != DCAMERA_OK) { - DHLOGE("StartPhotoOutput %s photoOutput capture failed, ret: %d", + DCLOGE("StartPhotoOutput %s photoOutput capture failed, ret: %d", GetAnonyString(cameraId_).c_str(), ret); return ret; } @@ -605,7 +605,7 @@ void DCameraClient::SetPhotoCaptureRotation(const std::shared_ptr(setRotate); photoCaptureSetting->SetRotation(rotation); - DHLOGI("SetPhotoCaptureRotation %s photo set %d rotation: %d setRotate: %d sensorRotate: %d oriSetRotate: %d", + DCLOGI("SetPhotoCaptureRotation %s photo set %d rotation: %d setRotate: %d sensorRotate: %d oriSetRotate: %d", GetAnonyString(cameraId_).c_str(), item.count, rotation, setRotate, sensorRotate, oriSetRotate); } } @@ -620,7 +620,7 @@ void DCameraClient::SetPhotoCaptureQuality(const std::shared_ptr(item.data.u8[0]); photoCaptureSetting->SetQuality(quality); - DHLOGI("SetPhotoCaptureQuality %s photo capture settings set %d quality: %d", + DCLOGI("SetPhotoCaptureQuality %s photo capture settings set %d quality: %d", GetAnonyString(cameraId_).c_str(), item.count, quality); } } @@ -640,7 +640,7 @@ void DCameraClient::SetPhotoCaptureLocation(const std::shared_ptrlongitude = item.data.d[longitudeIndex]; location->altitude = item.data.d[altitudeIndex]; photoCaptureSetting->SetLocation(location); - DHLOGI("SetPhotoCaptureLocation %s photo capture settings set %d location: " + + DCLOGI("SetPhotoCaptureLocation %s photo capture settings set %d location: " + "latitude=%f, longitude=%f, altitude=%f", GetAnonyString(cameraId_).c_str(), item.count, item.data.d[latitudeIndex], item.data.d[longitudeIndex], item.data.d[altitudeIndex]); } diff --git a/services/cameraservice/cameraoperator/client/src/listener/dcamera_photo_surface_listener.cpp b/services/cameraservice/cameraoperator/client/src/listener/dcamera_photo_surface_listener.cpp index ea9ca25071e2fadea705abd413a1d68b74752783..c8d1356559611985cafc61340ddec04e005d5b3a 100644 --- a/services/cameraservice/cameraoperator/client/src/listener/dcamera_photo_surface_listener.cpp +++ b/services/cameraservice/cameraoperator/client/src/listener/dcamera_photo_surface_listener.cpp @@ -19,7 +19,7 @@ #include "data_buffer.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -30,9 +30,9 @@ DCameraPhotoSurfaceListener::DCameraPhotoSurfaceListener(const sptr buffer = nullptr; surface_->AcquireBuffer(buffer, flushFence, timestamp, damage); if (buffer == nullptr) { - DHLOGE("DCameraPhotoSurfaceListener AcquireBuffer failed"); + DCLOGE("DCameraPhotoSurfaceListener AcquireBuffer failed"); return; } @@ -54,15 +54,15 @@ void DCameraPhotoSurfaceListener::OnBufferAvailable() size = static_cast(buffer->GetSize()); } if ((address == nullptr) || (size <= 0) || (size > SURFACE_BUFFER_MAX_SIZE)) { - DHLOGE("DCameraPhotoSurfaceListener invalid params, size: %d", size); + DCLOGE("DCameraPhotoSurfaceListener invalid params, size: %d", size); break; } - DHLOGI("DCameraPhotoSurfaceListener size: %d", size); + DCLOGI("DCameraPhotoSurfaceListener size: %d", size); std::shared_ptr dataBuffer = std::make_shared(size); int32_t ret = memcpy_s(dataBuffer->Data(), dataBuffer->Capacity(), address, size); if (ret != EOK) { - DHLOGE("DCameraPhotoSurfaceListener Memory Copy failed, ret: %d", ret); + DCLOGE("DCameraPhotoSurfaceListener Memory Copy failed, ret: %d", ret); break; } diff --git a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn index 5c3f28a50a16243e1c3bef556eeb86aef3315018..d6ec61ed87d5a883a960dd0d152172bf96a78932 100644 --- a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn @@ -95,7 +95,7 @@ ohos_executable("dcamera_client_demo") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DCameraClientDemo\"", + "DC_LOG_TAG=\"DCameraClientDemo\"", "LOG_DOMAIN=0xD004100", ] diff --git a/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h b/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h index 3ed5515e98450f111d972ea17a22e8fba1d0fa96..2bead9e2bcceb0757aa9d60bdf9c4d0d161f07cf 100644 --- a/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h +++ b/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h @@ -31,7 +31,7 @@ #include "dcamera_utils_tools.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "metadata_utils.h" #include "photo_output.h" #include "preview_output.h" @@ -48,9 +48,9 @@ public: void OnBufferAvailable() { - DHLOGI("DemoDCameraBufferConsumerListener::OnBufferAvailable"); + DCLOGI("DemoDCameraBufferConsumerListener::OnBufferAvailable"); if (surface_ == nullptr) { - DHLOGE("DemoDCameraBufferConsumerListener surface is null"); + DCLOGE("DemoDCameraBufferConsumerListener surface is null"); return; } @@ -60,7 +60,7 @@ public: OHOS::sptr buffer = nullptr; surface_->AcquireBuffer(buffer, flushFence, timestamp, damage); if (buffer == nullptr) { - DHLOGE("DemoDCameraBufferConsumerListener AcquireBuffer failed"); + DCLOGE("DemoDCameraBufferConsumerListener AcquireBuffer failed"); return; } @@ -107,10 +107,10 @@ public: protected: void SaveFile() const override { - DHLOGI("DemoDCameraPhotoSurfaceListener::SaveFile width: %d, height: %d, size: %d, dataSize: %d, " + + DCLOGI("DemoDCameraPhotoSurfaceListener::SaveFile width: %d, height: %d, size: %d, dataSize: %d, " + "actualSize: %d", width_, height_, size_, dataSize_, actualSize_); if ((address_ == nullptr) || (dataSize_ <= 0)) { - DHLOGE("DemoDCameraPhotoSurfaceListener invalid params, dataSize: %d", dataSize_); + DCLOGE("DemoDCameraPhotoSurfaceListener invalid params, dataSize: %d", dataSize_); return; } @@ -119,7 +119,7 @@ protected: std::string fileName = "/data/log/dcamera_photo_" + std::to_string(GetNowTimeStampMs()) + ".jpg"; ofs.open(fileName, std::ios::binary | std::ios::out); if (!ofs.is_open()) { - DHLOGE("DemoDCameraPhotoSurfaceListener open file failed"); + DCLOGE("DemoDCameraPhotoSurfaceListener open file failed"); return; } ofs.write(address_, dataSize_); @@ -138,10 +138,10 @@ public: protected: void SaveFile() const override { - DHLOGI("DemoDCameraPreviewSurfaceListener::SaveFile width: %d, height: %d, size: %d, dataSize: %d, " + + DCLOGI("DemoDCameraPreviewSurfaceListener::SaveFile width: %d, height: %d, size: %d, dataSize: %d, " + "actualSize: %d", width_, height_, size_, dataSize_, actualSize_); if ((address_ == nullptr) || (actualSize_ <= 0)) { - DHLOGE("DemoDCameraPreviewSurfaceListener invalid params, actualSize: %d", actualSize_); + DCLOGE("DemoDCameraPreviewSurfaceListener invalid params, actualSize: %d", actualSize_); return; } @@ -151,7 +151,7 @@ protected: std::string fileName = "/data/log/dcamera_preview_" + resolution + ".yuv"; ofs.open(fileName, std::ios::binary | std::ios::out | std::ios::app); if (!ofs.is_open()) { - DHLOGE("DemoDCameraPreviewSurfaceListener open file failed"); + DCLOGE("DemoDCameraPreviewSurfaceListener open file failed"); return; } ofs.write(address_, actualSize_); @@ -170,10 +170,10 @@ public: protected: void SaveFile() const override { - DHLOGI("DemoDCameraVideoSurfaceListener::SaveFile width: %d, height: %d, size: %d, dataSize: %d, " + + DCLOGI("DemoDCameraVideoSurfaceListener::SaveFile width: %d, height: %d, size: %d, dataSize: %d, " + "actualSize: %d", width_, height_, size_, dataSize_, actualSize_); if ((address_ == nullptr) || (actualSize_ <= 0)) { - DHLOGE("DemoDCameraVideoSurfaceListener invalid params, actualSize: %d", actualSize_); + DCLOGE("DemoDCameraVideoSurfaceListener invalid params, actualSize: %d", actualSize_); return; } @@ -183,7 +183,7 @@ protected: std::string fileName = "/data/log/dcamera_video_" + resolution + ".yuv"; ofs.open(fileName, std::ios::binary | std::ios::out | std::ios::app); if (!ofs.is_open()) { - DHLOGE("DemoDCameraVideoSurfaceListener open file failed"); + DCLOGE("DemoDCameraVideoSurfaceListener open file failed"); return; } ofs.write(address_, actualSize_); @@ -196,22 +196,22 @@ class DemoDCameraPhotoCallback : public CameraStandard::PhotoStateCallback { public: void OnCaptureStarted(const int32_t captureID) const { - DHLOGI("DemoDCameraPhotoCallback::OnCaptureStarted captureID: %d", captureID); + DCLOGI("DemoDCameraPhotoCallback::OnCaptureStarted captureID: %d", captureID); } void OnCaptureEnded(const int32_t captureID, int32_t frameCount) const { - DHLOGI("DemoDCameraPhotoCallback::OnCaptureEnded captureID: %d frameCount: %d", captureID, frameCount); + DCLOGI("DemoDCameraPhotoCallback::OnCaptureEnded captureID: %d frameCount: %d", captureID, frameCount); } void OnFrameShutter(const int32_t captureId, const uint64_t timestamp) const { - DHLOGI("DemoDCameraPhotoCallback::OnFrameShutter captureID: %d timestamp: %llu", captureId, timestamp); + DCLOGI("DemoDCameraPhotoCallback::OnFrameShutter captureID: %d timestamp: %llu", captureId, timestamp); } void OnCaptureError(const int32_t captureId, const int32_t errorCode) const { - DHLOGI("DemoDCameraPhotoCallback::OnCaptureError captureID: %d errorCode: %d", captureId, errorCode); + DCLOGI("DemoDCameraPhotoCallback::OnCaptureError captureID: %d errorCode: %d", captureId, errorCode); } }; @@ -219,22 +219,22 @@ class DemoDCameraPreviewCallback : public CameraStandard::PreviewStateCallback { public: void OnFrameStarted() const { - DHLOGI("DemoDCameraPreviewCallback::OnFrameStarted."); + DCLOGI("DemoDCameraPreviewCallback::OnFrameStarted."); } void OnFrameEnded(const int32_t frameCount) const { - DHLOGI("DemoDCameraPreviewCallback::OnFrameEnded frameCount: %d", frameCount); + DCLOGI("DemoDCameraPreviewCallback::OnFrameEnded frameCount: %d", frameCount); } void OnError(const int32_t errorCode) const { - DHLOGI("DemoDCameraPreviewCallback::OnError errorCode: %d", errorCode); + DCLOGI("DemoDCameraPreviewCallback::OnError errorCode: %d", errorCode); } void OnSketchAvailable(CameraStandard::SketchData& sketchData) const { - DHLOGI("DemoDCameraPreviewCallback::OnSketchAvailable."); + DCLOGI("DemoDCameraPreviewCallback::OnSketchAvailable."); } }; @@ -242,17 +242,17 @@ class DemoDCameraVideoCallback : public CameraStandard::VideoStateCallback { public: void OnFrameStarted() const { - DHLOGI("DemoDCameraVideoCallback::OnFrameStarted."); + DCLOGI("DemoDCameraVideoCallback::OnFrameStarted."); } void OnFrameEnded(const int32_t frameCount) const { - DHLOGI("DemoDCameraVideoCallback::OnFrameEnded frameCount: %d", frameCount); + DCLOGI("DemoDCameraVideoCallback::OnFrameEnded frameCount: %d", frameCount); } void OnError(const int32_t errorCode) const { - DHLOGI("DemoDCameraVideoCallback::OnError errorCode: %d", errorCode); + DCLOGI("DemoDCameraVideoCallback::OnError errorCode: %d", errorCode); } }; @@ -260,7 +260,7 @@ class DemoDCameraInputCallback : public CameraStandard::ErrorCallback { public: void OnError(const int32_t errorType, const int32_t errorMsg) const { - DHLOGI("DemoDCameraInputCallback::OnError errorType: %d errorMsg: %d", errorType, errorMsg); + DCLOGI("DemoDCameraInputCallback::OnError errorType: %d errorMsg: %d", errorType, errorMsg); } }; @@ -268,13 +268,13 @@ class DemoDCameraManagerCallback : public CameraStandard::CameraManagerCallback public: void OnCameraStatusChanged(const CameraStandard::CameraStatusInfo &cameraStatusInfo) const { - DHLOGI("DemoDCameraManagerCallback::OnCameraStatusChanged cameraStatus: %d", cameraStatusInfo.cameraStatus); + DCLOGI("DemoDCameraManagerCallback::OnCameraStatusChanged cameraStatus: %d", cameraStatusInfo.cameraStatus); } void OnFlashlightStatusChanged(const std::string &cameraID, const CameraStandard::FlashStatus flashStatus) const { - DHLOGI("DemoDCameraManagerCallback::OnFlashlightStatusChanged cameraID: %s, flashStatus: %d", + DCLOGI("DemoDCameraManagerCallback::OnFlashlightStatusChanged cameraID: %s, flashStatus: %d", GetAnonyString(cameraID).c_str(), flashStatus); } }; @@ -283,12 +283,12 @@ class DemoDCameraSessionCallback : public CameraStandard::SessionCallback, publi public: void OnError(int32_t errorCode) { - DHLOGI("DemoDCameraSessionCallback::OnError errorCode: %d", errorCode); + DCLOGI("DemoDCameraSessionCallback::OnError errorCode: %d", errorCode); } void OnFocusState(FocusState state) { - DHLOGI("DemoDCameraSessionCallback::OnFocusState state: %d", state); + DCLOGI("DemoDCameraSessionCallback::OnFocusState state: %d", state); } }; } // namespace DistributedHardware diff --git a/services/cameraservice/cameraoperator/client/test/sample/main.cpp b/services/cameraservice/cameraoperator/client/test/sample/main.cpp index da6e8d78d1ef4e74760fbd618e29994479f6da28..96f8ebf1e193a62939a3e1eb588d9a6c8dde63a3 100644 --- a/services/cameraservice/cameraoperator/client/test/sample/main.cpp +++ b/services/cameraservice/cameraoperator/client/test/sample/main.cpp @@ -67,7 +67,7 @@ static int32_t InitCameraStandard() int rv = g_cameraManager->CreateCaptureSession(&g_captureSession); if (rv != DCAMERA_OK) { - DHLOGE("InitCameraStandard create captureSession failed, rv: %d", rv); + DCLOGE("InitCameraStandard create captureSession failed, rv: %d", rv); return rv; } std::shared_ptr sessionCallback = std::make_shared(); @@ -76,7 +76,7 @@ static int32_t InitCameraStandard() std::vector> cameraObjList = g_cameraManager->GetSupportedCameras(); for (auto info : cameraObjList) { - DHLOGI("Camera: %s, position: %d, camera type: %d, connection type: %d", GetAnonyString(info->GetID()).c_str(), + DCLOGI("Camera: %s, position: %d, camera type: %d, connection type: %d", GetAnonyString(info->GetID()).c_str(), info->GetPosition(), info->GetCameraType(), info->GetConnectionType()); // OHOS_CAMERA_POSITION_FRONT or OHOS_CAMERA_POSITION_BACK if ((info->GetPosition() == CameraPosition::CAMERA_POSITION_FRONT) && @@ -87,18 +87,18 @@ static int32_t InitCameraStandard() } if (g_cameraInfo == nullptr) { - DHLOGE("Distributed Camera Demo: have no remote camera"); + DCLOGE("Distributed Camera Demo: have no remote camera"); return DCAMERA_BAD_VALUE; } rv = g_cameraManager->CreateCameraInput(g_cameraInfo, &((sptr &)g_cameraInput)); if (rv != DCAMERA_OK) { - DHLOGE("InitCameraStandard create cameraInput failed, rv: %d", rv); + DCLOGE("InitCameraStandard create cameraInput failed, rv: %d", rv); return rv; } int32_t ret = ((sptr &)g_cameraInput)->Open(); if (ret != DCAMERA_OK) { - DHLOGE("InitCameraStandard g_cameraInput Open failed, ret: %d", ret); + DCLOGE("InitCameraStandard g_cameraInput Open failed, ret: %d", ret); return ret; } std::shared_ptr inputCallback = std::make_shared(); @@ -149,7 +149,7 @@ static CameraFormat ConvertToCameraFormat(int32_t format) static void InitPhotoOutput() { - DHLOGI("Distributed Camera Demo: Create PhotoOutput, width = %d, height = %d, format = %d", + DCLOGI("Distributed Camera Demo: Create PhotoOutput, width = %d, height = %d, format = %d", g_photoInfo->width_, g_photoInfo->height_, g_photoInfo->format_); sptr photoSurface = IConsumerSurface::Create(); sptr photoListener(new DemoDCameraPhotoSurfaceListener(photoSurface)); @@ -160,7 +160,7 @@ static void InitPhotoOutput() sptr photoProducer = photoSurface->GetProducer(); int rv = g_cameraManager->CreatePhotoOutput(photoProfile, photoProducer, &((sptr &)g_photoOutput)); if (rv != DCAMERA_OK) { - DHLOGE("InitPhotoOutput create photoOutput failed, rv: %d", rv); + DCLOGE("InitPhotoOutput create photoOutput failed, rv: %d", rv); return; } ((sptr &)g_photoOutput)->SetCallback(std::make_shared()); @@ -168,7 +168,7 @@ static void InitPhotoOutput() static void InitPreviewOutput() { - DHLOGI("Distributed Camera Demo: Create PreviewOutput, width = %d, height = %d, format = %d", + DCLOGI("Distributed Camera Demo: Create PreviewOutput, width = %d, height = %d, format = %d", g_previewInfo->width_, g_previewInfo->height_, g_previewInfo->format_); sptr previewSurface = IConsumerSurface::Create(); sptr previewListener(new DemoDCameraPreviewSurfaceListener(previewSurface)); @@ -181,7 +181,7 @@ static void InitPreviewOutput() int rv = g_cameraManager->CreatePreviewOutput( previewProfile, previewProducerSurface, &((sptr &)g_previewOutput)); if (rv != DCAMERA_OK) { - DHLOGE("InitPhotoOutput create previewOutput failed, rv: %d", rv); + DCLOGE("InitPhotoOutput create previewOutput failed, rv: %d", rv); return; } ((sptr &)g_previewOutput)->SetCallback(std::make_shared()); @@ -189,7 +189,7 @@ static void InitPreviewOutput() static void InitVideoOutput() { - DHLOGI("Distributed Camera Demo: Create VideoOutput, width = %d, height = %d, format = %d", + DCLOGI("Distributed Camera Demo: Create VideoOutput, width = %d, height = %d, format = %d", g_videoInfo->width_, g_videoInfo->height_, g_videoInfo->format_); sptr videoSurface = IConsumerSurface::Create(); sptr videoListener(new DemoDCameraVideoSurfaceListener(videoSurface)); @@ -202,7 +202,7 @@ static void InitVideoOutput() sptr pSurface = Surface::CreateSurfaceAsProducer(videoProducer); int rv = g_cameraManager->CreateVideoOutput(videoSettings, pSurface, &((sptr &)g_videoOutput)); if (rv != DCAMERA_OK) { - DHLOGE("InitPhotoOutput create videoOutput failed, rv: %d", rv); + DCLOGE("InitPhotoOutput create videoOutput failed, rv: %d", rv); return; } ((sptr &)g_videoOutput)->SetCallback(std::make_shared()); @@ -220,12 +220,12 @@ static void ConfigCaptureSession() std::vector stabilizationModes; int32_t rv = g_captureSession->GetSupportedStabilizationMode(stabilizationModes); if (rv != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession get supported stabilization mode failed, rv: %d", rv); + DCLOGE("ConfigCaptureSession get supported stabilization mode failed, rv: %d", rv); return; } if (!stabilizationModes.empty()) { for (auto mode : stabilizationModes) { - DHLOGI("Distributed Camera Demo: video stabilization mode %d", mode); + DCLOGI("Distributed Camera Demo: video stabilization mode %d", mode); } g_captureSession->SetVideoStabilizationMode(stabilizationModes.back()); } @@ -240,11 +240,11 @@ static void ConfigFocusAndExposure() std::vector biasRange; int32_t rv = g_captureSession->GetExposureBiasRange(biasRange); if (rv != DCAMERA_OK) { - DHLOGE("ConfigFocusAndExposure get exposure bias range failed, rv: %d", rv); + DCLOGE("ConfigFocusAndExposure get exposure bias range failed, rv: %d", rv); return; } if (!biasRange.empty()) { - DHLOGI("Distributed Camera Demo: get %d exposure compensation range", biasRange.size()); + DCLOGI("Distributed Camera Demo: get %d exposure compensation range", biasRange.size()); exposureValue = biasRange[0]; } g_captureSession->SetFocusMode(focusMode); @@ -294,7 +294,7 @@ static void SetPermissions() int main() { - DHLOGI("========== Distributed Camera Demo Start =========="); + DCLOGI("========== Distributed Camera Demo Start =========="); SetPermissions(); int32_t ret = InitCameraStandard(); if (ret != DCAMERA_OK) { @@ -312,7 +312,7 @@ int main() sleep(SLEEP_FIVE_SECOND); if (((sptr &)g_videoOutput)->Start() != DCAMERA_OK) { - DHLOGE("main g_videoOutput Start failed"); + DCLOGE("main g_videoOutput Start failed"); } sleep(SLEEP_FIVE_SECOND); @@ -323,18 +323,18 @@ int main() sleep(SLEEP_TWENTY_SECOND); if (((sptr &)g_videoOutput)->Stop() != DCAMERA_OK) { - DHLOGE("main g_videoOutput Stop failed"); + DCLOGE("main g_videoOutput Stop failed"); } sleep(SLEEP_FIVE_SECOND); g_captureSession->Stop(); if (g_cameraInput->Close() != DCAMERA_OK) { - DHLOGE("main g_cameraInput Close failed"); + DCLOGE("main g_cameraInput Close failed"); } g_captureSession->Release(); if (g_cameraInput->Release() != DCAMERA_OK) { - DHLOGE("main g_cameraInput Close failed"); + DCLOGE("main g_cameraInput Close failed"); } - DHLOGI("========== Distributed Camera Demo End =========="); + DCLOGI("========== Distributed Camera Demo End =========="); return 0; } \ No newline at end of file diff --git a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn index 69e52120a342335f94e85e6c5e90180e72bfaacb..9824643a76c7a1846ec3a81ea61f093f633d428a 100644 --- a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn @@ -94,7 +94,7 @@ ohos_unittest("DCameraClientTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DCameraClientTest\"", + "DC_LOG_TAG=\"DCameraClientTest\"", "LOG_DOMAIN=0xD004100", ] } diff --git a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/dcamera_client_test.cpp b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/dcamera_client_test.cpp index 898213792aaa5f45d1100bbc8c780364ca4b3e8a..57dac9e99316b930fb7f097299b8704dcf9c7c25 100644 --- a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/dcamera_client_test.cpp +++ b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/dcamera_client_test.cpp @@ -33,7 +33,7 @@ #include "dcamera_video_callback.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "metadata_utils.h" #include "nativetoken_kit.h" #include "token_setproc.h" @@ -47,13 +47,13 @@ class DCameraClientTestStateCallback : public StateCallback { public: void OnStateChanged(std::shared_ptr& event) override { - DHLOGI("DCameraClientTestStateCallback::OnStateChanged type: %d, result: %d", + DCLOGI("DCameraClientTestStateCallback::OnStateChanged type: %d, result: %d", event->eventType_, event->eventResult_); } void OnMetadataResult(std::vector>& settings) override { - DHLOGI("DCameraClientTestStateCallback::OnMetadataResult"); + DCLOGI("DCameraClientTestStateCallback::OnMetadataResult"); } }; @@ -61,12 +61,12 @@ class DCameraClientTestResultCallback : public ResultCallback { public: void OnPhotoResult(std::shared_ptr& buffer) override { - DHLOGI("DCameraClientTestResultCallback::OnPhotoResult"); + DCLOGI("DCameraClientTestResultCallback::OnPhotoResult"); } void OnVideoResult(std::shared_ptr& buffer) override { - DHLOGI("DCameraClientTestResultCallback::OnVideoResult"); + DCLOGI("DCameraClientTestResultCallback::OnVideoResult"); } }; @@ -74,7 +74,7 @@ class DCameraClientTestVideoSurfaceListener : public IBufferConsumerListener { public: void OnBufferAvailable() override { - DHLOGD("DCameraClientTestVideoSurfaceListener::OnBufferAvailable"); + DCLOGD("DCameraClientTestVideoSurfaceListener::OnBufferAvailable"); } }; @@ -115,17 +115,17 @@ public: void DCameraClientTest::SetUpTestCase(void) { - DHLOGI("DCameraClientTest::SetUpTestCase"); + DCLOGI("DCameraClientTest::SetUpTestCase"); } void DCameraClientTest::TearDownTestCase(void) { - DHLOGI("DCameraClientTest::TearDownTestCase"); + DCLOGI("DCameraClientTest::TearDownTestCase"); } void DCameraClientTest::SetUp(void) { - DHLOGI("DCameraClientTest::SetUp"); + DCLOGI("DCameraClientTest::SetUp"); DCameraHandler::GetInstance().Initialize(); std::vector cameras = DCameraHandler::GetInstance().GetCameras(); client_ = std::make_shared(cameras[0]); @@ -161,7 +161,7 @@ void DCameraClientTest::SetUp(void) void DCameraClientTest::TearDown(void) { - DHLOGI("DCameraClientTest::TearDown"); + DCLOGI("DCameraClientTest::TearDown"); client_ = nullptr; photoInfo_false_ = nullptr; videoInfo_false_ = nullptr; @@ -225,7 +225,7 @@ void DCameraClientTest::SetCaptureInfo(std::shared_ptr& info */ HWTEST_F(DCameraClientTest, dcamera_client_test_001, TestSize.Level1) { - DHLOGI("DCameraClientTest dcamera_client_test_001: test set state callback"); + DCLOGI("DCameraClientTest dcamera_client_test_001: test set state callback"); auto managerCallback = std::make_shared(); CameraStandard::CameraStatusInfo cameraStatus; managerCallback->OnCameraStatusChanged(cameraStatus); @@ -292,7 +292,7 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_001, TestSize.Level1) */ HWTEST_F(DCameraClientTest, dcamera_client_test_002, TestSize.Level1) { - DHLOGI("DCameraClientTest dcamera_client_test_002: test set result callback"); + DCLOGI("DCameraClientTest dcamera_client_test_002: test set result callback"); auto photoSurfaceListener = std::make_shared(nullptr, nullptr); photoSurfaceListener->OnBufferAvailable(); @@ -316,7 +316,7 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_002, TestSize.Level1) */ HWTEST_F(DCameraClientTest, dcamera_client_test_003, TestSize.Level1) { - DHLOGI("DCameraClientTest dcamera_client_test_003: test init and release client"); + DCLOGI("DCameraClientTest dcamera_client_test_003: test init and release client"); std::shared_ptr stateCallback = std::make_shared(); int32_t ret = client_->SetStateCallback(stateCallback); EXPECT_EQ(DCAMERA_OK, ret); @@ -340,7 +340,7 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_003, TestSize.Level1) */ HWTEST_F(DCameraClientTest, dcamera_client_test_004, TestSize.Level1) { - DHLOGI("DCameraClientTest dcamera_client_test_004: test startCapture and stopCapture"); + DCLOGI("DCameraClientTest dcamera_client_test_004: test startCapture and stopCapture"); std::shared_ptr stateCallback = std::make_shared(); int32_t ret = client_->SetStateCallback(stateCallback); EXPECT_EQ(DCAMERA_OK, ret); @@ -356,7 +356,7 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_004, TestSize.Level1) EXPECT_EQ(DCAMERA_OK, ret); SetTokenID(); - DHLOGI("DCameraClientTest dcamera_client_test_004: video width: %d, height: %d, format: %d, isCapture: %d", + DCLOGI("DCameraClientTest dcamera_client_test_004: video width: %d, height: %d, format: %d, isCapture: %d", videoInfo_true_->width_, videoInfo_true_->height_, videoInfo_true_->format_, videoInfo_true_->isCapture_); std::vector> captureInfos; captureInfos.push_back(videoInfo_true_); @@ -393,7 +393,7 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_004, TestSize.Level1) */ HWTEST_F(DCameraClientTest, dcamera_client_test_005, TestSize.Level1) { - DHLOGI("DCameraClientTest dcamera_client_test_005: test startCapture and stopCapture"); + DCLOGI("DCameraClientTest dcamera_client_test_005: test startCapture and stopCapture"); std::shared_ptr stateCallback = std::make_shared(); int32_t ret = client_->SetStateCallback(stateCallback); EXPECT_EQ(DCAMERA_OK, ret); @@ -409,9 +409,9 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_005, TestSize.Level1) EXPECT_EQ(DCAMERA_OK, ret); SetTokenID(); - DHLOGI("DCameraClientTest dcamera_client_test_005: video width: %d, height: %d, format: %d, isCapture: %d", + DCLOGI("DCameraClientTest dcamera_client_test_005: video width: %d, height: %d, format: %d, isCapture: %d", videoInfo_true_->width_, videoInfo_true_->height_, videoInfo_true_->format_, videoInfo_true_->isCapture_); - DHLOGI("DCameraClientTest dcamera_client_test_005: photo width: %d, height: %d, format: %d, isCapture: %d", + DCLOGI("DCameraClientTest dcamera_client_test_005: photo width: %d, height: %d, format: %d, isCapture: %d", photoInfo_false_->width_, photoInfo_false_->height_, photoInfo_false_->format_, photoInfo_false_->isCapture_); std::vector> captureInfos; captureInfos.push_back(videoInfo_true_); @@ -423,9 +423,9 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_005, TestSize.Level1) sleep(TEST_SLEEP_SEC); - DHLOGI("DCameraClientTest dcamera_client_test_005: video width: %d, height: %d, format: %d, isCapture: %d", + DCLOGI("DCameraClientTest dcamera_client_test_005: video width: %d, height: %d, format: %d, isCapture: %d", videoInfo_false_->width_, videoInfo_false_->height_, videoInfo_false_->format_, videoInfo_false_->isCapture_); - DHLOGI("DCameraClientTest dcamera_client_test_005: photo width: %d, height: %d, format: %d, isCapture: %d", + DCLOGI("DCameraClientTest dcamera_client_test_005: photo width: %d, height: %d, format: %d, isCapture: %d", photoInfo_true_->width_, photoInfo_true_->height_, photoInfo_true_->format_, photoInfo_true_->isCapture_); captureInfos.clear(); captureInfos.push_back(videoInfo_false_); @@ -449,7 +449,7 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_005, TestSize.Level1) */ HWTEST_F(DCameraClientTest, dcamera_client_test_006, TestSize.Level1) { - DHLOGI("DCameraClientTest dcamera_client_test_006: test updateSettings"); + DCLOGI("DCameraClientTest dcamera_client_test_006: test updateSettings"); std::vector> settings; auto setting = std::make_shared(); setting->type_ = ENABLE_METADATA; @@ -467,7 +467,7 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_006, TestSize.Level1) */ HWTEST_F(DCameraClientTest, dcamera_client_test_007, TestSize.Level1) { - DHLOGI("DCameraClientTest dcamera_client_test_007: test updateSettings"); + DCLOGI("DCameraClientTest dcamera_client_test_007: test updateSettings"); auto metaData = std::make_shared(ENTRY_CAPACITY, DATA_CAPACITY); uint8_t afMode = OHOS_CAMERA_FOCUS_MODE_AUTO; uint8_t aeMode = OHOS_CAMERA_EXPOSURE_MODE_CONTINUOUS_AUTO; @@ -495,7 +495,7 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_007, TestSize.Level1) */ HWTEST_F(DCameraClientTest, dcamera_client_test_008, TestSize.Level1) { - DHLOGI("DCameraClientTest dcamera_client_test_008: test updateSettings"); + DCLOGI("DCameraClientTest dcamera_client_test_008: test updateSettings"); auto metaData = std::make_shared(ENTRY_CAPACITY, DATA_CAPACITY); std::string abilityString = Camera::MetadataUtils::EncodeToString(metaData); std::vector> settings; @@ -516,7 +516,7 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_008, TestSize.Level1) */ HWTEST_F(DCameraClientTest, dcamera_client_test_009, TestSize.Level1) { - DHLOGI("DCameraClientTest dcamera_client_test_009: test cameraServiceErrorType"); + DCLOGI("DCameraClientTest dcamera_client_test_009: test cameraServiceErrorType"); int32_t ret = client_->CameraServiceErrorType(CameraStandard::CamServiceError::CAMERA_OK); EXPECT_EQ(DCAMERA_OK, ret); @@ -535,7 +535,7 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_009, TestSize.Level1) */ HWTEST_F(DCameraClientTest, dcamera_client_test_010, TestSize.Level1) { - DHLOGI("DCameraClientTest dcamera_client_test_010: test createCaptureOutput"); + DCLOGI("DCameraClientTest dcamera_client_test_010: test createCaptureOutput"); std::vector> captureInfos; int32_t ret = client_->CreateCaptureOutput(captureInfos); EXPECT_EQ(DCAMERA_BAD_VALUE, ret); @@ -556,7 +556,7 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_010, TestSize.Level1) */ HWTEST_F(DCameraClientTest, dcamera_client_test_011, TestSize.Level1) { - DHLOGI("DCameraClientTest dcamera_client_test_011: test convertToCameraFormat"); + DCLOGI("DCameraClientTest dcamera_client_test_011: test convertToCameraFormat"); CameraStandard::CameraFormat ret = client_->ConvertToCameraFormat(OHOS_CAMERA_FORMAT_INVALID); EXPECT_EQ(CameraStandard::CameraFormat::CAMERA_FORMAT_INVALID, ret); @@ -581,7 +581,7 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_011, TestSize.Level1) */ HWTEST_F(DCameraClientTest, dcamera_client_test_013, TestSize.Level1) { - DHLOGI("DCameraClientTest dcamera_client_test_013: test startPhotoOutput"); + DCLOGI("DCameraClientTest dcamera_client_test_013: test startPhotoOutput"); std::shared_ptr stateCallback = std::make_shared(); int32_t ret = client_->SetStateCallback(stateCallback); EXPECT_EQ(DCAMERA_OK, ret); @@ -597,9 +597,9 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_013, TestSize.Level1) EXPECT_EQ(DCAMERA_OK, ret); SetTokenID(); - DHLOGI("DCameraClientTest dcamera_client_test_013: video width: %d, height: %d, format: %d, isCapture: %d", + DCLOGI("DCameraClientTest dcamera_client_test_013: video width: %d, height: %d, format: %d, isCapture: %d", videoInfo_true_->width_, videoInfo_true_->height_, videoInfo_true_->format_, videoInfo_true_->isCapture_); - DHLOGI("DCameraClientTest dcamera_client_test_013: photo width: %d, height: %d, format: %d, isCapture: %d", + DCLOGI("DCameraClientTest dcamera_client_test_013: photo width: %d, height: %d, format: %d, isCapture: %d", photoInfo_false_->width_, photoInfo_false_->height_, photoInfo_false_->format_, photoInfo_false_->isCapture_); std::vector> captureInfos; captureInfos.push_back(videoInfo_true_); @@ -632,7 +632,7 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_013, TestSize.Level1) */ HWTEST_F(DCameraClientTest, dcamera_client_test_014, TestSize.Level1) { - DHLOGI("DCameraClientTest dcamera_client_test_014: test startCapture"); + DCLOGI("DCameraClientTest dcamera_client_test_014: test startCapture"); std::vector> captureInfos; sptr surface = nullptr; int32_t ret = client_->StartCapture(captureInfos, surface); @@ -647,7 +647,7 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_014, TestSize.Level1) */ HWTEST_F(DCameraClientTest, dcamera_client_test_015, TestSize.Level1) { - DHLOGI("DCameraClientTest dcamera_client_test_015: test startCaptureInner"); + DCLOGI("DCameraClientTest dcamera_client_test_015: test startCaptureInner"); int32_t invalidParam = 2; auto info = std::make_shared(); info->streamType_ = static_cast(invalidParam); diff --git a/services/cameraservice/cameraoperator/handler/BUILD.gn b/services/cameraservice/cameraoperator/handler/BUILD.gn index 1235e8fa9b95b34a14a1e5787a9867f81453ff02..82406811d0a0899fbc385660049338e07371377f 100644 --- a/services/cameraservice/cameraoperator/handler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/BUILD.gn @@ -66,7 +66,7 @@ ohos_shared_library("distributed_camera_handler") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"dcamerahandler\"", + "DC_LOG_TAG=\"dcamerahandler\"", "LOG_DOMAIN=0xD004100", ] diff --git a/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp b/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp index 2473db0fbc31aefdd3bc5341f1bfd26b845ec717..acae9b6fc582f534adf83ee0b1e33a3f7d82990a 100644 --- a/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp +++ b/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp @@ -24,7 +24,7 @@ #include "dcamera_utils_tools.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "metadata_utils.h" namespace OHOS { @@ -33,20 +33,20 @@ IMPLEMENT_SINGLE_INSTANCE(DCameraHandler); DCameraHandler::~DCameraHandler() { - DHLOGI("~DCameraHandler"); + DCLOGI("~DCameraHandler"); } int32_t DCameraHandler::Initialize() { - DHLOGI("start"); + DCLOGI("start"); cameraManager_ = CameraStandard::CameraManager::GetInstance(); if (cameraManager_ == nullptr) { - DHLOGE("cameraManager getInstance failed"); + DCLOGE("cameraManager getInstance failed"); return DCAMERA_INIT_ERR; } std::shared_ptr cameraMgrCallback = std::make_shared(); cameraManager_->SetCallback(cameraMgrCallback); - DHLOGI("success"); + DCLOGI("success"); return DCAMERA_OK; } @@ -54,52 +54,52 @@ std::vector DCameraHandler::Query() { std::vector itemList; std::vector> cameraList = cameraManager_->GetSupportedCameras(); - DHLOGI("get %d cameras", cameraList.size()); + DCLOGI("get %d cameras", cameraList.size()); if (cameraList.empty()) { - DHLOGE("no camera device"); + DCLOGE("no camera device"); return itemList; } for (auto& info : cameraList) { if (info->GetConnectionType() != CameraStandard::ConnectionType::CAMERA_CONNECTION_BUILT_IN) { - DHLOGI("connection type: %d", info->GetConnectionType()); + DCLOGI("connection type: %d", info->GetConnectionType()); continue; } - DHLOGI("get %s, position: %d, cameraType: %d", + DCLOGI("get %s, position: %d, cameraType: %d", GetAnonyString(info->GetID()).c_str(), info->GetPosition(), info->GetCameraType()); DHItem item; if (CreateDHItem(info, item) == DCAMERA_OK) { itemList.emplace_back(item); } } - DHLOGI("success, get %d items", itemList.size()); + DCLOGI("success, get %d items", itemList.size()); return itemList; } std::map DCameraHandler::QueryExtraInfo() { - DHLOGI("enter"); + DCLOGI("enter"); std::map extraInfo; return extraInfo; } bool DCameraHandler::IsSupportPlugin() { - DHLOGI("enter"); + DCLOGI("enter"); return false; } void DCameraHandler::RegisterPluginListener(std::shared_ptr listener) { - DHLOGI("enter"); + DCLOGI("enter"); if (listener == nullptr) { - DHLOGE("DCameraHandler unregistering plugin listener"); + DCLOGE("DCameraHandler unregistering plugin listener"); } pluginListener_ = listener; } void DCameraHandler::UnRegisterPluginListener() { - DHLOGI("enter"); + DCLOGI("enter"); pluginListener_ = nullptr; } @@ -107,27 +107,27 @@ std::vector DCameraHandler::GetCameras() { std::vector cameras; std::vector> cameraList = cameraManager_->GetSupportedCameras(); - DHLOGI("get %d cameras", cameraList.size()); + DCLOGI("get %d cameras", cameraList.size()); if (cameraList.empty()) { - DHLOGE("no camera device"); + DCLOGE("no camera device"); return cameras; } for (auto& info : cameraList) { sptr capability = cameraManager_->GetSupportedOutputCapability(info); if (capability == nullptr) { - DHLOGI("get supported capability is null"); + DCLOGI("get supported capability is null"); continue; } if (info->GetConnectionType() != CameraStandard::ConnectionType::CAMERA_CONNECTION_BUILT_IN) { - DHLOGI("connection type: %d", info->GetConnectionType()); + DCLOGI("connection type: %d", info->GetConnectionType()); continue; } - DHLOGI("get %s, position: %d, cameraType: %d", + DCLOGI("get %s, position: %d, cameraType: %d", GetAnonyString(info->GetID()).c_str(), info->GetPosition(), info->GetCameraType()); std::string dhId = CAMERA_ID_PREFIX + info->GetID(); cameras.emplace_back(dhId); } - DHLOGI("success, get %d items", cameras.size()); + DCLOGI("success, get %d items", cameras.size()); return cameras; } @@ -135,7 +135,7 @@ int32_t DCameraHandler::CreateDHItem(sptr& info, D { std::string id = info->GetID(); item.dhId = CAMERA_ID_PREFIX + id; - DHLOGI("camera id: %s", GetAnonyString(id).c_str()); + DCLOGI("camera id: %s", GetAnonyString(id).c_str()); Json::Value root; root[CAMERA_PROTOCOL_VERSION_KEY] = Json::Value(CAMERA_PROTOCOL_VERSION_VALUE); @@ -148,12 +148,12 @@ int32_t DCameraHandler::CreateDHItem(sptr& info, D std::string name = codecInfo->GetName(); std::string mimeType = codecInfo->GetMimeType(); root[CAMERA_CODEC_TYPE_KEY].append(mimeType); - DHLOGI("codec name: %s, mimeType: %s", name.c_str(), mimeType.c_str()); + DCLOGI("codec name: %s, mimeType: %s", name.c_str(), mimeType.c_str()); } sptr capability = cameraManager_->GetSupportedOutputCapability(info); if (capability == nullptr) { - DHLOGI("get supported capability is null"); + DCLOGI("get supported capability is null"); return DCAMERA_BAD_VALUE; } std::vector photoProfiles = capability->GetPhotoProfiles(); @@ -165,29 +165,29 @@ int32_t DCameraHandler::CreateDHItem(sptr& info, D sptr cameraInput = nullptr; int rv = cameraManager_->CreateCameraInput(info, &cameraInput); if (rv != DCAMERA_OK) { - DHLOGE("create cameraInput failed"); + DCLOGE("create cameraInput failed"); return DCAMERA_BAD_VALUE; } std::hash h; std::string abilityString = cameraInput->GetCameraSettings(); - DHLOGI("abilityString hash: %zu, length: %zu", h(abilityString), abilityString.length()); + DCLOGI("abilityString hash: %zu, length: %zu", h(abilityString), abilityString.length()); std::string encodeString = Base64Encode(reinterpret_cast(abilityString.c_str()), abilityString.length()); - DHLOGI("encodeString hash: %zu, length: %zu", h(encodeString), encodeString.length()); + DCLOGI("encodeString hash: %zu, length: %zu", h(encodeString), encodeString.length()); root[CAMERA_METADATA_KEY] = Json::Value(encodeString); item.attrs = root.toStyledString(); if (cameraInput->Release() != DCAMERA_OK) { - DHLOGE("cameraInput Release failed"); + DCLOGE("cameraInput Release failed"); } return DCAMERA_OK; } std::string DCameraHandler::GetCameraPosition(CameraStandard::CameraPosition position) { - DHLOGI("position: %d", position); + DCLOGI("position: %d", position); std::string ret = ""; switch (position) { case CameraStandard::CameraPosition::CAMERA_POSITION_BACK: { @@ -203,25 +203,25 @@ std::string DCameraHandler::GetCameraPosition(CameraStandard::CameraPosition pos break; } default: { - DHLOGE("unknown camera position"); + DCLOGE("unknown camera position"); break; } } - DHLOGI("success ret: %s", ret.c_str()); + DCLOGI("success ret: %s", ret.c_str()); return ret; } void DCameraHandler::ConfigFormatAndResolution(const DCStreamType type, Json::Value& root, std::vector& profileList) { - DHLOGI("type: %d, size: %d", type, profileList.size()); + DCLOGI("type: %d, size: %d", type, profileList.size()); std::set formatSet; for (auto& profile : profileList) { CameraStandard::CameraFormat format = profile.GetCameraFormat(); CameraStandard::Size picSize = profile.GetSize(); int32_t dformat = CovertToDcameraFormat(format); formatSet.insert(dformat); - DHLOGI("width: %d, height: %d, format: %d", picSize.width, picSize.height, dformat); + DCLOGI("width: %d, height: %d, format: %d", picSize.width, picSize.height, dformat); std::string formatName = std::to_string(dformat); if (IsValid(type, picSize)) { std::string resolutionValue = std::to_string(picSize.width) + "*" + std::to_string(picSize.height); @@ -246,7 +246,7 @@ void DCameraHandler::ConfigFormatAndResolution(const DCStreamType type, Json::Va int32_t DCameraHandler::CovertToDcameraFormat(CameraStandard::CameraFormat format) { - DHLOGI("format: %d", format); + DCLOGI("format: %d", format); int32_t ret = -1; switch (format) { case CameraStandard::CameraFormat::CAMERA_FORMAT_RGBA_8888: @@ -262,7 +262,7 @@ int32_t DCameraHandler::CovertToDcameraFormat(CameraStandard::CameraFormat forma ret = camera_format_t::OHOS_CAMERA_FORMAT_JPEG; break; default: - DHLOGE("invalid camera format"); + DCLOGE("invalid camera format"); break; } return ret; @@ -289,7 +289,7 @@ bool DCameraHandler::IsValid(const DCStreamType type, const CameraStandard::Size break; } default: { - DHLOGE("unknown stream type"); + DCLOGE("unknown stream type"); break; } } @@ -298,7 +298,7 @@ bool DCameraHandler::IsValid(const DCStreamType type, const CameraStandard::Size IHardwareHandler* GetHardwareHandler() { - DHLOGI("DCameraHandler::GetHardwareHandler"); + DCLOGI("DCameraHandler::GetHardwareHandler"); return &DCameraHandler::GetInstance(); } } // namespace DistributedHardware diff --git a/services/cameraservice/cameraoperator/handler/src/dcamera_handler_common.cpp b/services/cameraservice/cameraoperator/handler/src/dcamera_handler_common.cpp index 9758d03510b55ddb13a3e76df3feed3dcf16fca1..9865ef604798695c45c52e895a55f5eac5ef1b67 100644 --- a/services/cameraservice/cameraoperator/handler/src/dcamera_handler_common.cpp +++ b/services/cameraservice/cameraoperator/handler/src/dcamera_handler_common.cpp @@ -24,7 +24,7 @@ #include "dcamera_utils_tools.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "metadata_utils.h" namespace OHOS { @@ -33,20 +33,20 @@ IMPLEMENT_SINGLE_INSTANCE(DCameraHandler); DCameraHandler::~DCameraHandler() { - DHLOGI("~DCameraHandler"); + DCLOGI("~DCameraHandler"); } int32_t DCameraHandler::Initialize() { - DHLOGI("start"); + DCLOGI("start"); cameraManager_ = CameraStandard::CameraManager::GetInstance(); if (cameraManager_ == nullptr) { - DHLOGE("cameraManager getInstance failed"); + DCLOGE("cameraManager getInstance failed"); return DCAMERA_INIT_ERR; } std::shared_ptr cameraMgrCallback = std::make_shared(); cameraManager_->SetCallback(cameraMgrCallback); - DHLOGI("success"); + DCLOGI("success"); return DCAMERA_OK; } @@ -54,52 +54,52 @@ std::vector DCameraHandler::Query() { std::vector itemList; std::vector> cameraList = cameraManager_->GetSupportedCameras(); - DHLOGI("get %d cameras", cameraList.size()); + DCLOGI("get %d cameras", cameraList.size()); if (cameraList.empty()) { - DHLOGE("no camera device"); + DCLOGE("no camera device"); return itemList; } for (auto& info : cameraList) { if (info->GetConnectionType() != CameraStandard::ConnectionType::CAMERA_CONNECTION_BUILT_IN) { - DHLOGI("connection type: %d", info->GetConnectionType()); + DCLOGI("connection type: %d", info->GetConnectionType()); continue; } - DHLOGI("get %s, position: %d, cameraType: %d", + DCLOGI("get %s, position: %d, cameraType: %d", GetAnonyString(info->GetID()).c_str(), info->GetPosition(), info->GetCameraType()); DHItem item; if (CreateDHItem(info, item) == DCAMERA_OK) { itemList.emplace_back(item); } } - DHLOGI("success, get %d items", itemList.size()); + DCLOGI("success, get %d items", itemList.size()); return itemList; } std::map DCameraHandler::QueryExtraInfo() { - DHLOGI("enter"); + DCLOGI("enter"); std::map extraInfo; return extraInfo; } bool DCameraHandler::IsSupportPlugin() { - DHLOGI("enter"); + DCLOGI("enter"); return false; } void DCameraHandler::RegisterPluginListener(std::shared_ptr listener) { - DHLOGI("enter"); + DCLOGI("enter"); if (listener == nullptr) { - DHLOGE("DCameraHandler unregistering plugin listener"); + DCLOGE("DCameraHandler unregistering plugin listener"); } pluginListener_ = listener; } void DCameraHandler::UnRegisterPluginListener() { - DHLOGI("enter"); + DCLOGI("enter"); pluginListener_ = nullptr; } @@ -107,27 +107,27 @@ std::vector DCameraHandler::GetCameras() { std::vector cameras; std::vector> cameraList = cameraManager_->GetSupportedCameras(); - DHLOGI("get %d cameras", cameraList.size()); + DCLOGI("get %d cameras", cameraList.size()); if (cameraList.empty()) { - DHLOGE("no camera device"); + DCLOGE("no camera device"); return cameras; } for (auto& info : cameraList) { sptr capability = cameraManager_->GetSupportedOutputCapability(info); if (capability == nullptr) { - DHLOGI("get supported capability is null"); + DCLOGI("get supported capability is null"); continue; } if (info->GetConnectionType() != CameraStandard::ConnectionType::CAMERA_CONNECTION_BUILT_IN) { - DHLOGI("connection type: %d", info->GetConnectionType()); + DCLOGI("connection type: %d", info->GetConnectionType()); continue; } - DHLOGI("get %s, position: %d, cameraType: %d", + DCLOGI("get %s, position: %d, cameraType: %d", GetAnonyString(info->GetID()).c_str(), info->GetPosition(), info->GetCameraType()); std::string dhId = CAMERA_ID_PREFIX + info->GetID(); cameras.emplace_back(dhId); } - DHLOGI("success, get %d items", cameras.size()); + DCLOGI("success, get %d items", cameras.size()); return cameras; } @@ -135,7 +135,7 @@ int32_t DCameraHandler::CreateDHItem(sptr& info, D { std::string id = info->GetID(); item.dhId = CAMERA_ID_PREFIX + id; - DHLOGI("camera id: %s", GetAnonyString(id).c_str()); + DCLOGI("camera id: %s", GetAnonyString(id).c_str()); Json::Value root; root[CAMERA_PROTOCOL_VERSION_KEY] = Json::Value(CAMERA_PROTOCOL_VERSION_VALUE); @@ -148,12 +148,12 @@ int32_t DCameraHandler::CreateDHItem(sptr& info, D std::shared_ptr codecInfo = videoCaps->GetCodecInfo(); std::string name = codecInfo->GetName(); std::string mimeType = codecInfo->GetMimeType(); - DHLOGI("codec name: %s, mimeType: %s", name.c_str(), mimeType.c_str()); + DCLOGI("codec name: %s, mimeType: %s", name.c_str(), mimeType.c_str()); } sptr capability = cameraManager_->GetSupportedOutputCapability(info); if (capability == nullptr) { - DHLOGI("get supported capability is null"); + DCLOGI("get supported capability is null"); return DCAMERA_BAD_VALUE; } std::vector photoProfiles = capability->GetPhotoProfiles(); @@ -165,29 +165,29 @@ int32_t DCameraHandler::CreateDHItem(sptr& info, D sptr cameraInput = nullptr; int rv = cameraManager_->CreateCameraInput(info, &cameraInput); if (rv != DCAMERA_OK) { - DHLOGE("create cameraInput failed"); + DCLOGE("create cameraInput failed"); return DCAMERA_BAD_VALUE; } std::hash h; std::string abilityString = cameraInput->GetCameraSettings(); - DHLOGI("abilityString hash: %zu, length: %zu", h(abilityString), abilityString.length()); + DCLOGI("abilityString hash: %zu, length: %zu", h(abilityString), abilityString.length()); std::string encodeString = Base64Encode(reinterpret_cast(abilityString.c_str()), abilityString.length()); - DHLOGI("encodeString hash: %zu, length: %zu", h(encodeString), encodeString.length()); + DCLOGI("encodeString hash: %zu, length: %zu", h(encodeString), encodeString.length()); root[CAMERA_METADATA_KEY] = Json::Value(encodeString); item.attrs = root.toStyledString(); if (cameraInput->Release() != DCAMERA_OK) { - DHLOGE("cameraInput Release failed"); + DCLOGE("cameraInput Release failed"); } return DCAMERA_OK; } std::string DCameraHandler::GetCameraPosition(CameraStandard::CameraPosition position) { - DHLOGI("position: %d", position); + DCLOGI("position: %d", position); std::string ret = ""; switch (position) { case CameraStandard::CameraPosition::CAMERA_POSITION_BACK: { @@ -203,25 +203,25 @@ std::string DCameraHandler::GetCameraPosition(CameraStandard::CameraPosition pos break; } default: { - DHLOGE("unknown camera position"); + DCLOGE("unknown camera position"); break; } } - DHLOGI("success ret: %s", ret.c_str()); + DCLOGI("success ret: %s", ret.c_str()); return ret; } void DCameraHandler::ConfigFormatAndResolution(const DCStreamType type, Json::Value& root, std::vector& profileList) { - DHLOGI("type: %d, size: %d", type, profileList.size()); + DCLOGI("type: %d, size: %d", type, profileList.size()); std::set formatSet; for (auto& profile : profileList) { CameraStandard::CameraFormat format = profile.GetCameraFormat(); CameraStandard::Size picSize = profile.GetSize(); int32_t dformat = CovertToDcameraFormat(format); formatSet.insert(dformat); - DHLOGI("width: %d, height: %d, format: %d", picSize.width, picSize.height, dformat); + DCLOGI("width: %d, height: %d, format: %d", picSize.width, picSize.height, dformat); std::string formatName = std::to_string(dformat); if (IsValid(type, picSize)) { std::string resolutionValue = std::to_string(picSize.width) + "*" + std::to_string(picSize.height); @@ -246,7 +246,7 @@ void DCameraHandler::ConfigFormatAndResolution(const DCStreamType type, Json::Va int32_t DCameraHandler::CovertToDcameraFormat(CameraStandard::CameraFormat format) { - DHLOGI("format: %d", format); + DCLOGI("format: %d", format); int32_t ret = -1; switch (format) { case CameraStandard::CameraFormat::CAMERA_FORMAT_RGBA_8888: @@ -262,7 +262,7 @@ int32_t DCameraHandler::CovertToDcameraFormat(CameraStandard::CameraFormat forma ret = camera_format_t::OHOS_CAMERA_FORMAT_JPEG; break; default: - DHLOGE("invalid camera format"); + DCLOGE("invalid camera format"); break; } return ret; @@ -289,7 +289,7 @@ bool DCameraHandler::IsValid(const DCStreamType type, const CameraStandard::Size break; } default: { - DHLOGE("unknown stream type"); + DCLOGE("unknown stream type"); break; } } @@ -298,7 +298,7 @@ bool DCameraHandler::IsValid(const DCStreamType type, const CameraStandard::Size IHardwareHandler* GetHardwareHandler() { - DHLOGI("DCameraHandler::GetHardwareHandler"); + DCLOGI("DCameraHandler::GetHardwareHandler"); return &DCameraHandler::GetInstance(); } } // namespace DistributedHardware diff --git a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn index ddcce166cf2fbb812443339a8108b47bf6af5fff..e3367eada3979574976128a8c8818abd52f29ddc 100644 --- a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn @@ -75,7 +75,7 @@ ohos_unittest("DCameraHandlerTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DCameraHandlerTest\"", + "DC_LOG_TAG=\"DCameraHandlerTest\"", "LOG_DOMAIN=0xD004100", ] } diff --git a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/dcamera_handler_test.cpp b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/dcamera_handler_test.cpp index a571290c7831430f3e3a27faf88f830eeae8173b..fe7311884f7bb64556f836aeb24dcc8ca61f0333 100644 --- a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/dcamera_handler_test.cpp +++ b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/dcamera_handler_test.cpp @@ -23,7 +23,7 @@ #include "anonymous_string.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "nativetoken_kit.h" #include "token_setproc.h" @@ -38,12 +38,12 @@ public: void PluginHardware(const std::string &dhId, const std::string &attrs) override { - DHLOGI("dhId: %s, attrs: %s", GetAnonyString(dhId).c_str(), attrs.c_str()); + DCLOGI("dhId: %s, attrs: %s", GetAnonyString(dhId).c_str(), attrs.c_str()); } void UnPluginHardware(const std::string &dhId) override { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DCLOGI("dhId: %s", GetAnonyString(dhId).c_str()); } }; @@ -58,22 +58,22 @@ public: void DCameraHandlerTest::SetUpTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraHandlerTest::TearDownTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraHandlerTest::SetUp(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraHandlerTest::TearDown(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraHandlerTest::SetTokenID() diff --git a/services/cameraservice/sinkservice/BUILD.gn b/services/cameraservice/sinkservice/BUILD.gn index 38ec84312579ad503c4006bccace9b4b2345854d..4680c68eb428f0aa75796369ed4744a7cc42e48a 100644 --- a/services/cameraservice/sinkservice/BUILD.gn +++ b/services/cameraservice/sinkservice/BUILD.gn @@ -37,8 +37,10 @@ ohos_shared_library("distributed_camera_sink") { "${camerastandard_path}/services/camera_service/binder/client/include", "${camerastandard_path}/services/camera_service/binder/server/include", "${camerastandard_path}/services/camera_service/include", + "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/eventbus", + "${fwk_utils_path}/include/log", "//third_party/cJSON", "//third_party/jsoncpp/include", ] @@ -112,13 +114,14 @@ ohos_shared_library("distributed_camera_sink") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"dcamerasinksvr\"", + "DC_LOG_TAG=\"dcamerasinksvr\"", "LOG_DOMAIN=0xD004100", ] external_deps = [ "c_utils:utils", "camera_framework:camera_framework", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "drivers_peripheral_display:hdi_gralloc_client", "eventhandler:libeventhandler", diff --git a/services/cameraservice/sinkservice/src/distributedcamera/dcamera_sink_hidumper.cpp b/services/cameraservice/sinkservice/src/distributedcamera/dcamera_sink_hidumper.cpp index 4ab389129705ba43da1a00cad37307163c85126c..0071c51551caa0218c4c584fca92120cfa711595 100644 --- a/services/cameraservice/sinkservice/src/distributedcamera/dcamera_sink_hidumper.cpp +++ b/services/cameraservice/sinkservice/src/distributedcamera/dcamera_sink_hidumper.cpp @@ -17,7 +17,7 @@ #include "distributed_camera_errno.h" #include "distributed_camera_sink_service.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -44,7 +44,7 @@ void DcameraSinkHidumper::SetSinkDumpInfo(CameraDumpInfo& camDumpInfo_) bool DcameraSinkHidumper::Dump(const std::vector& args, std::string& result) { - DHLOGI("DcameraSinkHidumper Dump args.size():%d.", args.size()); + DCLOGI("DcameraSinkHidumper Dump args.size():%d.", args.size()); result.clear(); int32_t argsSize = static_cast(args.size()); @@ -57,7 +57,7 @@ bool DcameraSinkHidumper::Dump(const std::vector& args, std::string } for (int32_t i = 0; i < argsSize; i++) { - DHLOGI("DcameraSinkHidumper Dump args[%d]: %s.", i, args.at(i).c_str()); + DCLOGI("DcameraSinkHidumper Dump args[%d]: %s.", i, args.at(i).c_str()); } if (ProcessDump(args[0], result) != DCAMERA_OK) { @@ -68,7 +68,7 @@ bool DcameraSinkHidumper::Dump(const std::vector& args, std::string int32_t DcameraSinkHidumper::ProcessDump(const std::string& args, std::string& result) { - DHLOGI("ProcessDump Dump."); + DCLOGI("ProcessDump Dump."); HidumpFlag hf = HidumpFlag::UNKNOWN; auto operatorIter = ARGS_MAP.find(args); if (operatorIter != ARGS_MAP.end()) { @@ -106,7 +106,7 @@ int32_t DcameraSinkHidumper::ProcessDump(const std::string& args, std::string& r int32_t DcameraSinkHidumper::GetLocalCameraNumber(std::string& result) { - DHLOGI("GetLocalCameraNumber Dump."); + DCLOGI("GetLocalCameraNumber Dump."); result.append("CameraNumber: ") .append(std::to_string(camDumpInfo_.camNumber)); return DCAMERA_OK; @@ -114,7 +114,7 @@ int32_t DcameraSinkHidumper::GetLocalCameraNumber(std::string& result) int32_t DcameraSinkHidumper::GetOpenedCameraInfo(std::string& result) { - DHLOGI("GetOpenedCameraInfo Dump."); + DCLOGI("GetOpenedCameraInfo Dump."); result.append("OpenedCamera:\n"); std::vector camIds = camDumpInfo_.camIds; for (size_t i = 0; i < camIds.size(); i++) { @@ -126,7 +126,7 @@ int32_t DcameraSinkHidumper::GetOpenedCameraInfo(std::string& result) int32_t DcameraSinkHidumper::GetVersionInfo(std::string& result) { - DHLOGI("GetVersionInfo Dump."); + DCLOGI("GetVersionInfo Dump."); result.append("CameraVersion: ") .append(camDumpInfo_.version); return DCAMERA_OK; @@ -134,7 +134,7 @@ int32_t DcameraSinkHidumper::GetVersionInfo(std::string& result) void DcameraSinkHidumper::ShowHelp(std::string& result) { - DHLOGI("ShowHelp Dump."); + DCLOGI("ShowHelp Dump."); result.append("Usage:dump [options]\n") .append("Description:\n") .append("-h ") @@ -149,7 +149,7 @@ void DcameraSinkHidumper::ShowHelp(std::string& result) int32_t DcameraSinkHidumper::ShowIllegalInfomation(std::string& result) { - DHLOGI("ShowIllegalInfomation Dump."); + DCLOGI("ShowIllegalInfomation Dump."); result.append("unknown command, -h for help."); return DCAMERA_OK; } diff --git a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp index 54aec91c87ceea643cb7a08c68911a2cc73f444d..a22d1a0e8b63eae7f412cac43ae0178c6decc134 100644 --- a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp +++ b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp @@ -27,7 +27,7 @@ #include "dcamera_hisysevent_adapter.h" #include "dcamera_sink_service_ipc.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -43,39 +43,39 @@ DistributedCameraSinkService::DistributedCameraSinkService(int32_t saId, bool ru void DistributedCameraSinkService::OnStart() { - DHLOGI("DistributedCameraSinkService OnStart"); + DCLOGI("DistributedCameraSinkService OnStart"); if (state_ == DCameraServiceState::DCAMERA_SRV_STATE_RUNNING) { - DHLOGI("DistributedCameraSinkService has already started."); + DCLOGI("DistributedCameraSinkService has already started."); return; } if (!Init()) { - DHLOGE("DistributedCameraSinkService init failed"); + DCLOGE("DistributedCameraSinkService init failed"); return; } state_ = DCameraServiceState::DCAMERA_SRV_STATE_RUNNING; - DHLOGI("DCameraServiceState OnStart service success."); + DCLOGI("DCameraServiceState OnStart service success."); } bool DistributedCameraSinkService::Init() { - DHLOGI("DistributedCameraSinkService start init"); + DCLOGI("DistributedCameraSinkService start init"); DCameraSinkServiceIpc::GetInstance().Init(); if (!registerToService_) { bool ret = Publish(this); if (!ret) { - DHLOGE("DistributedCameraSinkService Publish service failed"); + DCLOGE("DistributedCameraSinkService Publish service failed"); return false; } registerToService_ = true; } - DHLOGI("DistributedCameraSinkService init success"); + DCLOGI("DistributedCameraSinkService init success"); return true; } void DistributedCameraSinkService::OnStop() { - DHLOGI("DistributedCameraSinkService OnStop service"); + DCLOGI("DistributedCameraSinkService OnStop service"); state_ = DCameraServiceState::DCAMERA_SRV_STATE_NOT_START; registerToService_ = false; DCameraSinkServiceIpc::GetInstance().UnInit(); @@ -83,18 +83,18 @@ void DistributedCameraSinkService::OnStop() int32_t DistributedCameraSinkService::InitSink(const std::string& params) { - DHLOGI("start"); + DCLOGI("start"); sinkVer_ = params; g_camDump.version = sinkVer_; int32_t ret = DCameraHandler::GetInstance().Initialize(); if (ret != DCAMERA_OK) { - DHLOGE("handler initialize failed, ret: %d", ret); + DCLOGE("handler initialize failed, ret: %d", ret); return ret; } std::vector cameras = DCameraHandler::GetInstance().GetCameras(); if (cameras.empty()) { - DHLOGE("no camera device"); + DCLOGE("no camera device"); return DCAMERA_BAD_VALUE; } g_camDump.camNumber = static_cast(cameras.size()); @@ -102,7 +102,7 @@ int32_t DistributedCameraSinkService::InitSink(const std::string& params) std::shared_ptr sinkDevice = std::make_shared(dhId); ret = sinkDevice->Init(); if (ret != DCAMERA_OK) { - DHLOGE("sink device init failed, ret: %d", ret); + DCLOGE("sink device init failed, ret: %d", ret); return ret; } { @@ -110,20 +110,20 @@ int32_t DistributedCameraSinkService::InitSink(const std::string& params) camerasMap_.emplace(dhId, sinkDevice); } } - DHLOGI("success"); + DCLOGI("success"); return DCAMERA_OK; } int32_t DistributedCameraSinkService::ReleaseSink() { - DHLOGI("enter"); + DCLOGI("enter"); { std::lock_guard lock(mapMutex_); for (auto iter = camerasMap_.begin(); iter != camerasMap_.end(); iter++) { std::shared_ptr sinkDevice = iter->second; int32_t ret = sinkDevice->UnInit(); if (ret != DCAMERA_OK) { - DHLOGE("release sink device failed, ret: %d", ret); + DCLOGE("release sink device failed, ret: %d", ret); } } camerasMap_.clear(); @@ -131,27 +131,27 @@ int32_t DistributedCameraSinkService::ReleaseSink() auto systemAbilityMgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (systemAbilityMgr == nullptr) { - DHLOGE("sink systemAbilityMgr is null"); + DCLOGE("sink systemAbilityMgr is null"); return DCAMERA_BAD_VALUE; } int32_t ret = systemAbilityMgr->UnloadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID); if (ret != DCAMERA_OK) { - DHLOGE("sink systemAbilityMgr UnLoadSystemAbility failed, ret: %d", ret); + DCLOGE("sink systemAbilityMgr UnLoadSystemAbility failed, ret: %d", ret); return DCAMERA_BAD_VALUE; } - DHLOGI("sink systemAbilityMgr UnLoadSystemAbility success"); + DCLOGI("sink systemAbilityMgr UnLoadSystemAbility success"); return DCAMERA_OK; } int32_t DistributedCameraSinkService::SubscribeLocalHardware(const std::string& dhId, const std::string& parameters) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DCLOGI("dhId: %s", GetAnonyString(dhId).c_str()); std::shared_ptr sinkDevice = nullptr; { std::lock_guard lock(mapMutex_); auto iter = camerasMap_.find(dhId); if (iter == camerasMap_.end()) { - DHLOGE("device not found"); + DCLOGE("device not found"); return DCAMERA_NOT_FOUND; } sinkDevice = iter->second; @@ -159,22 +159,22 @@ int32_t DistributedCameraSinkService::SubscribeLocalHardware(const std::string& int32_t ret = sinkDevice->SubscribeLocalHardware(parameters); if (ret != DCAMERA_OK) { - DHLOGE("SubscribeLocalHardware failed, ret: %d", ret); + DCLOGE("SubscribeLocalHardware failed, ret: %d", ret); return ret; } - DHLOGI("SubscribeLocalHardware success"); + DCLOGI("SubscribeLocalHardware success"); return DCAMERA_OK; } int32_t DistributedCameraSinkService::UnsubscribeLocalHardware(const std::string& dhId) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DCLOGI("dhId: %s", GetAnonyString(dhId).c_str()); std::shared_ptr sinkDevice = nullptr; { std::lock_guard lock(mapMutex_); auto iter = camerasMap_.find(dhId); if (iter == camerasMap_.end()) { - DHLOGE("device not found"); + DCLOGE("device not found"); return DCAMERA_NOT_FOUND; } sinkDevice = iter->second; @@ -182,22 +182,22 @@ int32_t DistributedCameraSinkService::UnsubscribeLocalHardware(const std::string int32_t ret = sinkDevice->UnsubscribeLocalHardware(); if (ret != DCAMERA_OK) { - DHLOGE("UnsubscribeLocalHardware failed, ret: %d", ret); + DCLOGE("UnsubscribeLocalHardware failed, ret: %d", ret); return ret; } - DHLOGI("UnsubscribeLocalHardware success"); + DCLOGI("UnsubscribeLocalHardware success"); return DCAMERA_OK; } int32_t DistributedCameraSinkService::StopCapture(const std::string& dhId) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DCLOGI("dhId: %s", GetAnonyString(dhId).c_str()); std::shared_ptr sinkDevice = nullptr; { std::lock_guard lock(mapMutex_); auto iter = camerasMap_.find(dhId); if (iter == camerasMap_.end()) { - DHLOGE("device not found"); + DCLOGE("device not found"); return DCAMERA_NOT_FOUND; } sinkDevice = iter->second; @@ -205,22 +205,22 @@ int32_t DistributedCameraSinkService::StopCapture(const std::string& dhId) int32_t ret = sinkDevice->StopCapture(); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture failed, ret: %d", ret); + DCLOGE("StopCapture failed, ret: %d", ret); return ret; } - DHLOGI("StopCapture success"); + DCLOGI("StopCapture success"); return DCAMERA_OK; } int32_t DistributedCameraSinkService::ChannelNeg(const std::string& dhId, std::string& channelInfo) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DCLOGI("dhId: %s", GetAnonyString(dhId).c_str()); std::shared_ptr sinkDevice = nullptr; { std::lock_guard lock(mapMutex_); auto iter = camerasMap_.find(dhId); if (iter == camerasMap_.end()) { - DHLOGE("device not found"); + DCLOGE("device not found"); return DCAMERA_NOT_FOUND; } sinkDevice = iter->second; @@ -228,22 +228,22 @@ int32_t DistributedCameraSinkService::ChannelNeg(const std::string& dhId, std::s int32_t ret = sinkDevice->ChannelNeg(channelInfo); if (ret != DCAMERA_OK) { - DHLOGE("ChannelNeg failed, ret: %d", ret); + DCLOGE("ChannelNeg failed, ret: %d", ret); return ret; } - DHLOGI("ChannelNeg success"); + DCLOGI("ChannelNeg success"); return DCAMERA_OK; } int32_t DistributedCameraSinkService::GetCameraInfo(const std::string& dhId, std::string& cameraInfo) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DCLOGI("dhId: %s", GetAnonyString(dhId).c_str()); std::shared_ptr sinkDevice = nullptr; { std::lock_guard lock(mapMutex_); auto iter = camerasMap_.find(dhId); if (iter == camerasMap_.end()) { - DHLOGE("device not found"); + DCLOGE("device not found"); return DCAMERA_NOT_FOUND; } sinkDevice = iter->second; @@ -251,22 +251,22 @@ int32_t DistributedCameraSinkService::GetCameraInfo(const std::string& dhId, std int32_t ret = sinkDevice->GetCameraInfo(cameraInfo); if (ret != DCAMERA_OK) { - DHLOGE("GetCameraInfo failed, ret: %d", ret); + DCLOGE("GetCameraInfo failed, ret: %d", ret); return ret; } - DHLOGI("GetCameraInfo success"); + DCLOGI("GetCameraInfo success"); return DCAMERA_OK; } int32_t DistributedCameraSinkService::OpenChannel(const std::string& dhId, std::string& openInfo) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DCLOGI("dhId: %s", GetAnonyString(dhId).c_str()); std::shared_ptr sinkDevice = nullptr; { std::lock_guard lock(mapMutex_); auto iter = camerasMap_.find(dhId); if (iter == camerasMap_.end()) { - DHLOGE("device not found"); + DCLOGE("device not found"); return DCAMERA_NOT_FOUND; } sinkDevice = iter->second; @@ -274,24 +274,24 @@ int32_t DistributedCameraSinkService::OpenChannel(const std::string& dhId, std:: int32_t ret = sinkDevice->OpenChannel(openInfo); if (ret != DCAMERA_OK) { - DHLOGE("OpenChannel failed, ret: %d", ret); + DCLOGE("OpenChannel failed, ret: %d", ret); ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_SINK_OPEN_CAM_ERROR, CreateMsg("sink service open channel failed, dhId: %s", GetAnonyString(dhId).c_str())); return ret; } - DHLOGI("OpenChannel success"); + DCLOGI("OpenChannel success"); return DCAMERA_OK; } int32_t DistributedCameraSinkService::CloseChannel(const std::string& dhId) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DCLOGI("dhId: %s", GetAnonyString(dhId).c_str()); std::shared_ptr sinkDevice = nullptr; { std::lock_guard lock(mapMutex_); auto iter = camerasMap_.find(dhId); if (iter == camerasMap_.end()) { - DHLOGE("device not found"); + DCLOGE("device not found"); return DCAMERA_NOT_FOUND; } sinkDevice = iter->second; @@ -299,18 +299,18 @@ int32_t DistributedCameraSinkService::CloseChannel(const std::string& dhId) int32_t ret = sinkDevice->CloseChannel(); if (ret != DCAMERA_OK) { - DHLOGE("CloseChannel failed, ret: %d", ret); + DCLOGE("CloseChannel failed, ret: %d", ret); return ret; } - DHLOGI("CloseChannel success"); + DCLOGI("CloseChannel success"); return DCAMERA_OK; } int DistributedCameraSinkService::Dump(int32_t fd, const std::vector& args) { - DHLOGI("DistributedCameraSinkService Dump."); + DCLOGI("DistributedCameraSinkService Dump."); if (args.size() > DUMP_MAX_SIZE) { - DHLOGE("DistributedCameraSinkService Dump input is invalid"); + DCLOGE("DistributedCameraSinkService Dump input is invalid"); return DCAMERA_BAD_VALUE; } std::string result; @@ -320,13 +320,13 @@ int DistributedCameraSinkService::Dump(int32_t fd, const std::vector PARAM_MAX_SIZE) { - DHLOGE("params is invalid"); + DCLOGE("params is invalid"); ret = DCAMERA_BAD_VALUE; break; } @@ -83,7 +83,7 @@ int32_t DistributedCameraSinkStub::InitSinkInner(MessageParcel &data, MessagePar int32_t DistributedCameraSinkStub::ReleaseSinkInner(MessageParcel &data, MessageParcel &reply) { - DHLOGD("enter"); + DCLOGD("enter"); int32_t ret = ReleaseSink(); reply.WriteInt32(ret); return DCAMERA_OK; @@ -91,14 +91,14 @@ int32_t DistributedCameraSinkStub::ReleaseSinkInner(MessageParcel &data, Message int32_t DistributedCameraSinkStub::SubscribeLocalHardwareInner(MessageParcel &data, MessageParcel &reply) { - DHLOGD("enter"); + DCLOGD("enter"); int32_t ret = DCAMERA_OK; do { std::string dhId = data.ReadString(); std::string parameters = data.ReadString(); if (parameters.empty() || parameters.size() > PARAM_MAX_SIZE || dhId.empty() || dhId.size() > DID_MAX_SIZE) { - DHLOGE("params is invalid"); + DCLOGE("params is invalid"); ret = DCAMERA_BAD_VALUE; break; } @@ -110,12 +110,12 @@ int32_t DistributedCameraSinkStub::SubscribeLocalHardwareInner(MessageParcel &da int32_t DistributedCameraSinkStub::UnsubscribeLocalHardwareInner(MessageParcel &data, MessageParcel &reply) { - DHLOGD("enter"); + DCLOGD("enter"); int32_t ret = DCAMERA_OK; do { std::string dhId = data.ReadString(); if (dhId.empty() || dhId.size() > DID_MAX_SIZE) { - DHLOGE("params is invalid"); + DCLOGE("params is invalid"); ret = DCAMERA_BAD_VALUE; break; } @@ -127,12 +127,12 @@ int32_t DistributedCameraSinkStub::UnsubscribeLocalHardwareInner(MessageParcel & int32_t DistributedCameraSinkStub::StopCaptureInner(MessageParcel &data, MessageParcel &reply) { - DHLOGD("enter"); + DCLOGD("enter"); int32_t ret = DCAMERA_OK; do { std::string dhId = data.ReadString(); if (dhId.empty() || dhId.size() > DID_MAX_SIZE) { - DHLOGE("params is invalid"); + DCLOGE("params is invalid"); ret = DCAMERA_BAD_VALUE; break; } @@ -144,14 +144,14 @@ int32_t DistributedCameraSinkStub::StopCaptureInner(MessageParcel &data, Message int32_t DistributedCameraSinkStub::ChannelNegInner(MessageParcel &data, MessageParcel &reply) { - DHLOGD("enter"); + DCLOGD("enter"); int32_t ret = DCAMERA_OK; do { std::string dhId = data.ReadString(); std::string channelInfo = data.ReadString(); if (dhId.empty() || dhId.size() > DID_MAX_SIZE || channelInfo.empty() || channelInfo.size() > PARAM_MAX_SIZE) { - DHLOGE("params is invalid"); + DCLOGE("params is invalid"); ret = DCAMERA_BAD_VALUE; break; } @@ -163,13 +163,13 @@ int32_t DistributedCameraSinkStub::ChannelNegInner(MessageParcel &data, MessageP int32_t DistributedCameraSinkStub::GetCameraInfoInner(MessageParcel &data, MessageParcel &reply) { - DHLOGD("enter"); + DCLOGD("enter"); int32_t ret = DCAMERA_OK; do { std::string dhId = data.ReadString(); std::string cameraInfo = data.ReadString(); if (dhId.empty() || dhId.size() > DID_MAX_SIZE) { - DHLOGE("params is invalid"); + DCLOGE("params is invalid"); ret = DCAMERA_BAD_VALUE; break; } @@ -181,14 +181,14 @@ int32_t DistributedCameraSinkStub::GetCameraInfoInner(MessageParcel &data, Messa int32_t DistributedCameraSinkStub::OpenChannelInner(MessageParcel &data, MessageParcel &reply) { - DHLOGD("enter"); + DCLOGD("enter"); int32_t ret = DCAMERA_OK; do { std::string dhId = data.ReadString(); std::string openInfo = data.ReadString(); if (dhId.empty() || dhId.size() > DID_MAX_SIZE || openInfo.empty()|| openInfo.size() > PARAM_MAX_SIZE) { - DHLOGE("params is invalid"); + DCLOGE("params is invalid"); ret = DCAMERA_BAD_VALUE; break; } @@ -200,12 +200,12 @@ int32_t DistributedCameraSinkStub::OpenChannelInner(MessageParcel &data, Message int32_t DistributedCameraSinkStub::CloseChannelInner(MessageParcel &data, MessageParcel &reply) { - DHLOGD("enter"); + DCLOGD("enter"); int32_t ret = DCAMERA_OK; do { std::string dhId = data.ReadString(); if (dhId.empty() || dhId.size() > DID_MAX_SIZE) { - DHLOGE("params is invalid"); + DCLOGE("params is invalid"); ret = DCAMERA_BAD_VALUE; break; } diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/callback/dcamera_sink_controller_state_callback.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/callback/dcamera_sink_controller_state_callback.cpp index 6987ad48b708b7bbcfa17ffb4502c7afe2aede70..936a68be96a72a0de895baf91ac37dcd4cc66b46 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/callback/dcamera_sink_controller_state_callback.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/callback/dcamera_sink_controller_state_callback.cpp @@ -15,7 +15,7 @@ #include "dcamera_sink_controller_state_callback.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -28,7 +28,7 @@ void DCameraSinkControllerStateCallback::OnStateChanged(std::shared_ptr controller = controller_.lock(); if (controller == nullptr) { - DHLOGE("DCameraSinkControllerStateCallback::OnStateChanged controller is null"); + DCLOGE("DCameraSinkControllerStateCallback::OnStateChanged controller is null"); return; } controller->OnStateChanged(event); @@ -38,7 +38,7 @@ void DCameraSinkControllerStateCallback::OnMetadataResult(std::vector controller = controller_.lock(); if (controller == nullptr) { - DHLOGE("DCameraSinkControllerStateCallback::OnMetadataResult controller is null"); + DCLOGE("DCameraSinkControllerStateCallback::OnMetadataResult controller is null"); return; } controller->OnMetadataResult(settings); diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/callback/dcamera_sink_output_result_callback.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/callback/dcamera_sink_output_result_callback.cpp index ab2f3cca9a4003bc3d61e47307f77e72265a5fbe..9be17b2391e0fca3de1877c8389ffb6cc21cdf00 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/callback/dcamera_sink_output_result_callback.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/callback/dcamera_sink_output_result_callback.cpp @@ -15,7 +15,7 @@ #include "dcamera_sink_output_result_callback.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -28,7 +28,7 @@ void DCameraSinkOutputResultCallback::OnPhotoResult(std::shared_ptr& { std::shared_ptr output = output_.lock(); if (output == nullptr) { - DHLOGE("DCameraSinkOutputResultCallback::OnPhotoResult output is null"); + DCLOGE("DCameraSinkOutputResultCallback::OnPhotoResult output is null"); return; } output->OnPhotoResult(buffer); @@ -38,7 +38,7 @@ void DCameraSinkOutputResultCallback::OnVideoResult(std::shared_ptr& { std::shared_ptr output = output_.lock(); if (output == nullptr) { - DHLOGE("DCameraSinkOutputResultCallback::OnVideoResult output is null"); + DCLOGE("DCameraSinkOutputResultCallback::OnVideoResult output is null"); return; } output->OnVideoResult(buffer); diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_access_control.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_access_control.cpp index b03992af46f9ba78af9350b5f974381864cae5ba..2c25dae14792a290debcd307dc3fb3f10f195a40 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_access_control.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_access_control.cpp @@ -17,31 +17,31 @@ #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { bool DCameraSinkAccessControl::IsSensitiveSrcAccess(const std::string& srcType) { - DHLOGI("DCameraSinkAccessControl::IsSensitiveSrcAccess srcType: %s", srcType.c_str()); + DCLOGI("DCameraSinkAccessControl::IsSensitiveSrcAccess srcType: %s", srcType.c_str()); return true; } bool DCameraSinkAccessControl::NotifySensitiveSrc(const std::string& srcType) { - DHLOGI("DCameraSinkAccessControl::NotifySensitiveSrc srcType: %s", srcType.c_str()); + DCLOGI("DCameraSinkAccessControl::NotifySensitiveSrc srcType: %s", srcType.c_str()); return true; } int32_t DCameraSinkAccessControl::TriggerFrame(const std::string& deviceName) { - DHLOGI("DCameraSinkAccessControl::TriggerFrame deviceName: %s", deviceName.c_str()); + DCLOGI("DCameraSinkAccessControl::TriggerFrame deviceName: %s", deviceName.c_str()); return DCAMERA_OK; } int32_t DCameraSinkAccessControl::GetAccessControlType(const std::string& accessType) { - DHLOGI("DCameraSinkAccessControl::GetAccessControlType accessType: %s", accessType.c_str()); + DCLOGI("DCameraSinkAccessControl::GetAccessControlType accessType: %s", accessType.c_str()); return DCAMERA_SAME_ACCOUNT; } } // namespace DistributedHardware diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp index e31473f71f8830ba1c677619327ebdfe9e09375c..e6c03a211b8e20a85710b1daf9524f62f8dd172a 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp @@ -33,7 +33,7 @@ #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "idistributed_camera_source.h" #include "json/json.h" #include "dcamera_low_latency.h" @@ -55,7 +55,7 @@ DCameraSinkController::~DCameraSinkController() int32_t DCameraSinkController::StartCapture(std::vector>& captureInfos) { - DHLOGI("StartCapture dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("StartCapture dhId: %s", GetAnonyString(dhId_).c_str()); std::string accessType = ""; if ((accessControl_->IsSensitiveSrcAccess(SRC_TYPE)) && (accessControl_->GetAccessControlType(accessType) == DCAMERA_SAME_ACCOUNT)) { @@ -76,11 +76,11 @@ int32_t DCameraSinkController::StartCapture(std::vector autoLock(captureLock_); int32_t ret = operator_->StopCapture(); if (ret != DCAMERA_OK) { - DHLOGE("client stop capture failed, dhId: %s, ret: %d", + DCLOGE("client stop capture failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_DEVICE_ERROR, std::string("operator stop capture failed.")); return ret; @@ -88,40 +88,40 @@ int32_t DCameraSinkController::StopCapture() ret = output_->StopCapture(); if (ret != DCAMERA_OK) { - DHLOGE("output stop capture failed, dhId: %s, ret: %d", + DCLOGE("output stop capture failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_DEVICE_ERROR, std::string("output stop capture failed")); return ret; } - DHLOGI("StopCapture %s success", GetAnonyString(dhId_).c_str()); + DCLOGI("StopCapture %s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSinkController::ChannelNeg(std::shared_ptr& info) { - DHLOGI("ChannelNeg dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("ChannelNeg dhId: %s", GetAnonyString(dhId_).c_str()); int32_t ret = output_->OpenChannel(info); if (ret != DCAMERA_OK) { - DHLOGE("channel negotiate failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DCLOGE("channel negotiate failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); return ret; } - DHLOGI("ChannelNeg %s success", GetAnonyString(dhId_).c_str()); + DCLOGI("ChannelNeg %s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSinkController::DCameraNotify(std::shared_ptr& events) { - DHLOGI("DCameraNotify dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("DCameraNotify dhId: %s", GetAnonyString(dhId_).c_str()); if (srcDevId_.empty()) { - DHLOGE("source deviceId is empty"); + DCLOGE("source deviceId is empty"); return DCAMERA_BAD_VALUE; } sptr sourceSA = DCameraSinkServiceIpc::GetInstance().GetSourceRemoteCamSrv(srcDevId_); if (sourceSA == nullptr) { - DHLOGE("sourceSA is null"); + DCLOGE("sourceSA is null"); return DCAMERA_BAD_VALUE; } @@ -133,7 +133,7 @@ int32_t DCameraSinkController::DCameraNotify(std::shared_ptr& even eventCmd.value_ = events; int32_t ret = eventCmd.Marshal(jsonStr); if (ret != DCAMERA_OK) { - DHLOGE("DCameraEventCmd marshal failed, dhId: %s, ret: %d", + DCLOGE("DCameraEventCmd marshal failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); return ret; } @@ -141,48 +141,48 @@ int32_t DCameraSinkController::DCameraNotify(std::shared_ptr& even std::string sinkDevId; ret = GetLocalDeviceNetworkId(sinkDevId); if (ret != DCAMERA_OK) { - DHLOGE("GetLocalDeviceNetworkId failed, devId: %s, dhId: %s, ret: %d", + DCLOGE("GetLocalDeviceNetworkId failed, devId: %s, dhId: %s, ret: %d", GetAnonyString(sinkDevId).c_str(), GetAnonyString(dhId_).c_str(), ret); return ret; } ret = sourceSA->DCameraNotify(sinkDevId, dhId_, jsonStr); if (ret != DCAMERA_OK) { - DHLOGE("SourceSA notify failed, srcId: %s, sinkId: %s, dhId: %s, ret: %d", + DCLOGE("SourceSA notify failed, srcId: %s, sinkId: %s, dhId: %s, ret: %d", GetAnonyString(srcDevId_).c_str(), GetAnonyString(sinkDevId).c_str(), GetAnonyString(dhId_).c_str(), ret); return ret; } - DHLOGI("DCameraNotify %s success", GetAnonyString(dhId_).c_str()); + DCLOGI("DCameraNotify %s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSinkController::UpdateSettings(std::vector>& settings) { - DHLOGI("UpdateSettings dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("UpdateSettings dhId: %s", GetAnonyString(dhId_).c_str()); int32_t ret = operator_->UpdateSettings(settings); if (ret != DCAMERA_OK) { - DHLOGE("UpdateSettings failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DCLOGE("UpdateSettings failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); return ret; } - DHLOGI("UpdateSettings %s success", GetAnonyString(dhId_).c_str()); + DCLOGI("UpdateSettings %s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSinkController::GetCameraInfo(std::shared_ptr& camInfo) { - DHLOGI("GetCameraInfo dhId: %s, session state: %d", GetAnonyString(dhId_).c_str(), sessionState_); + DCLOGI("GetCameraInfo dhId: %s, session state: %d", GetAnonyString(dhId_).c_str(), sessionState_); camInfo->state_ = sessionState_; return DCAMERA_OK; } int32_t DCameraSinkController::OpenChannel(std::shared_ptr& openInfo) { - DHLOGI("OpenChannel dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("OpenChannel dhId: %s", GetAnonyString(dhId_).c_str()); if (sessionState_ != DCAMERA_CHANNEL_STATE_DISCONNECTED) { - DHLOGE("wrong state, dhId: %s, sessionState: %d", GetAnonyString(dhId_).c_str(), sessionState_); + DCLOGE("wrong state, dhId: %s, sessionState: %d", GetAnonyString(dhId_).c_str(), sessionState_); return DCAMERA_WRONG_STATE; } DCameraLowLatency::GetInstance().EnableLowLatency(); @@ -194,45 +194,45 @@ int32_t DCameraSinkController::OpenChannel(std::shared_ptr& ope std::make_shared(controller); int32_t ret = channel_->CreateSession(indexs, SESSION_FLAG, DCAMERA_SESSION_MODE_CTRL, listener); if (ret != DCAMERA_OK) { - DHLOGE("channel create session failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DCLOGE("channel create session failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); return ret; } - DHLOGI("OpenChannel %s success", GetAnonyString(dhId_).c_str()); + DCLOGI("OpenChannel %s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSinkController::CloseChannel() { - DHLOGI("CloseChannel dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("CloseChannel dhId: %s", GetAnonyString(dhId_).c_str()); std::lock_guard autoLock(channelLock_); DCameraLowLatency::GetInstance().DisableLowLatency(); DCameraSinkServiceIpc::GetInstance().DeleteSourceRemoteCamSrv(srcDevId_); srcDevId_.clear(); int32_t ret = channel_->ReleaseSession(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSinkController release channel failed, dhId: %s, ret: %d", + DCLOGE("DCameraSinkController release channel failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); } ret = output_->CloseChannel(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSinkController CloseChannel failed, dhId: %s, ret: %d", + DCLOGE("DCameraSinkController CloseChannel failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); } sessionState_ = DCAMERA_CHANNEL_STATE_DISCONNECTED; - DHLOGI("CloseChannel %s success", GetAnonyString(dhId_).c_str()); + DCLOGI("CloseChannel %s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSinkController::Init(std::vector& indexs) { - DHLOGI("DCameraSinkController Init"); + DCLOGI("DCameraSinkController Init"); dhId_ = indexs[0].dhId_; operator_ = std::make_shared(dhId_); output_ = std::make_shared(dhId_, operator_); int32_t ret = output_->Init(); if (ret != DCAMERA_OK) { - DHLOGE("output init failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DCLOGE("output init failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); return ret; } @@ -241,7 +241,7 @@ int32_t DCameraSinkController::Init(std::vector& indexs) operator_->SetStateCallback(stateCallback); ret = operator_->Init(); if (ret != DCAMERA_OK) { - DHLOGE("operator init failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DCLOGE("operator init failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); return ret; } @@ -253,28 +253,28 @@ int32_t DCameraSinkController::Init(std::vector& indexs) eventBus_->AddHandler(authEvent.GetType(), *this); isInit_ = true; - DHLOGI("DCameraSinkController Init %s success", GetAnonyString(dhId_).c_str()); + DCLOGI("DCameraSinkController Init %s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSinkController::UnInit() { - DHLOGI("DCameraSinkController UnInit dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("DCameraSinkController UnInit dhId: %s", GetAnonyString(dhId_).c_str()); std::lock_guard autoLock(autoLock_); int32_t ret = StopCapture(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSinkController UnInit %s stop capture failed, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DCLOGE("DCameraSinkController UnInit %s stop capture failed, ret: %d", GetAnonyString(dhId_).c_str(), ret); } ret = CloseChannel(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSinkController UnInit %s close channel failed, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DCLOGE("DCameraSinkController UnInit %s close channel failed, ret: %d", GetAnonyString(dhId_).c_str(), ret); } if (output_ != nullptr) { ret = output_->UnInit(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSinkController release output failed, dhId: %s, ret: %d", + DCLOGE("DCameraSinkController release output failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); } } @@ -282,13 +282,13 @@ int32_t DCameraSinkController::UnInit() if (operator_ != nullptr) { ret = operator_->UnInit(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSinkController release operator failed, dhId: %s, ret: %d", + DCLOGE("DCameraSinkController release operator failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); } } isInit_ = false; - DHLOGI("DCameraSinkController UnInit %s success", GetAnonyString(dhId_).c_str()); + DCLOGI("DCameraSinkController UnInit %s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } @@ -306,7 +306,7 @@ void DCameraSinkController::OnEvent(DCameraPostAuthorizationEvent& event) void DCameraSinkController::OnStateChanged(std::shared_ptr& event) { - DHLOGI("DCameraSinkController::OnStateChanged dhId: %s, result: %d", + DCLOGI("DCameraSinkController::OnStateChanged dhId: %s, result: %d", GetAnonyString(dhId_).c_str(), event->eventResult_); if (event->eventResult_ == DCAMERA_EVENT_DEVICE_PREEMPT) { DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_DEVICE_PREEMPT, std::string("camera device preempted")); @@ -317,9 +317,9 @@ void DCameraSinkController::OnStateChanged(std::shared_ptr& event) void DCameraSinkController::OnMetadataResult(std::vector>& settings) { - DHLOGI("DCameraSinkController::OnMetadataResult dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("DCameraSinkController::OnMetadataResult dhId: %s", GetAnonyString(dhId_).c_str()); if (settings.empty()) { - DHLOGE("camera settings is empty"); + DCLOGE("camera settings is empty"); return; } DCameraMetadataSettingCmd cmd; @@ -330,72 +330,72 @@ void DCameraSinkController::OnMetadataResult(std::vector buffer = std::make_shared(jsonStr.length() + 1); ret = memcpy_s(buffer->Data(), buffer->Capacity(), reinterpret_cast(const_cast(jsonStr.c_str())), jsonStr.length()); if (ret != EOK) { - DHLOGE("memcpy_s failed, dhId: %s ret: %d", GetAnonyString(dhId_).c_str(), ret); + DCLOGE("memcpy_s failed, dhId: %s ret: %d", GetAnonyString(dhId_).c_str(), ret); return; } ret = channel_->SendData(buffer); if (ret != DCAMERA_OK) { - DHLOGE("channel send data failed, dhId: %s ret: %d", GetAnonyString(dhId_).c_str(), ret); + DCLOGE("channel send data failed, dhId: %s ret: %d", GetAnonyString(dhId_).c_str(), ret); return; } - DHLOGI("DCameraSinkController::OnMetadataResult dhId: %s success", GetAnonyString(dhId_).c_str()); + DCLOGI("DCameraSinkController::OnMetadataResult dhId: %s success", GetAnonyString(dhId_).c_str()); } void DCameraSinkController::OnSessionState(int32_t state) { - DHLOGI("DCameraSinkController::OnSessionState dhId: %s, state: %d", GetAnonyString(dhId_).c_str(), state); + DCLOGI("DCameraSinkController::OnSessionState dhId: %s, state: %d", GetAnonyString(dhId_).c_str(), state); sessionState_ = state; switch (state) { case DCAMERA_CHANNEL_STATE_CONNECTING: - DHLOGI("channel is connecting"); + DCLOGI("channel is connecting"); break; case DCAMERA_CHANNEL_STATE_CONNECTED: - DHLOGI("channel is connected"); + DCLOGI("channel is connected"); break; case DCAMERA_CHANNEL_STATE_DISCONNECTED: - DHLOGI("channel is disconnected"); + DCLOGI("channel is disconnected"); std::thread([this]() { - DHLOGI("DCameraSinkController::OnSessionState %s new thread session state: %d", + DCLOGI("DCameraSinkController::OnSessionState %s new thread session state: %d", GetAnonyString(dhId_).c_str(), sessionState_); prctl(PR_SET_NAME, CHANNEL_DISCONNECTED.c_str()); std::lock_guard autoLock(autoLock_); int32_t ret = CloseChannel(); if (ret != DCAMERA_OK) { - DHLOGE("session state: %d, %s close channel failed, ret: %d", + DCLOGE("session state: %d, %s close channel failed, ret: %d", sessionState_, GetAnonyString(dhId_).c_str(), ret); } ret = StopCapture(); if (ret != DCAMERA_OK) { - DHLOGE("session state: %d, %s stop capture failed, ret: %d", + DCLOGE("session state: %d, %s stop capture failed, ret: %d", sessionState_, GetAnonyString(dhId_).c_str(), ret); } }).detach(); break; default: - DHLOGE("unknown session state"); + DCLOGE("unknown session state"); break; } } void DCameraSinkController::OnSessionError(int32_t eventType, int32_t eventReason, std::string detail) { - DHLOGI("DCameraSinkController::OnSessionError dhId: %s, eventType: %d, eventReason: %d, detail: %s", + DCLOGI("DCameraSinkController::OnSessionError dhId: %s, eventType: %d, eventReason: %d, detail: %s", GetAnonyString(dhId_).c_str(), eventType, eventReason, detail.c_str()); } void DCameraSinkController::OnDataReceived(std::vector>& buffers) { - DHLOGI("OnReceivedData %s control channel receive data", GetAnonyString(dhId_).c_str()); + DCLOGI("OnReceivedData %s control channel receive data", GetAnonyString(dhId_).c_str()); for (auto& buffer : buffers) { if (buffer->Size() <= 0 || buffer->Size() > DATABUFF_MAX_SIZE) { - DHLOGI("buffer is invalid"); + DCLOGI("buffer is invalid"); return; } HandleReceivedData(buffer); @@ -404,7 +404,7 @@ void DCameraSinkController::OnDataReceived(std::vector>& captureInfos) { - DHLOGI("DCameraSinkController::PostAuthorization dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("DCameraSinkController::PostAuthorization dhId: %s", GetAnonyString(dhId_).c_str()); int32_t ret = StartCaptureInner(captureInfos); if (ret == DCAMERA_OK) { accessControl_->NotifySensitiveSrc(SRC_TYPE); @@ -413,23 +413,23 @@ void DCameraSinkController::PostAuthorization(std::vector>& captureInfos) { - DHLOGI("StartCaptureInner dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("StartCaptureInner dhId: %s", GetAnonyString(dhId_).c_str()); std::lock_guard autoLock(captureLock_); int32_t ret = output_->StartCapture(captureInfos); if (ret != DCAMERA_OK) { - DHLOGE("output start capture failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DCLOGE("output start capture failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_DEVICE_ERROR, std::string("output start capture failed")); return ret; } PropertyCarrier carrier; ret = output_->GetProperty(SURFACE, carrier); if (ret != DCAMERA_OK) { - DHLOGD("StartCaptureInner: get property fail."); + DCLOGD("StartCaptureInner: get property fail."); return DCAMERA_BAD_VALUE; } ret = operator_->StartCapture(captureInfos, carrier.surface_); if (ret != DCAMERA_OK) { - DHLOGE("camera client start capture failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DCLOGE("camera client start capture failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); if (ret == DCAMERA_ALLOC_ERROR) { DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_NO_PERMISSION, std::string("operator start capture permission denial.")); @@ -441,7 +441,7 @@ int32_t DCameraSinkController::StartCaptureInner(std::vector& dataBuffer) { - DHLOGI("DCameraSinkController::HandleReceivedData dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("DCameraSinkController::HandleReceivedData dhId: %s", GetAnonyString(dhId_).c_str()); uint8_t *data = dataBuffer->Data(); std::string jsonStr(reinterpret_cast(data), dataBuffer->Capacity()); @@ -466,12 +466,12 @@ int32_t DCameraSinkController::HandleReceivedData(std::shared_ptr& d std::unique_ptr const jsonReader(readerBuilder.newCharReader()); if ((!jsonReader->parse(jsonStr.c_str(), jsonStr.c_str() + jsonStr.length(), &root, &errs)) || (!root.isObject())) { - DHLOGE("parse json string failed"); + DCLOGE("parse json string failed"); return DCAMERA_BAD_VALUE; } if ((!root.isMember("Command")) || (!root["Command"].isString())) { - DHLOGE("parse command failed"); + DCLOGE("parse command failed"); return DCAMERA_BAD_VALUE; } @@ -480,7 +480,7 @@ int32_t DCameraSinkController::HandleReceivedData(std::shared_ptr& d DCameraCaptureInfoCmd captureInfoCmd; int ret = captureInfoCmd.Unmarshal(jsonStr); if (ret != DCAMERA_OK) { - DHLOGE("Capture Info Unmarshal failed, dhId: %s ret: %d", GetAnonyString(dhId_).c_str(), ret); + DCLOGE("Capture Info Unmarshal failed, dhId: %s ret: %d", GetAnonyString(dhId_).c_str(), ret); return ret; } return StartCapture(captureInfoCmd.value_); @@ -488,7 +488,7 @@ int32_t DCameraSinkController::HandleReceivedData(std::shared_ptr& d DCameraMetadataSettingCmd metadataSettingCmd; int ret = metadataSettingCmd.Unmarshal(jsonStr); if (ret != DCAMERA_OK) { - DHLOGE("Metadata Setting Unmarshal failed, dhId: %s ret: %d", + DCLOGE("Metadata Setting Unmarshal failed, dhId: %s ret: %d", GetAnonyString(dhId_).c_str(), ret); return ret; } diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_data_process.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_data_process.cpp index 6a0f5b9e48e38ceeba9c1c278749011395e95213..1fa53d48bffc69f0c5291c8e8c93632439e42127 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_data_process.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_data_process.cpp @@ -21,7 +21,7 @@ #include "dcamera_sink_data_process_listener.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include namespace OHOS { @@ -29,12 +29,12 @@ namespace DistributedHardware { DCameraSinkDataProcess::DCameraSinkDataProcess(const std::string& dhId, std::shared_ptr& channel) : dhId_(dhId), channel_(channel), eventHandler_(nullptr) { - DHLOGI("DCameraSinkDataProcess Constructor dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("DCameraSinkDataProcess Constructor dhId: %s", GetAnonyString(dhId_).c_str()); } DCameraSinkDataProcess::~DCameraSinkDataProcess() { - DHLOGI("DCameraSinkDataProcess delete dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("DCameraSinkDataProcess delete dhId: %s", GetAnonyString(dhId_).c_str()); if ((eventHandler_ != nullptr) && (eventHandler_->GetEventRunner() != nullptr)) { eventHandler_->GetEventRunner()->Stop(); } @@ -44,7 +44,7 @@ DCameraSinkDataProcess::~DCameraSinkDataProcess() void DCameraSinkDataProcess::Init() { - DHLOGI("DCameraSinkDataProcess Init dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("DCameraSinkDataProcess Init dhId: %s", GetAnonyString(dhId_).c_str()); eventThread_ = std::thread(&DCameraSinkDataProcess::StartEventHandler, this); std::unique_lock lock(eventMutex_); eventCon_.wait(lock, [this] { @@ -66,17 +66,17 @@ void DCameraSinkDataProcess::StartEventHandler() int32_t DCameraSinkDataProcess::StartCapture(std::shared_ptr& captureInfo) { - DHLOGI("StartCapture dhId: %s, width: %d, height: %d, format: %d, stream: %d, encode: %d", + DCLOGI("StartCapture dhId: %s, width: %d, height: %d, format: %d, stream: %d, encode: %d", GetAnonyString(dhId_).c_str(), captureInfo->width_, captureInfo->height_, captureInfo->format_, captureInfo->streamType_, captureInfo->encodeType_); captureInfo_ = captureInfo; if (pipeline_ != nullptr) { - DHLOGI("StartCapture %s pipeline already exits", GetAnonyString(dhId_).c_str()); + DCLOGI("StartCapture %s pipeline already exits", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } if (captureInfo->streamType_ == CONTINUOUS_FRAME) { - DHLOGI("StartCapture %s create data process pipeline", GetAnonyString(dhId_).c_str()); + DCLOGI("StartCapture %s create data process pipeline", GetAnonyString(dhId_).c_str()); pipeline_ = std::make_shared(); auto dataProcess = std::shared_ptr(shared_from_this()); std::shared_ptr listener = std::make_shared(dataProcess); @@ -92,24 +92,24 @@ int32_t DCameraSinkDataProcess::StartCapture(std::shared_ptr captureInfo->height_); int32_t ret = pipeline_->CreateDataProcessPipeline(PipelineType::VIDEO, srcParams, destParams, listener); if (ret != DCAMERA_OK) { - DHLOGE("create data process pipeline failed, dhId: %s, ret: %d", + DCLOGE("create data process pipeline failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); return ret; } } - DHLOGI("StartCapture %s success", GetAnonyString(dhId_).c_str()); + DCLOGI("StartCapture %s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSinkDataProcess::StopCapture() { - DHLOGI("StopCapture dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("StopCapture dhId: %s", GetAnonyString(dhId_).c_str()); if (pipeline_ != nullptr) { pipeline_->DestroyDataProcessPipeline(); pipeline_ = nullptr; } if (eventHandler_ != nullptr) { - DHLOGI("StopCapture dhId: %s, remove all events", GetAnonyString(dhId_).c_str()); + DCLOGI("StopCapture dhId: %s, remove all events", GetAnonyString(dhId_).c_str()); eventHandler_->RemoveAllEvents(); } return DCAMERA_OK; @@ -118,12 +118,12 @@ int32_t DCameraSinkDataProcess::StopCapture() int32_t DCameraSinkDataProcess::FeedStream(std::shared_ptr& dataBuffer) { DCStreamType type = captureInfo_->streamType_; - DHLOGD("FeedStream dhId: %s, stream type: %d", GetAnonyString(dhId_).c_str(), type); + DCLOGD("FeedStream dhId: %s, stream type: %d", GetAnonyString(dhId_).c_str(), type); switch (type) { case CONTINUOUS_FRAME: { int32_t ret = FeedStreamInner(dataBuffer); if (ret != DCAMERA_OK) { - DHLOGE("FeedStream continuous frame failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DCLOGE("FeedStream continuous frame failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); return ret; } break; @@ -133,7 +133,7 @@ int32_t DCameraSinkDataProcess::FeedStream(std::shared_ptr& dataBuff break; } default: { - DHLOGE("FeedStream %s unknown stream type: %d", GetAnonyString(dhId_).c_str(), type); + DCLOGE("FeedStream %s unknown stream type: %d", GetAnonyString(dhId_).c_str(), type); break; } } @@ -145,7 +145,7 @@ void DCameraSinkDataProcess::SendDataAsync(const std::shared_ptr& bu auto sendFunc = [this, buffer]() mutable { std::shared_ptr sendBuffer = buffer; int32_t ret = channel_->SendData(sendBuffer); - DHLOGD("SendData type: %d output data ret: %d, dhId: %s, bufferSize: %d", captureInfo_->streamType_, ret, + DCLOGD("SendData type: %d output data ret: %d, dhId: %s, bufferSize: %d", captureInfo_->streamType_, ret, GetAnonyString(dhId_).c_str(), buffer->Size()); }; if (eventHandler_ != nullptr) { @@ -160,7 +160,7 @@ void DCameraSinkDataProcess::OnProcessedVideoBuffer(const std::shared_ptr& dat buffers.push_back(dataBuffer); int32_t ret = pipeline_->ProcessData(buffers); if (ret != DCAMERA_OK) { - DHLOGE("process data failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DCLOGE("process data failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); return ret; } return DCAMERA_OK; @@ -213,7 +213,7 @@ Videoformat DCameraSinkDataProcess::GetPipelineFormat(int32_t format) int32_t DCameraSinkDataProcess::GetProperty(const std::string& propertyName, PropertyCarrier& propertyCarrier) { if (pipeline_ == nullptr) { - DHLOGD("GetProperty: pipeline is nullptr."); + DCLOGD("GetProperty: pipeline is nullptr."); return DCAMERA_BAD_VALUE; } return pipeline_->GetProperty(propertyName, propertyCarrier); diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_dev.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_dev.cpp index 01eaa305085a2271d2074534195fe04601e53091..37577a8d69b8dcc9b127720001272e483feba0fe 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_dev.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_dev.cpp @@ -22,13 +22,13 @@ #include "dcamera_sink_access_control.h" #include "dcamera_sink_controller.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { DCameraSinkDev::DCameraSinkDev(const std::string& dhId) : dhId_(dhId) { - DHLOGI("DCameraSinkDev Constructor dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("DCameraSinkDev Constructor dhId: %s", GetAnonyString(dhId_).c_str()); isInit_ = false; } @@ -41,7 +41,7 @@ DCameraSinkDev::~DCameraSinkDev() int32_t DCameraSinkDev::Init() { - DHLOGI("Init dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("Init dhId: %s", GetAnonyString(dhId_).c_str()); accessControl_ = std::make_shared(); controller_ = std::make_shared(accessControl_); DCameraIndex index("", dhId_); @@ -49,12 +49,12 @@ int32_t DCameraSinkDev::Init() indexs.push_back(index); int32_t ret = controller_->Init(indexs); if (ret != DCAMERA_OK) { - DHLOGE("init controller failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DCLOGE("init controller failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); return ret; } isInit_ = true; - DHLOGI("DCameraSinkDev Init %s success", GetAnonyString(dhId_).c_str()); + DCLOGI("DCameraSinkDev Init %s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } @@ -63,7 +63,7 @@ int32_t DCameraSinkDev::UnInit() if (controller_ != nullptr) { int32_t ret = controller_->UnInit(); if (ret != DCAMERA_OK) { - DHLOGE("release controller failed, dhId: %s, ret: %d", + DCLOGE("release controller failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); } } @@ -73,35 +73,35 @@ int32_t DCameraSinkDev::UnInit() int32_t DCameraSinkDev::SubscribeLocalHardware(const std::string& parameters) { - DHLOGI("enter"); + DCLOGI("enter"); (void)parameters; return DCAMERA_OK; } int32_t DCameraSinkDev::UnsubscribeLocalHardware() { - DHLOGI("enter"); + DCLOGI("enter"); return DCAMERA_OK; } int32_t DCameraSinkDev::StopCapture() { - DHLOGI("StopCapture dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("StopCapture dhId: %s", GetAnonyString(dhId_).c_str()); return controller_->StopCapture(); } int32_t DCameraSinkDev::ChannelNeg(std::string& channelInfo) { - DHLOGI("ChannelNeg dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("ChannelNeg dhId: %s", GetAnonyString(dhId_).c_str()); if (channelInfo.empty()) { - DHLOGE("channelInfo is empty"); + DCLOGE("channelInfo is empty"); return DCAMERA_BAD_VALUE; } DCameraChannelInfoCmd channelInfoCmd; int32_t ret = channelInfoCmd.Unmarshal(channelInfo); if (ret != DCAMERA_OK) { - DHLOGE("channelInfo unmarshal failed, dhId: %s, ret: %d", + DCLOGE("channelInfo unmarshal failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); return ret; } @@ -110,11 +110,11 @@ int32_t DCameraSinkDev::ChannelNeg(std::string& channelInfo) int32_t DCameraSinkDev::GetCameraInfo(std::string& cameraInfo) { - DHLOGI("GetCameraInfo dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("GetCameraInfo dhId: %s", GetAnonyString(dhId_).c_str()); std::shared_ptr info = std::make_shared(); int32_t ret = controller_->GetCameraInfo(info); if (ret != DCAMERA_OK) { - DHLOGE("get state failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DCLOGE("get state failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); return ret; } @@ -125,25 +125,25 @@ int32_t DCameraSinkDev::GetCameraInfo(std::string& cameraInfo) cameraInfoCmd.value_ = info; ret = cameraInfoCmd.Marshal(cameraInfo); if (ret != DCAMERA_OK) { - DHLOGE("cameraInfoCmd marshal failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DCLOGE("cameraInfoCmd marshal failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); return ret; } - DHLOGI("GetCameraInfo %s success", GetAnonyString(dhId_).c_str()); + DCLOGI("GetCameraInfo %s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSinkDev::OpenChannel(std::string& openInfo) { - DHLOGI("OpenChannel dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("OpenChannel dhId: %s", GetAnonyString(dhId_).c_str()); if (openInfo.empty()) { - DHLOGE("openInfo is empty"); + DCLOGE("openInfo is empty"); return DCAMERA_BAD_VALUE; } DCameraOpenInfoCmd cmd; int32_t ret = cmd.Unmarshal(openInfo); if (ret != DCAMERA_OK) { - DHLOGE("openInfo unmarshal failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DCLOGE("openInfo unmarshal failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); return ret; } return controller_->OpenChannel(cmd.value_); @@ -151,7 +151,7 @@ int32_t DCameraSinkDev::OpenChannel(std::string& openInfo) int32_t DCameraSinkDev::CloseChannel() { - DHLOGI("CloseChannel dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("CloseChannel dhId: %s", GetAnonyString(dhId_).c_str()); return controller_->CloseChannel(); } diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_output.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_output.cpp index 28a368b2a7e88e1e120c2581db8c8da174997ca0..2110b4a43f3bc04301d8e76c93027a9be5ec083c 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_output.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_output.cpp @@ -23,14 +23,14 @@ #include "dcamera_sink_output_result_callback.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { DCameraSinkOutput::DCameraSinkOutput(const std::string& dhId, std::shared_ptr& cameraOperator) : dhId_(dhId), operator_(cameraOperator) { - DHLOGI("DCameraSinkOutput Constructor dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("DCameraSinkOutput Constructor dhId: %s", GetAnonyString(dhId_).c_str()); isInit_ = false; } @@ -43,7 +43,7 @@ DCameraSinkOutput::~DCameraSinkOutput() int32_t DCameraSinkOutput::Init() { - DHLOGI("Init dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("Init dhId: %s", GetAnonyString(dhId_).c_str()); auto output = std::shared_ptr(shared_from_this()); std::shared_ptr resultCallback = std::make_shared(output); operator_->SetResultCallback(resultCallback); @@ -51,7 +51,7 @@ int32_t DCameraSinkOutput::Init() InitInner(CONTINUOUS_FRAME); InitInner(SNAPSHOT_FRAME); isInit_ = true; - DHLOGI("Init %s success", GetAnonyString(dhId_).c_str()); + DCLOGI("Init %s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } @@ -67,18 +67,18 @@ void DCameraSinkOutput::InitInner(DCStreamType type) int32_t DCameraSinkOutput::UnInit() { - DHLOGI("UnInit dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("UnInit dhId: %s", GetAnonyString(dhId_).c_str()); channels_.clear(); dataProcesses_.clear(); sessionState_.clear(); isInit_ = false; - DHLOGI("UnInit %s success", GetAnonyString(dhId_).c_str()); + DCLOGI("UnInit %s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSinkOutput::OpenChannel(std::shared_ptr& info) { - DHLOGI("OpenChannel dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("OpenChannel dhId: %s", GetAnonyString(dhId_).c_str()); std::map modeMaps; modeMaps.emplace(CONTINUOUS_FRAME, DCAMERA_SESSION_MODE_VIDEO); modeMaps.emplace(SNAPSHOT_FRAME, DCAMERA_SESSION_MODE_JPEG); @@ -86,7 +86,7 @@ int32_t DCameraSinkOutput::OpenChannel(std::shared_ptr& info indexs.push_back(DCameraIndex(info->sourceDevId_, dhId_)); for (auto iter = info->detail_.begin(); iter != info->detail_.end(); iter++) { if (sessionState_[iter->streamType_] != DCAMERA_CHANNEL_STATE_DISCONNECTED) { - DHLOGE("wrong state, sessionState: %d", sessionState_[iter->streamType_]); + DCLOGE("wrong state, sessionState: %d", sessionState_[iter->streamType_]); return DCAMERA_OK; } auto iterCh = channels_.find(iter->streamType_); @@ -99,7 +99,7 @@ int32_t DCameraSinkOutput::OpenChannel(std::shared_ptr& info int32_t ret = iterCh->second->CreateSession(indexs, iter->dataSessionFlag_, modeMaps[iter->streamType_], channelListener); if (ret != DCAMERA_OK) { - DHLOGE("channel create session failed, dhId: %s, ret: %d", + DCLOGE("channel create session failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); return ret; } @@ -109,13 +109,13 @@ int32_t DCameraSinkOutput::OpenChannel(std::shared_ptr& info int32_t DCameraSinkOutput::CloseChannel() { - DHLOGI("CloseChannel dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("CloseChannel dhId: %s", GetAnonyString(dhId_).c_str()); auto iterCon = channels_.find(CONTINUOUS_FRAME); if (iterCon != channels_.end()) { int32_t ret = DCAMERA_OK; ret = iterCon->second->ReleaseSession(); if (ret != DCAMERA_OK) { - DHLOGI("DCameraSinkOutput UnInit release continue session failed, dhId: %s, ret: %d", + DCLOGI("DCameraSinkOutput UnInit release continue session failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); } sessionState_[CONTINUOUS_FRAME] = DCAMERA_CHANNEL_STATE_DISCONNECTED; @@ -126,7 +126,7 @@ int32_t DCameraSinkOutput::CloseChannel() int32_t ret = DCAMERA_OK; ret = iterSnap->second->ReleaseSession(); if (ret != DCAMERA_OK) { - DHLOGI("DCameraSinkOutput UnInit release snapshot session failed, dhId: %s, ret: %d", + DCLOGI("DCameraSinkOutput UnInit release snapshot session failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); } sessionState_[SNAPSHOT_FRAME] = DCAMERA_CHANNEL_STATE_DISCONNECTED; @@ -136,15 +136,15 @@ int32_t DCameraSinkOutput::CloseChannel() int32_t DCameraSinkOutput::StartCapture(std::vector>& captureInfos) { - DHLOGI("StartCapture dhId: %s", GetAnonyString(dhId_).c_str()); + DCLOGI("StartCapture dhId: %s", GetAnonyString(dhId_).c_str()); for (auto& info : captureInfos) { if (dataProcesses_.find(info->streamType_) == dataProcesses_.end()) { - DHLOGE("has no data process, streamType: %d", info->streamType_); + DCLOGE("has no data process, streamType: %d", info->streamType_); break; } int32_t ret = dataProcesses_[info->streamType_]->StartCapture(info); if (ret != DCAMERA_OK) { - DHLOGE("StartCapture failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DCLOGE("StartCapture failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); return ret; } } @@ -153,39 +153,39 @@ int32_t DCameraSinkOutput::StartCapture(std::vectorsecond->StopCapture(); if (ret != DCAMERA_OK) { - DHLOGE("continuous data process stop capture failed, dhId: %s, ret: %d", + DCLOGE("continuous data process stop capture failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); } } auto iterSnap = dataProcesses_.find(SNAPSHOT_FRAME); if (iterSnap != dataProcesses_.end()) { - DHLOGI("StopCapture %s snapshot frame stop capture", GetAnonyString(dhId_).c_str()); + DCLOGI("StopCapture %s snapshot frame stop capture", GetAnonyString(dhId_).c_str()); int32_t ret = iterSnap->second->StopCapture(); if (ret != DCAMERA_OK) { - DHLOGE("snapshot data process stop capture failed, dhId: %s, ret: %d", + DCLOGE("snapshot data process stop capture failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); } } - DHLOGI("StopCapture %s success", GetAnonyString(dhId_).c_str()); + DCLOGI("StopCapture %s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } void DCameraSinkOutput::OnVideoResult(std::shared_ptr& buffer) { if (sessionState_[CONTINUOUS_FRAME] != DCAMERA_CHANNEL_STATE_CONNECTED) { - DHLOGE("OnVideoResult dhId: %s, channel state: %d", + DCLOGE("OnVideoResult dhId: %s, channel state: %d", GetAnonyString(dhId_).c_str(), sessionState_[CONTINUOUS_FRAME]); return; } if (dataProcesses_.find(CONTINUOUS_FRAME) == dataProcesses_.end()) { - DHLOGE("OnVideoResult %s has no continuous data process", GetAnonyString(dhId_).c_str()); + DCLOGE("OnVideoResult %s has no continuous data process", GetAnonyString(dhId_).c_str()); return; } dataProcesses_[CONTINUOUS_FRAME]->FeedStream(buffer); @@ -194,7 +194,7 @@ void DCameraSinkOutput::OnVideoResult(std::shared_ptr& buffer) void DCameraSinkOutput::OnPhotoResult(std::shared_ptr& buffer) { if (dataProcesses_.find(SNAPSHOT_FRAME) == dataProcesses_.end()) { - DHLOGE("OnPhotoResult %s has no snapshot data process", GetAnonyString(dhId_).c_str()); + DCLOGE("OnPhotoResult %s has no snapshot data process", GetAnonyString(dhId_).c_str()); return; } dataProcesses_[SNAPSHOT_FRAME]->FeedStream(buffer); @@ -202,27 +202,27 @@ void DCameraSinkOutput::OnPhotoResult(std::shared_ptr& buffer) void DCameraSinkOutput::OnSessionState(DCStreamType type, int32_t state) { - DHLOGI("OnSessionState dhId: %s, stream type: %d, state: %d", + DCLOGI("OnSessionState dhId: %s, stream type: %d, state: %d", GetAnonyString(dhId_).c_str(), type, state); sessionState_[type] = state; switch (state) { case DCAMERA_CHANNEL_STATE_CONNECTING: { - DHLOGI("channel is connecting, dhId: %s, stream type: %d", + DCLOGI("channel is connecting, dhId: %s, stream type: %d", GetAnonyString(dhId_).c_str(), type); break; } case DCAMERA_CHANNEL_STATE_CONNECTED: { - DHLOGI("channel is connected, dhId: %s, stream type: %d", + DCLOGI("channel is connected, dhId: %s, stream type: %d", GetAnonyString(dhId_).c_str(), type); break; } case DCAMERA_CHANNEL_STATE_DISCONNECTED: { - DHLOGI("channel is disconnected, dhId: %s, stream type: %d", + DCLOGI("channel is disconnected, dhId: %s, stream type: %d", GetAnonyString(dhId_).c_str(), type); break; } default: { - DHLOGE("OnSessionState %s unknown session state", GetAnonyString(dhId_).c_str()); + DCLOGE("OnSessionState %s unknown session state", GetAnonyString(dhId_).c_str()); break; } } @@ -230,7 +230,7 @@ void DCameraSinkOutput::OnSessionState(DCStreamType type, int32_t state) void DCameraSinkOutput::OnSessionError(DCStreamType type, int32_t eventType, int32_t eventReason, std::string detail) { - DHLOGI("OnSessionError dhId: %s, stream type: %d, eventType: %d, eventReason: %d, detail: %s", + DCLOGI("OnSessionError dhId: %s, stream type: %d, eventType: %d, eventReason: %d, detail: %s", GetAnonyString(dhId_).c_str(), type, eventType, eventReason, detail.c_str()); } @@ -241,7 +241,7 @@ void DCameraSinkOutput::OnDataReceived(DCStreamType type, std::vectorGetProperty(propertyName, propertyCarrier); 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 e6ee40713dd7d41a35be3fc9c37fd8c752a69e6a..df07c72ecb1341cd792f7a6c9db46deeaca94620 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_service_ipc.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_service_ipc.cpp @@ -21,18 +21,18 @@ #include "anonymous_string.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { DCameraSinkServiceIpc::DCameraSinkServiceIpc() : isInit_(false) { - DHLOGI("DCameraSinkServiceIpc Create"); + DCLOGI("DCameraSinkServiceIpc Create"); } DCameraSinkServiceIpc::~DCameraSinkServiceIpc() { - DHLOGI("DCameraSinkServiceIpc Delete"); + DCLOGI("DCameraSinkServiceIpc Delete"); UnInit(); } @@ -41,35 +41,35 @@ IMPLEMENT_SINGLE_INSTANCE(DCameraSinkServiceIpc); void DCameraSinkServiceIpc::Init() { std::lock_guard autoLock(initCamSrvLock_); - DHLOGI("DCameraSinkServiceIpc Init Start"); + DCLOGI("DCameraSinkServiceIpc Init Start"); if (isInit_) { - DHLOGI("DCameraSinkServiceIpc has already init"); + DCLOGI("DCameraSinkServiceIpc has already init"); return; } sourceRemoteRecipient_ = new SourceRemoteRecipient(); isInit_ = true; - DHLOGI("DCameraSinkServiceIpc Init End"); + DCLOGI("DCameraSinkServiceIpc Init End"); } void DCameraSinkServiceIpc::UnInit() { std::lock_guard autoLock(initCamSrvLock_); - DHLOGI("DCameraSinkServiceIpc UnInit Start"); + DCLOGI("DCameraSinkServiceIpc UnInit Start"); if (!isInit_) { - DHLOGI("DCameraSinkServiceIpc has already UnInit"); + DCLOGI("DCameraSinkServiceIpc has already UnInit"); return; } ClearSourceRemoteCamSrv(); - DHLOGI("DCameraSinkServiceIpc Start free recipient"); + DCLOGI("DCameraSinkServiceIpc Start free recipient"); sourceRemoteRecipient_ = nullptr; isInit_ = false; - DHLOGI("DCameraSinkServiceIpc UnInit End"); + DCLOGI("DCameraSinkServiceIpc UnInit End"); } sptr DCameraSinkServiceIpc::GetSourceRemoteCamSrv(const std::string& deviceId) { if (deviceId.empty()) { - DHLOGE("GetSourceRemoteCamSrv deviceId is empty"); + DCLOGE("GetSourceRemoteCamSrv deviceId is empty"); return nullptr; } { @@ -78,28 +78,28 @@ sptr DCameraSinkServiceIpc::GetSourceRemoteCamSrv(cons if (iter != remoteSources_.end()) { auto object = iter->second; if (object != nullptr) { - DHLOGI("DCameraSinkServiceIpc GetSourceRemoteCamSrv from cache devId: %s", + DCLOGI("DCameraSinkServiceIpc GetSourceRemoteCamSrv from cache devId: %s", GetAnonyString(deviceId).c_str()); return object; } } } - DHLOGI("GetSourceRemoteCamSrv remote deviceid is %s", GetAnonyString(deviceId).c_str()); + DCLOGI("GetSourceRemoteCamSrv remote deviceid is %s", GetAnonyString(deviceId).c_str()); auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (samgr == nullptr) { - DHLOGE("GetSourceRemoteCamSrv failed to connect to systemAbilityMgr!"); + DCLOGE("GetSourceRemoteCamSrv failed to connect to systemAbilityMgr!"); return nullptr; } auto object = samgr->CheckSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, deviceId); if (object == nullptr) { - DHLOGE("GetSourceRemoteCamSrv failed get remote CamSrv %s", GetAnonyString(deviceId).c_str()); + DCLOGE("GetSourceRemoteCamSrv failed get remote CamSrv %s", GetAnonyString(deviceId).c_str()); return nullptr; } int32_t ret = object->AddDeathRecipient(sourceRemoteRecipient_); sptr remoteCamSrvObj = iface_cast(object); if (remoteCamSrvObj == nullptr) { - DHLOGI("GetSourceRemoteCamSrv failed, remoteCamSrvObj is null ret: %d", ret); + DCLOGI("GetSourceRemoteCamSrv failed, remoteCamSrvObj is null ret: %d", ret); return nullptr; } { @@ -110,17 +110,17 @@ sptr DCameraSinkServiceIpc::GetSourceRemoteCamSrv(cons } remoteSources_[deviceId] = remoteCamSrvObj; } - DHLOGI("GetSourceRemoteCamSrv success, AddDeathRecipient ret: %d", ret); + DCLOGI("GetSourceRemoteCamSrv success, AddDeathRecipient ret: %d", ret); return remoteCamSrvObj; } void DCameraSinkServiceIpc::DeleteSourceRemoteCamSrv(const std::string& deviceId) { - DHLOGI("DeleteSourceRemoteCamSrv devId: %s", GetAnonyString(deviceId).c_str()); + DCLOGI("DeleteSourceRemoteCamSrv devId: %s", GetAnonyString(deviceId).c_str()); std::lock_guard autoLock(sourceRemoteCamSrvLock_); auto item = remoteSources_.find(deviceId); if (item == remoteSources_.end()) { - DHLOGI("DeleteSourceRemoteCamSrv not found device: %s", GetAnonyString(deviceId).c_str()); + DCLOGI("DeleteSourceRemoteCamSrv not found device: %s", GetAnonyString(deviceId).c_str()); return; } @@ -132,7 +132,7 @@ void DCameraSinkServiceIpc::DeleteSourceRemoteCamSrv(const std::string& deviceId void DCameraSinkServiceIpc::ClearSourceRemoteCamSrv() { - DHLOGI("ClearSourceRemoteCamSrv Start"); + DCLOGI("ClearSourceRemoteCamSrv Start"); std::lock_guard autoLock(sourceRemoteCamSrvLock_); for (auto iter = remoteSources_.begin(); iter != remoteSources_.end(); iter++) { if (iter->second != nullptr) { @@ -140,22 +140,22 @@ void DCameraSinkServiceIpc::ClearSourceRemoteCamSrv() } } remoteSources_.clear(); - DHLOGI("ClearSourceRemoteCamSrv end"); + DCLOGI("ClearSourceRemoteCamSrv end"); } void DCameraSinkServiceIpc::SourceRemoteRecipient::OnRemoteDied(const wptr& remote) { - DHLOGI("SourceRemoteRecipient OnRemoteDied received died notify!"); + DCLOGI("SourceRemoteRecipient OnRemoteDied received died notify!"); DCameraSinkServiceIpc::GetInstance().OnSourceRemoteCamSrvDied(remote); } void DCameraSinkServiceIpc::OnSourceRemoteCamSrvDied(const wptr& remote) { - DHLOGI("OnSourceRemoteCamSrvDied delete diedRemoted"); + DCLOGI("OnSourceRemoteCamSrvDied delete diedRemoted"); std::lock_guard autoLock(sourceRemoteCamSrvLock_); sptr diedRemoted = remote.promote(); if (diedRemoted == nullptr) { - DHLOGE("OnSourceRemoteCamSrvDied promote failed!"); + DCLOGE("OnSourceRemoteCamSrvDied promote failed!"); return; } auto iter = std::find_if(remoteSources_.begin(), remoteSources_.end(), [&]( @@ -163,10 +163,10 @@ void DCameraSinkServiceIpc::OnSourceRemoteCamSrvDied(const wptr& return item.second->AsObject() == diedRemoted; }); if (iter == remoteSources_.end()) { - DHLOGI("OnSourceRemoteCamSrvDied not found remote object"); + DCLOGI("OnSourceRemoteCamSrvDied not found remote object"); return; } - DHLOGI("OnSourceRemoteCamSrvDied remote.devId: %s", GetAnonyString(iter->first).c_str()); + DCLOGI("OnSourceRemoteCamSrvDied remote.devId: %s", GetAnonyString(iter->first).c_str()); if (iter->second != nullptr) { iter->second->AsObject()->RemoveDeathRecipient(sourceRemoteRecipient_); } diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/listener/dcamera_sink_controller_channel_listener.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/listener/dcamera_sink_controller_channel_listener.cpp index 4203ca5321148eb86d0bd66534d15b3619fc58be..c3f0133a98a115d9c515888c7a22d17b39c21b08 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/listener/dcamera_sink_controller_channel_listener.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/listener/dcamera_sink_controller_channel_listener.cpp @@ -15,7 +15,7 @@ #include "dcamera_sink_controller_channel_listener.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -28,7 +28,7 @@ void DCameraSinkControllerChannelListener::OnSessionState(int32_t state) { std::shared_ptr controller = controller_.lock(); if (controller == nullptr) { - DHLOGE("DCameraSinkControllerChannelListener::OnSessionState controller is null"); + DCLOGE("DCameraSinkControllerChannelListener::OnSessionState controller is null"); return; } controller->OnSessionState(state); @@ -38,7 +38,7 @@ void DCameraSinkControllerChannelListener::OnSessionError(int32_t eventType, int { std::shared_ptr controller = controller_.lock(); if (controller == nullptr) { - DHLOGE("DCameraSinkControllerChannelListener::OnSessionError controller is null"); + DCLOGE("DCameraSinkControllerChannelListener::OnSessionError controller is null"); return; } controller->OnSessionError(eventType, eventReason, detail); @@ -48,7 +48,7 @@ void DCameraSinkControllerChannelListener::OnDataReceived(std::vector controller = controller_.lock(); if (controller == nullptr) { - DHLOGE("DCameraSinkControllerChannelListener::OnReceivedData controller is null"); + DCLOGE("DCameraSinkControllerChannelListener::OnReceivedData controller is null"); return; } controller->OnDataReceived(buffers); diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/listener/dcamera_sink_data_process_listener.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/listener/dcamera_sink_data_process_listener.cpp index 1944688cc1fd33650a7fa94e1d92260a2c340e50..01061c4c1dbb31ca239dc50240da5718df18d8c5 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/listener/dcamera_sink_data_process_listener.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/listener/dcamera_sink_data_process_listener.cpp @@ -15,7 +15,7 @@ #include "dcamera_sink_data_process_listener.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -28,7 +28,7 @@ void DCameraSinkDataProcessListener::OnProcessedVideoBuffer(const std::shared_pt { std::shared_ptr dataProcess = dataProcess_.lock(); if (dataProcess == nullptr) { - DHLOGE("DCameraSinkDataProcessListener::OnProcessedVideoBuffer dataProcess is null"); + DCLOGE("DCameraSinkDataProcessListener::OnProcessedVideoBuffer dataProcess is null"); return; } dataProcess->OnProcessedVideoBuffer(videoResult); @@ -38,7 +38,7 @@ void DCameraSinkDataProcessListener::OnError(DataProcessErrorType errorType) { std::shared_ptr dataProcess = dataProcess_.lock(); if (dataProcess == nullptr) { - DHLOGE("DCameraSinkDataProcessListener::OnError dataProcess is null"); + DCLOGE("DCameraSinkDataProcessListener::OnError dataProcess is null"); return; } dataProcess->OnError(errorType); diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/listener/dcamera_sink_output_channel_listener.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/listener/dcamera_sink_output_channel_listener.cpp index d2649c20b078a72e813b0ba29b358f77f2de95b9..fa3f1b5eaa1383d86eb038a9f89931e45b440dfd 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/listener/dcamera_sink_output_channel_listener.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/listener/dcamera_sink_output_channel_listener.cpp @@ -15,7 +15,7 @@ #include "dcamera_sink_output_channel_listener.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -28,7 +28,7 @@ void DCameraSinkOutputChannelListener::OnSessionState(int32_t state) { std::shared_ptr output = output_.lock(); if (output == nullptr) { - DHLOGE("DCameraSinkOutputChannelListener::OnSessionState output is null"); + DCLOGE("DCameraSinkOutputChannelListener::OnSessionState output is null"); return; } output->OnSessionState(streamType_, state); @@ -38,7 +38,7 @@ void DCameraSinkOutputChannelListener::OnSessionError(int32_t eventType, int32_t { std::shared_ptr output = output_.lock(); if (output == nullptr) { - DHLOGE("DCameraSinkOutputChannelListener::OnSessionError output is null"); + DCLOGE("DCameraSinkOutputChannelListener::OnSessionError output is null"); return; } output->OnSessionError(streamType_, eventType, eventReason, detail); @@ -48,7 +48,7 @@ void DCameraSinkOutputChannelListener::OnDataReceived(std::vector output = output_.lock(); if (output == nullptr) { - DHLOGE("DCameraSinkOutputChannelListener::OnReceivedData output is null"); + DCLOGE("DCameraSinkOutputChannelListener::OnReceivedData output is null"); return; } output->OnDataReceived(streamType_, buffers); diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn index 7ba21cc673f1eb3843bebc4478cce485bff0bca5..7e6bde11bd38d27ca3d386de12f7865d00b37675 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn @@ -83,7 +83,7 @@ ohos_unittest("DistributedCameraSinkServiceTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DCameraSinkServiceTest\"", + "DC_LOG_TAG=\"DCameraSinkServiceTest\"", "LOG_DOMAIN=0xD004100", ] } diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/dcamera_sink_hidumper_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/dcamera_sink_hidumper_test.cpp index 2494ceaa914afcc28de7b37ee76dcfe2e50caffa..6b0773fa0c203a419fd34a53fc806faeb852d72e 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/dcamera_sink_hidumper_test.cpp +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/dcamera_sink_hidumper_test.cpp @@ -16,7 +16,7 @@ #include #include "dcamera_sink_hidumper.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" using namespace testing::ext; @@ -32,22 +32,22 @@ public: void DcameraSinkHidumperTest::SetUpTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DcameraSinkHidumperTest::TearDownTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DcameraSinkHidumperTest::SetUp(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DcameraSinkHidumperTest::TearDown(void) { - DHLOGI("enter"); + DCLOGI("enter"); } /** @@ -58,7 +58,7 @@ void DcameraSinkHidumperTest::TearDown(void) */ HWTEST_F(DcameraSinkHidumperTest, dcamera_sink_hidumper_test_001, TestSize.Level1) { - DHLOGI("dcamera_sink_hidumper_test_001"); + DCLOGI("dcamera_sink_hidumper_test_001"); std::vector args; std::string result; bool ret = DcameraSinkHidumper::GetInstance().Dump(args, result); @@ -73,7 +73,7 @@ HWTEST_F(DcameraSinkHidumperTest, dcamera_sink_hidumper_test_001, TestSize.Level */ HWTEST_F(DcameraSinkHidumperTest, dcamera_sink_hidumper_test_002, TestSize.Level1) { - DHLOGI("dcamera_sink_hidumper_test_002"); + DCLOGI("dcamera_sink_hidumper_test_002"); std::vector args; std::string str1 = "--version"; std::string str2 = "--camNum"; @@ -92,7 +92,7 @@ HWTEST_F(DcameraSinkHidumperTest, dcamera_sink_hidumper_test_002, TestSize.Level */ HWTEST_F(DcameraSinkHidumperTest, dcamera_sink_hidumper_test_003, TestSize.Level1) { - DHLOGI("dcamera_sink_hidumper_test_003"); + DCLOGI("dcamera_sink_hidumper_test_003"); std::vector args; std::string str1 = "--version"; args.push_back(str1); @@ -109,7 +109,7 @@ HWTEST_F(DcameraSinkHidumperTest, dcamera_sink_hidumper_test_003, TestSize.Level */ HWTEST_F(DcameraSinkHidumperTest, dcamera_sink_hidumper_test_004, TestSize.Level1) { - DHLOGI("dcamera_sink_hidumper_test_004"); + DCLOGI("dcamera_sink_hidumper_test_004"); std::vector args; std::string str1 = "--camNum"; args.push_back(str1); @@ -126,7 +126,7 @@ HWTEST_F(DcameraSinkHidumperTest, dcamera_sink_hidumper_test_004, TestSize.Level */ HWTEST_F(DcameraSinkHidumperTest, dcamera_sink_hidumper_test_005, TestSize.Level1) { - DHLOGI("dcamera_sink_hidumper_test_005"); + DCLOGI("dcamera_sink_hidumper_test_005"); std::vector args; std::string str1 = "--opened"; args.push_back(str1); @@ -143,7 +143,7 @@ HWTEST_F(DcameraSinkHidumperTest, dcamera_sink_hidumper_test_005, TestSize.Level */ HWTEST_F(DcameraSinkHidumperTest, dcamera_sink_hidumper_test_006, TestSize.Level1) { - DHLOGI("dcamera_sink_hidumper_test_006"); + DCLOGI("dcamera_sink_hidumper_test_006"); std::vector args; std::string str1 = "-h"; args.push_back(str1); @@ -160,7 +160,7 @@ HWTEST_F(DcameraSinkHidumperTest, dcamera_sink_hidumper_test_006, TestSize.Level */ HWTEST_F(DcameraSinkHidumperTest, dcamera_sink_hidumper_test_007, TestSize.Level1) { - DHLOGI("dcamera_sink_hidumper_test_007"); + DCLOGI("dcamera_sink_hidumper_test_007"); std::vector args; std::string str1 = "-help"; args.push_back(str1); diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_service_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_service_test.cpp index 38c28aa8e9ae6834278dbc7b2727b629c6597f38..012bdbd76590bf54d6c8fee711703be51bf18f9f 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_service_test.cpp +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_service_test.cpp @@ -20,7 +20,7 @@ #include "distributed_camera_sink_service.h" #undef private #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "idistributed_camera_sink.h" using namespace testing::ext; @@ -56,17 +56,17 @@ std::string g_testOpenInfoService = R"({ void DistributedCameraSinkServiceTest::SetUpTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DistributedCameraSinkServiceTest::TearDownTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DistributedCameraSinkServiceTest::SetUp(void) { - DHLOGI("enter"); + DCLOGI("enter"); sinkService_ = std::make_shared(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, true); DCameraHandler::GetInstance().Initialize(); g_dhId = DCameraHandler::GetInstance().GetCameras().front(); @@ -74,7 +74,7 @@ void DistributedCameraSinkServiceTest::SetUp(void) void DistributedCameraSinkServiceTest::TearDown(void) { - DHLOGI("enter"); + DCLOGI("enter"); sinkService_ = nullptr; } @@ -86,7 +86,7 @@ void DistributedCameraSinkServiceTest::TearDown(void) */ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_001, TestSize.Level1) { - DHLOGI("dcamera_sink_service_test_001"); + DCLOGI("dcamera_sink_service_test_001"); EXPECT_EQ(sinkService_ == nullptr, false); int32_t ret = sinkService_->InitSink(g_testParams); @@ -107,7 +107,7 @@ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_001, TestSi */ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_002, TestSize.Level1) { - DHLOGI("dcamera_sink_service_test_002"); + DCLOGI("dcamera_sink_service_test_002"); EXPECT_EQ(sinkService_ == nullptr, false); int32_t ret = sinkService_->InitSink(g_testParams); @@ -128,7 +128,7 @@ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_002, TestSi */ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_003, TestSize.Level1) { - DHLOGI("dcamera_sink_service_test_003"); + DCLOGI("dcamera_sink_service_test_003"); EXPECT_EQ(sinkService_ == nullptr, false); int32_t ret = sinkService_->InitSink(g_testParams); @@ -149,7 +149,7 @@ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_003, TestSi */ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_004, TestSize.Level1) { - DHLOGI("dcamera_sink_service_test_004"); + DCLOGI("dcamera_sink_service_test_004"); EXPECT_EQ(sinkService_ == nullptr, false); int32_t ret = sinkService_->InitSink(g_testParams); @@ -170,7 +170,7 @@ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_004, TestSi */ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_005, TestSize.Level1) { - DHLOGI("dcamera_sink_service_test_005"); + DCLOGI("dcamera_sink_service_test_005"); EXPECT_EQ(sinkService_ == nullptr, false); int32_t ret = sinkService_->InitSink(g_testParams); @@ -191,7 +191,7 @@ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_005, TestSi */ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_006, TestSize.Level1) { - DHLOGI("dcamera_sink_service_test_006"); + DCLOGI("dcamera_sink_service_test_006"); EXPECT_EQ(sinkService_ == nullptr, false); int32_t ret = sinkService_->InitSink(g_testParams); @@ -218,7 +218,7 @@ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_006, TestSi */ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_007, TestSize.Level1) { - DHLOGI("dcamera_sink_service_test_007"); + DCLOGI("dcamera_sink_service_test_007"); EXPECT_EQ(sinkService_ == nullptr, false); int32_t fd = 1; @@ -236,7 +236,7 @@ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_007, TestSi */ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_008, TestSize.Level1) { - DHLOGI("dcamera_sink_service_test_008"); + DCLOGI("dcamera_sink_service_test_008"); EXPECT_EQ(sinkService_ == nullptr, false); int32_t ret = sinkService_->InitSink(g_testParams); @@ -257,7 +257,7 @@ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_008, TestSi */ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_009, TestSize.Level1) { - DHLOGI("dcamera_sink_service_test_009"); + DCLOGI("dcamera_sink_service_test_009"); EXPECT_EQ(sinkService_ == nullptr, false); int32_t ret = sinkService_->InitSink(g_testParams); @@ -277,7 +277,7 @@ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_009, TestSi */ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_010, TestSize.Level1) { - DHLOGI("dcamera_sink_service_test_010"); + DCLOGI("dcamera_sink_service_test_010"); EXPECT_EQ(sinkService_ == nullptr, false); int32_t ret = sinkService_->InitSink(g_testParams); @@ -297,7 +297,7 @@ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_010, TestSi */ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_011, TestSize.Level1) { - DHLOGI("dcamera_sink_service_test_011"); + DCLOGI("dcamera_sink_service_test_011"); EXPECT_EQ(sinkService_ == nullptr, false); int32_t ret = sinkService_->InitSink(g_testParams); @@ -317,7 +317,7 @@ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_011, TestSi */ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_012, TestSize.Level1) { - DHLOGI("dcamera_sink_service_test_012"); + DCLOGI("dcamera_sink_service_test_012"); EXPECT_EQ(sinkService_ == nullptr, false); int32_t ret = sinkService_->InitSink(g_testParams); @@ -340,7 +340,7 @@ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_012, TestSi */ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_013, TestSize.Level1) { - DHLOGI("dcamera_sink_service_test_013"); + DCLOGI("dcamera_sink_service_test_013"); EXPECT_EQ(sinkService_ == nullptr, false); int32_t fd = 1; @@ -358,7 +358,7 @@ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_013, TestSi */ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_014, TestSize.Level1) { - DHLOGI("dcamera_sink_service_test_014"); + DCLOGI("dcamera_sink_service_test_014"); EXPECT_EQ(sinkService_ == nullptr, false); int32_t ret = sinkService_->InitSink(g_testParams); diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_stub_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_stub_test.cpp index 587473305025ab12120a7fc735e54f845ba85a6a..9935138214ae4f4391b97b23962ff5225c55584b 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_stub_test.cpp +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_stub_test.cpp @@ -17,7 +17,7 @@ #include "distributed_camera_sink_proxy.h" #include "distributed_camera_sink_stub.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "mock_distributed_camera_sink_stub.h" using namespace testing::ext; @@ -34,22 +34,22 @@ public: void DcameraSinkStubTest::SetUpTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DcameraSinkStubTest::TearDownTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DcameraSinkStubTest::SetUp(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DcameraSinkStubTest::TearDown(void) { - DHLOGI("enter"); + DCLOGI("enter"); } /** @@ -60,7 +60,7 @@ void DcameraSinkStubTest::TearDown(void) */ HWTEST_F(DcameraSinkStubTest, dcamera_sink_stub_test_001, TestSize.Level1) { - DHLOGI("dcamera_sink_stub_test_001"); + DCLOGI("dcamera_sink_stub_test_001"); sptr sinkStubPtr(new MockDistributedCameraSinkStub()); DistributedCameraSinkProxy sinkProxy(sinkStubPtr); std::string params = "params000"; @@ -76,7 +76,7 @@ HWTEST_F(DcameraSinkStubTest, dcamera_sink_stub_test_001, TestSize.Level1) */ HWTEST_F(DcameraSinkStubTest, dcamera_sink_stub_test_002, TestSize.Level1) { - DHLOGI("dcamera_sink_stub_test_002"); + DCLOGI("dcamera_sink_stub_test_002"); sptr sinkStubPtr(new MockDistributedCameraSinkStub()); DistributedCameraSinkProxy sinkProxy(sinkStubPtr); int32_t ret = sinkProxy.ReleaseSink(); @@ -91,7 +91,7 @@ HWTEST_F(DcameraSinkStubTest, dcamera_sink_stub_test_002, TestSize.Level1) */ HWTEST_F(DcameraSinkStubTest, dcamera_sink_stub_test_003, TestSize.Level1) { - DHLOGI("dcamera_sink_stub_test_003"); + DCLOGI("dcamera_sink_stub_test_003"); sptr sinkStubPtr(new MockDistributedCameraSinkStub()); DistributedCameraSinkProxy sinkProxy(sinkStubPtr); std::string dhId = "dhId000"; @@ -108,7 +108,7 @@ HWTEST_F(DcameraSinkStubTest, dcamera_sink_stub_test_003, TestSize.Level1) */ HWTEST_F(DcameraSinkStubTest, dcamera_sink_stub_test_004, TestSize.Level1) { - DHLOGI("dcamera_sink_stub_test_004"); + DCLOGI("dcamera_sink_stub_test_004"); sptr sinkStubPtr(new MockDistributedCameraSinkStub()); DistributedCameraSinkProxy sinkProxy(sinkStubPtr); std::string dhId = "dhId000"; @@ -124,7 +124,7 @@ HWTEST_F(DcameraSinkStubTest, dcamera_sink_stub_test_004, TestSize.Level1) */ HWTEST_F(DcameraSinkStubTest, dcamera_sink_stub_test_005, TestSize.Level1) { - DHLOGI("dcamera_sink_stub_test_005"); + DCLOGI("dcamera_sink_stub_test_005"); sptr sinkStubPtr(new MockDistributedCameraSinkStub()); DistributedCameraSinkProxy sinkProxy(sinkStubPtr); std::string dhId = "dhId000"; @@ -140,7 +140,7 @@ HWTEST_F(DcameraSinkStubTest, dcamera_sink_stub_test_005, TestSize.Level1) */ HWTEST_F(DcameraSinkStubTest, dcamera_sink_stub_test_006, TestSize.Level1) { - DHLOGI("dcamera_sink_stub_test_006"); + DCLOGI("dcamera_sink_stub_test_006"); sptr sinkStubPtr(new MockDistributedCameraSinkStub()); DistributedCameraSinkProxy sinkProxy(sinkStubPtr); std::string dhId = "dhId000"; @@ -157,7 +157,7 @@ HWTEST_F(DcameraSinkStubTest, dcamera_sink_stub_test_006, TestSize.Level1) */ HWTEST_F(DcameraSinkStubTest, dcamera_sink_stub_test_007, TestSize.Level1) { - DHLOGI("dcamera_sink_stub_test_007"); + DCLOGI("dcamera_sink_stub_test_007"); sptr sinkStubPtr(new MockDistributedCameraSinkStub()); DistributedCameraSinkProxy sinkProxy(sinkStubPtr); std::string dhId = "dhId000"; @@ -174,7 +174,7 @@ HWTEST_F(DcameraSinkStubTest, dcamera_sink_stub_test_007, TestSize.Level1) */ HWTEST_F(DcameraSinkStubTest, dcamera_sink_stub_test_008, TestSize.Level1) { - DHLOGI("dcamera_sink_stub_test_008"); + DCLOGI("dcamera_sink_stub_test_008"); sptr sinkStubPtr(new MockDistributedCameraSinkStub()); DistributedCameraSinkProxy sinkProxy(sinkStubPtr); std::string dhId = "dhId000"; @@ -191,7 +191,7 @@ HWTEST_F(DcameraSinkStubTest, dcamera_sink_stub_test_008, TestSize.Level1) */ HWTEST_F(DcameraSinkStubTest, dcamera_sink_stub_test_009, TestSize.Level1) { - DHLOGI("dcamera_sink_stub_test_009"); + DCLOGI("dcamera_sink_stub_test_009"); sptr sinkStubPtr(new MockDistributedCameraSinkStub()); DistributedCameraSinkProxy sinkProxy(sinkStubPtr); std::string dhId = "dhId000"; diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn index 91df5cd146bddd64c4e986c315f91d9e684c7df5..9292a0a936d02cd35212f3cb1c6d88c0c8620cbe 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -96,7 +96,7 @@ ohos_unittest("DCameraSinkMgrTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DCameraSinkMgrTest\"", + "DC_LOG_TAG=\"DCameraSinkMgrTest\"", "LOG_DOMAIN=0xD004100", ] } diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_controller_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_controller_test.cpp index 7f0681cb5e1efe3d5dfc4a9a7e03045fa648a43a..aa267bbbd9a1ebae319137beaaee08fa68adab4d 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_controller_test.cpp +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_controller_test.cpp @@ -32,7 +32,7 @@ #include "dcamera_sink_dev.h" #include "dcamera_utils_tools.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" using namespace testing::ext; diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_dev_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_dev_test.cpp index 34b9d34eabb8c9e55b8baa3c22a50ce41101dd3e..5ff190d6b84ac864fea74cb51472ad97ba786841 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_dev_test.cpp +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_dev_test.cpp @@ -17,7 +17,7 @@ #include #include "anonymous_string.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #define private public #include "dcamera_sink_access_control.h" @@ -142,7 +142,7 @@ HWTEST_F(DCameraSinkDevTest, dcamera_sink_dev_test_004, TestSize.Level1) { int32_t ret = dev_->GetCameraInfo(g_testCameraInfo); EXPECT_EQ(DCAMERA_OK, ret); - DHLOGI("DCameraSinkDevTest::GetCameraInfo cameraInfo is %s", GetAnonyString(g_testCameraInfo).c_str()); + DCLOGI("DCameraSinkDevTest::GetCameraInfo cameraInfo is %s", GetAnonyString(g_testCameraInfo).c_str()); } /** diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_service_ipc_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_service_ipc_test.cpp index 8b6c631338641afeeb08fd9492ba260dd26213aa..d7c56b77fe19d48bd4090551f28cc467a55e6e07 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_service_ipc_test.cpp +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_service_ipc_test.cpp @@ -18,7 +18,7 @@ #define private public #include "dcamera_sink_service_ipc.h" #undef private -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" using namespace testing::ext; @@ -34,22 +34,22 @@ public: void DCameraSinkServiceIpcTest::SetUpTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraSinkServiceIpcTest::TearDownTestCase(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraSinkServiceIpcTest::SetUp(void) { - DHLOGI("enter"); + DCLOGI("enter"); } void DCameraSinkServiceIpcTest::TearDown(void) { - DHLOGI("enter"); + DCLOGI("enter"); } /** @@ -60,7 +60,7 @@ void DCameraSinkServiceIpcTest::TearDown(void) */ HWTEST_F(DCameraSinkServiceIpcTest, dcamera_sink_service_ipc_test_001, TestSize.Level1) { - DHLOGI("dcamera_sink_service_ipc_test_001"); + DCLOGI("dcamera_sink_service_ipc_test_001"); DCameraSinkServiceIpc::GetInstance().UnInit(); DCameraSinkServiceIpc::GetInstance().Init(); DCameraSinkServiceIpc::GetInstance().UnInit(); @@ -78,7 +78,7 @@ HWTEST_F(DCameraSinkServiceIpcTest, dcamera_sink_service_ipc_test_001, TestSize. */ HWTEST_F(DCameraSinkServiceIpcTest, dcamera_sink_service_ipc_test_002, TestSize.Level1) { - DHLOGI("dcamera_sink_service_ipc_test_002"); + DCLOGI("dcamera_sink_service_ipc_test_002"); std::string devId = ""; sptr sourceSA = DCameraSinkServiceIpc::GetInstance().GetSourceRemoteCamSrv(devId); EXPECT_EQ(nullptr, sourceSA); diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/eventbus/dcamera_frame_trigger_event_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/eventbus/dcamera_frame_trigger_event_test.cpp index 4e0453bad1bec1636b8f64f2645b1322cda761fb..98ebe830fc873581ed490f61257b95e2e06264ba 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/eventbus/dcamera_frame_trigger_event_test.cpp +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/eventbus/dcamera_frame_trigger_event_test.cpp @@ -16,7 +16,7 @@ #include #include "dcamera_frame_trigger_event.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" using namespace testing::ext; @@ -36,24 +36,24 @@ public: void DCameraFrameTriggerEventTest::SetUpTestCase(void) { - DHLOGI("DCameraFrameTriggerEventTest SetUpTestCase"); + DCLOGI("DCameraFrameTriggerEventTest SetUpTestCase"); } void DCameraFrameTriggerEventTest::TearDownTestCase(void) { - DHLOGI("DCameraFrameTriggerEventTest TearDownTestCase"); + DCLOGI("DCameraFrameTriggerEventTest TearDownTestCase"); } void DCameraFrameTriggerEventTest::SetUp(void) { - DHLOGI("DCameraFrameTriggerEventTest SetUp"); + DCLOGI("DCameraFrameTriggerEventTest SetUp"); testsender_ = std::make_shared(); testDCameraFrameTriggerEvent_ = std::make_shared(*testsender_, TEST_PARAM); } void DCameraFrameTriggerEventTest::TearDown(void) { - DHLOGI("DCameraFrameTriggerEventTest SetUp"); + DCLOGI("DCameraFrameTriggerEventTest SetUp"); testsender_ = nullptr; testDCameraFrameTriggerEvent_ = nullptr; } diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/eventbus/dcamera_photo_output_event_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/eventbus/dcamera_photo_output_event_test.cpp index 4777134f93273163c70cc584077f385a29159269..858566c1fbe48411b097e840e6c111750ba8281d 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/eventbus/dcamera_photo_output_event_test.cpp +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/eventbus/dcamera_photo_output_event_test.cpp @@ -17,7 +17,7 @@ #include "dcamera_photo_output_event.h" #include "data_buffer.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" using namespace testing::ext; @@ -41,17 +41,17 @@ namespace { void DCameraPhotoOutputEventTest::SetUpTestCase(void) { - DHLOGI("DCameraPhotoOutputEventTest SetUpTestCase"); + DCLOGI("DCameraPhotoOutputEventTest SetUpTestCase"); } void DCameraPhotoOutputEventTest::TearDownTestCase(void) { - DHLOGI("DCameraPhotoOutputEventTest TearDownTestCase"); + DCLOGI("DCameraPhotoOutputEventTest TearDownTestCase"); } void DCameraPhotoOutputEventTest::SetUp(void) { - DHLOGI("DCameraPhotoOutputEventTest SetUp"); + DCLOGI("DCameraPhotoOutputEventTest SetUp"); dataBuffer_ = std::make_shared(TEST_CAPACITY); testsender_ = std::make_shared(); testDCameraPhotoOutputEvent_ = std::make_shared(*testsender_, dataBuffer_); @@ -59,7 +59,7 @@ void DCameraPhotoOutputEventTest::SetUp(void) void DCameraPhotoOutputEventTest::TearDown(void) { - DHLOGI("DCameraPhotoOutputEventTest SetUp"); + DCLOGI("DCameraPhotoOutputEventTest SetUp"); testsender_ = nullptr; testDCameraPhotoOutputEvent_ = nullptr; } diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/eventbus/dcamera_post_authorization_event_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/eventbus/dcamera_post_authorization_event_test.cpp index 1b789e25e3dc971029a2fa5c128140c17296c297..11f708968d1ecfa66207e01afe2d3625e27a4798 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/eventbus/dcamera_post_authorization_event_test.cpp +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/eventbus/dcamera_post_authorization_event_test.cpp @@ -17,7 +17,7 @@ #include "dcamera_post_authorization_event.h" #include "dcamera_capture_info_cmd.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" using namespace testing::ext; @@ -44,17 +44,17 @@ namespace { void DCameraPostAuthorizationEventTest::SetUpTestCase(void) { - DHLOGI("DCameraPostAuthorizationEventTest SetUpTestCase"); + DCLOGI("DCameraPostAuthorizationEventTest SetUpTestCase"); } void DCameraPostAuthorizationEventTest::TearDownTestCase(void) { - DHLOGI("DCameraPostAuthorizationEventTest TearDownTestCase"); + DCLOGI("DCameraPostAuthorizationEventTest TearDownTestCase"); } void DCameraPostAuthorizationEventTest::SetUp(void) { - DHLOGI("DCameraPostAuthorizationEventTest SetUp"); + DCLOGI("DCameraPostAuthorizationEventTest SetUp"); videoInfo = std::make_shared(); videoInfo->width_ = TEST_WIDTH; videoInfo->height_ = TEST_HEIGHT; @@ -68,7 +68,7 @@ void DCameraPostAuthorizationEventTest::SetUp(void) void DCameraPostAuthorizationEventTest::TearDown(void) { - DHLOGI("DCameraPostAuthorizationEventTest SetUp"); + DCLOGI("DCameraPostAuthorizationEventTest SetUp"); testsender_ = nullptr; testDCameraPostAuthorizationEvent_ = nullptr; } diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/eventbus/dcamera_video_output_event_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/eventbus/dcamera_video_output_event_test.cpp index 29be3e2414ff8b6bbcef4416f64783c3f21ed122..3ee6349d942328981861f2543bc011bb4ac02470 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/eventbus/dcamera_video_output_event_test.cpp +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/eventbus/dcamera_video_output_event_test.cpp @@ -17,7 +17,7 @@ #include "dcamera_video_output_event.h" #include "data_buffer.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" using namespace testing::ext; @@ -41,17 +41,17 @@ namespace { void DCameraVideoOutputEventTest::SetUpTestCase(void) { - DHLOGI("DCameraVideoOutputEventTest SetUpTestCase"); + DCLOGI("DCameraVideoOutputEventTest SetUpTestCase"); } void DCameraVideoOutputEventTest::TearDownTestCase(void) { - DHLOGI("DCameraVideoOutputEventTest TearDownTestCase"); + DCLOGI("DCameraVideoOutputEventTest TearDownTestCase"); } void DCameraVideoOutputEventTest::SetUp(void) { - DHLOGI("DCameraVideoOutputEventTest SetUp"); + DCLOGI("DCameraVideoOutputEventTest SetUp"); dataBuffer_ = std::make_shared(TEST_CAPACITY); testsender_ = std::make_shared(); testDCameraVideoOutputEvent_ = std::make_shared(*testsender_, dataBuffer_); @@ -59,7 +59,7 @@ void DCameraVideoOutputEventTest::SetUp(void) void DCameraVideoOutputEventTest::TearDown(void) { - DHLOGI("DCameraVideoOutputEventTest SetUp"); + DCLOGI("DCameraVideoOutputEventTest SetUp"); testsender_ = nullptr; testDCameraVideoOutputEvent_ = nullptr; } diff --git a/services/cameraservice/sourceservice/BUILD.gn b/services/cameraservice/sourceservice/BUILD.gn index 6f0c82e50334e0ba659b3e589beeb43fef9a632a..c733d7bb586dfaf0adc4a09516428b9bc4db5ead 100644 --- a/services/cameraservice/sourceservice/BUILD.gn +++ b/services/cameraservice/sourceservice/BUILD.gn @@ -29,8 +29,10 @@ ohos_shared_library("distributed_camera_source") { stack_protector_ret = true include_dirs = [ "${av_transport_path}/common/include", + "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/eventbus", + "${fwk_utils_path}/include/log", "//third_party/cJSON", "//third_party/jsoncpp/include", ] @@ -61,6 +63,8 @@ ohos_shared_library("distributed_camera_source") { "${graphicstandard_path}/frameworks/surface/include", "${fwk_common_path}/utils/include", "${fwk_innerkits_path}/include", + "${fwk_common_path}/log/include", + "${fwk_utils_path}/include/log", ] sources = [ @@ -113,12 +117,13 @@ ohos_shared_library("distributed_camera_source") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"dcamerasourcesvr\"", + "DC_LOG_TAG=\"dcamerasourcesvr\"", "LOG_DOMAIN=0xD004100", ] external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "eventhandler:libeventhandler", "graphic_2d:surface", 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 58898249253932c5e83a48054de811d95329bfb5..4a3eba28a7d5c3086e47eda8d2cd30db69dfb912 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_service_state_listener.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_service_state_listener.cpp @@ -21,25 +21,25 @@ #include "dcamera_index.h" #include "distributed_camera_errno.h" #include "distributed_camera_source_service.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include namespace OHOS { namespace DistributedHardware { DCameraServiceStateListener::DCameraServiceStateListener() { - DHLOGI("DCameraServiceStateListener Create"); + DCLOGI("DCameraServiceStateListener Create"); } DCameraServiceStateListener::~DCameraServiceStateListener() { - DHLOGI("DCameraServiceStateListener Delete"); + DCLOGI("DCameraServiceStateListener Delete"); callbackProxy_ = nullptr; } void DCameraServiceStateListener::SetCallback(sptr callback) { - DHLOGI("enter"); + DCLOGI("enter"); std::lock_guard autoLock(proxyMutex_); callbackProxy_ = callback; } @@ -47,33 +47,33 @@ void DCameraServiceStateListener::SetCallback(sptr callb int32_t DCameraServiceStateListener::OnRegisterNotify(const std::string& devId, const std::string& dhId, const std::string& reqId, int32_t status, std::string& data) { - DHLOGI("OnRegisterNotify devId: %s, dhId: %s, status: %d", + DCLOGI("OnRegisterNotify devId: %s, dhId: %s, status: %d", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), status); std::lock_guard autoLock(proxyMutex_); if (status != DCAMERA_OK) { std::thread([=]() mutable { - DHLOGI("thread delete devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); + DCLOGI("thread delete devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); prctl(PR_SET_NAME, REGISTER_SERVICE_NOTIFY.c_str()); DCameraIndex camIndex(devId, dhId); DistributedCameraSourceService::CamDevErase(camIndex); if (callbackProxy_ == nullptr) { - DHLOGE("callbackProxy_ is nullptr"); + DCLOGE("callbackProxy_ is nullptr"); return; } int32_t ret = callbackProxy_->OnNotifyRegResult(devId, dhId, reqId, status, data); if (ret != DCAMERA_OK) { - DHLOGE("OnNotifyRegResult failed: %d", ret); + DCLOGE("OnNotifyRegResult failed: %d", ret); } }).detach(); } else { if (callbackProxy_ == nullptr) { - DHLOGE("callbackProxy_ is nullptr"); + DCLOGE("callbackProxy_ is nullptr"); return DCAMERA_BAD_VALUE; } int32_t ret = callbackProxy_->OnNotifyRegResult(devId, dhId, reqId, status, data); if (ret != DCAMERA_OK) { - DHLOGE("OnNotifyRegResult failed: %d", ret); + DCLOGE("OnNotifyRegResult failed: %d", ret); } } return DCAMERA_OK; @@ -82,30 +82,30 @@ int32_t DCameraServiceStateListener::OnRegisterNotify(const std::string& devId, int32_t DCameraServiceStateListener::OnUnregisterNotify(const std::string& devId, const std::string& dhId, const std::string& reqId, int32_t status, std::string& data) { - DHLOGI("OnUnregisterNotify devId: %s, dhId: %s, status: %d", + DCLOGI("OnUnregisterNotify devId: %s, dhId: %s, status: %d", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), status); std::lock_guard autoLock(proxyMutex_); if (callbackProxy_ == nullptr) { - DHLOGE("callbackProxy_ is nullptr"); + DCLOGE("callbackProxy_ is nullptr"); return DCAMERA_BAD_VALUE; } if (status == DCAMERA_OK) { std::thread([=]() mutable { - DHLOGI("thread delete devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); + DCLOGI("thread delete devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); prctl(PR_SET_NAME, UNREGISTER_SERVICE_NOTIFY.c_str()); DCameraIndex camIndex(devId, dhId); DistributedCameraSourceService::CamDevErase(camIndex); int32_t ret = callbackProxy_->OnNotifyUnregResult(devId, dhId, reqId, status, data); if (ret != DCAMERA_OK) { - DHLOGE("OnNotifyUnregResult failed, ret: %d", ret); + DCLOGE("OnNotifyUnregResult failed, ret: %d", ret); } }).detach(); } else { int32_t ret = callbackProxy_->OnNotifyUnregResult(devId, dhId, reqId, status, data); if (ret != DCAMERA_OK) { - DHLOGE("OnNotifyUnregResult failed, ret: %d", ret); + DCLOGE("OnNotifyUnregResult failed, ret: %d", ret); } } 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 b3605bf25905d35853eff0fe9e55ee66ffc5ecba..5016bce5e101ba077df6cf24ff4bfabecb4536d6 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_callback_proxy.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_callback_proxy.cpp @@ -19,7 +19,7 @@ #include "anonymous_string.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -27,25 +27,25 @@ int32_t DCameraSourceCallbackProxy::OnNotifyRegResult(const std::string& devId, const std::string& reqId, int32_t status, std::string& data) { if (!CheckParams(devId, dhId, reqId, data)) { - DHLOGE("input is invalid"); + DCLOGE("input is invalid"); return DCAMERA_BAD_VALUE; } sptr remote = Remote(); if (remote == nullptr) { - DHLOGE("DCameraSourceCallbackProxy remote service null"); + DCLOGE("DCameraSourceCallbackProxy remote service null"); return DCAMERA_BAD_VALUE; } MessageParcel req; MessageParcel reply; MessageOption option; if (!req.WriteInterfaceToken(DCameraSourceCallbackProxy::GetDescriptor())) { - DHLOGE("write token failed"); + DCLOGE("write token failed"); return DCAMERA_BAD_VALUE; } if (!req.WriteString(devId) || !req.WriteString(dhId) || !req.WriteString(reqId) || !req.WriteInt32(status) || !req.WriteString(data)) { - DHLOGE("DistributedCameraSourceProxy InitSource write params failed"); + DCLOGE("DistributedCameraSourceProxy InitSource write params failed"); return DCAMERA_BAD_VALUE; } remote->SendRequest(NOTIFY_REG_RESULT, req, reply, option); @@ -57,25 +57,25 @@ int32_t DCameraSourceCallbackProxy::OnNotifyUnregResult(const std::string& devId const std::string& reqId, int32_t status, std::string& data) { if (!CheckParams(devId, dhId, reqId, data)) { - DHLOGE("input is invalid"); + DCLOGE("input is invalid"); return DCAMERA_BAD_VALUE; } sptr remote = Remote(); if (remote == nullptr) { - DHLOGE("DCameraSourceCallbackProxy remote service null"); + DCLOGE("DCameraSourceCallbackProxy remote service null"); return DCAMERA_BAD_VALUE; } MessageParcel req; MessageParcel reply; MessageOption option; if (!req.WriteInterfaceToken(DCameraSourceCallbackProxy::GetDescriptor())) { - DHLOGE("write token failed"); + DCLOGE("write token failed"); return DCAMERA_BAD_VALUE; } if (!req.WriteString(devId) || !req.WriteString(dhId) || !req.WriteString(reqId) || !req.WriteInt32(status) || !req.WriteString(data)) { - DHLOGE("DistributedCameraSourceProxy InitSource write params failed"); + DCLOGE("DistributedCameraSourceProxy InitSource write params failed"); return DCAMERA_BAD_VALUE; } remote->SendRequest(NOTIFY_UNREG_RESULT, req, reply, option); @@ -87,12 +87,12 @@ bool DCameraSourceCallbackProxy::CheckParams(const std::string& devId, const std const std::string& reqId, std::string& data) { if (devId.empty() || devId.size() > DID_MAX_SIZE || dhId.empty() || dhId.size() > DID_MAX_SIZE) { - DHLOGE("devId or dhId is invalid"); + DCLOGE("devId or dhId is invalid"); return false; } if (reqId.empty() || reqId.size() > DID_MAX_SIZE || data.size() > PARAM_MAX_SIZE) { - DHLOGE("reqId or data is invalid"); + DCLOGE("reqId or data is invalid"); return false; } return true; diff --git a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp index cb65059efb7883fbf8851c69c7fdc9eec876a66d..6542beeb792613f845049fabeea740a53bfac5d7 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp @@ -17,7 +17,7 @@ #include "distributed_camera_errno.h" #include "distributed_camera_source_service.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -57,7 +57,7 @@ void DcameraSourceHidumper::SetSourceDumpInfo(CameraDumpInfo& camDumpInfo_) bool DcameraSourceHidumper::Dump(const std::vector& args, std::string& result) { - DHLOGI("DcameraSourceHidumper Dump args.size():%d.", args.size()); + DCLOGI("DcameraSourceHidumper Dump args.size():%d.", args.size()); result.clear(); int32_t argsSize = static_cast(args.size()); @@ -70,7 +70,7 @@ bool DcameraSourceHidumper::Dump(const std::vector& args, std::stri } for (int32_t i = 0; i < argsSize; i++) { - DHLOGI("DcameraSourceHidumper Dump args[%d]: %s.", i, args.at(i).c_str()); + DCLOGI("DcameraSourceHidumper Dump args[%d]: %s.", i, args.at(i).c_str()); } if (ProcessDump(args[0], result) != DCAMERA_OK) { @@ -81,7 +81,7 @@ bool DcameraSourceHidumper::Dump(const std::vector& args, std::stri int32_t DcameraSourceHidumper::ProcessDump(const std::string& args, std::string& result) { - DHLOGI("ProcessDump Dump."); + DCLOGI("ProcessDump Dump."); HidumpFlag hf = HidumpFlag::UNKNOWN; auto operatorIter = ARGS_MAP.find(args); if (operatorIter != ARGS_MAP.end()) { @@ -119,7 +119,7 @@ int32_t DcameraSourceHidumper::ProcessDump(const std::string& args, std::string& int32_t DcameraSourceHidumper::GetRegisteredInfo(std::string& result) { - DHLOGI("GetRegisteredInfo Dump."); + DCLOGI("GetRegisteredInfo Dump."); result.append("CameraNumber: ") .append(std::to_string(camDumpInfo_.regNumber)); return DCAMERA_OK; @@ -127,7 +127,7 @@ int32_t DcameraSourceHidumper::GetRegisteredInfo(std::string& result) int32_t DcameraSourceHidumper::GetCurrentStateInfo(std::string& result) { - DHLOGI("GetCurrentStateInfo Dump."); + DCLOGI("GetCurrentStateInfo Dump."); std::map devState = camDumpInfo_.curState; result.append("CameraId\tState\n"); for (auto it = devState.begin(); it != devState.end(); it++) { @@ -135,7 +135,7 @@ int32_t DcameraSourceHidumper::GetCurrentStateInfo(std::string& result) int32_t camState = 0; deviceId = it->first; camState = it->second; - DHLOGI("GetCurrentStateInfo camState is %d.", camState); + DCLOGI("GetCurrentStateInfo camState is %d.", camState); auto state = STATE_MAP.find(camState); std::string curState(""); if (state != STATE_MAP.end()) { @@ -151,7 +151,7 @@ int32_t DcameraSourceHidumper::GetCurrentStateInfo(std::string& result) int32_t DcameraSourceHidumper::GetVersionInfo(std::string& result) { - DHLOGI("GetVersionInfo Dump."); + DCLOGI("GetVersionInfo Dump."); result.append("CameraVersion: ") .append(camDumpInfo_.version); return DCAMERA_OK; @@ -159,7 +159,7 @@ int32_t DcameraSourceHidumper::GetVersionInfo(std::string& result) void DcameraSourceHidumper::ShowHelp(std::string& result) { - DHLOGI("ShowHelp Dump."); + DCLOGI("ShowHelp Dump."); result.append("Usage:dump [options]\n") .append("Description:\n") .append("-h ") @@ -174,7 +174,7 @@ void DcameraSourceHidumper::ShowHelp(std::string& result) int32_t DcameraSourceHidumper::ShowIllegalInfomation(std::string& result) { - DHLOGI("ShowIllegalInfomation Dump."); + DCLOGI("ShowIllegalInfomation Dump."); result.append("unknown command, -h for help."); return DCAMERA_OK; } 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 952e414424c28a3a5129481cf86009ed4238f4e0..514af2d7adc2e9daf60b1d5a67288db864525783 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp @@ -29,7 +29,7 @@ #include "dcamera_service_state_listener.h" #include "dcamera_source_service_ipc.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -45,40 +45,40 @@ DistributedCameraSourceService::DistributedCameraSourceService(int32_t saId, boo void DistributedCameraSourceService::OnStart() { - DHLOGI("start"); + DCLOGI("start"); if (state_ == DCameraServiceState::DCAMERA_SRV_STATE_RUNNING) { - DHLOGI("DistributedCameraSourceService has already started."); + DCLOGI("DistributedCameraSourceService has already started."); return; } if (!Init()) { - DHLOGE("DistributedCameraSourceService init failed"); + DCLOGE("DistributedCameraSourceService init failed"); return; } state_ = DCameraServiceState::DCAMERA_SRV_STATE_RUNNING; - DHLOGI("start service success."); + DCLOGI("start service success."); } bool DistributedCameraSourceService::Init() { - DHLOGI("DistributedCameraSourceService start init"); + DCLOGI("DistributedCameraSourceService start init"); DCameraSourceServiceIpc::GetInstance().Init(); if (!registerToService_) { bool ret = Publish(this); if (!ret) { - DHLOGE("DistributedCameraSourceService Publish service failed"); + DCLOGE("DistributedCameraSourceService Publish service failed"); return false; } registerToService_ = true; } listener_ = std::make_shared(); - DHLOGI("DistributedCameraSourceService init success"); + DCLOGI("DistributedCameraSourceService init success"); return true; } void DistributedCameraSourceService::OnStop() { - DHLOGI("DistributedCameraSourceService OnStop service"); + DCLOGI("DistributedCameraSourceService OnStop service"); state_ = DCameraServiceState::DCAMERA_SRV_STATE_NOT_START; registerToService_ = false; listener_ = nullptr; @@ -88,10 +88,10 @@ void DistributedCameraSourceService::OnStop() int32_t DistributedCameraSourceService::InitSource(const std::string& params, const sptr& callback) { - DHLOGI("DistributedCameraSourceService InitSource param: %s", params.c_str()); + DCLOGI("DistributedCameraSourceService InitSource param: %s", params.c_str()); int32_t ret = LoadDCameraHDF(); if (ret != DCAMERA_OK) { - DHLOGE("DistributedCameraSourceService InitSource LoadHDF failed, ret: %d", ret); + DCLOGE("DistributedCameraSourceService InitSource LoadHDF failed, ret: %d", ret); return ret; } sourceVer_ = params; @@ -103,64 +103,64 @@ int32_t DistributedCameraSourceService::InitSource(const std::string& params, int32_t DistributedCameraSourceService::ReleaseSource() { - DHLOGI("enter"); + DCLOGI("enter"); int32_t ret = UnLoadCameraHDF(); if (ret != DCAMERA_OK) { - DHLOGE("DistributedCameraSourceService ReleaseSource UnLoadHDF failed, ret: %d", ret); + DCLOGE("DistributedCameraSourceService ReleaseSource UnLoadHDF failed, ret: %d", ret); return ret; } auto systemAbilityMgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (systemAbilityMgr == nullptr) { - DHLOGE("source systemAbilityMgr is null"); + DCLOGE("source systemAbilityMgr is null"); return DCAMERA_BAD_VALUE; } ret = systemAbilityMgr->UnloadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID); if (ret != DCAMERA_OK) { - DHLOGE("source systemAbilityMgr UnLoadSystemAbility failed, ret: %d", ret); + DCLOGE("source systemAbilityMgr UnLoadSystemAbility failed, ret: %d", ret); return DCAMERA_BAD_VALUE; } - DHLOGI("source systemAbilityMgr UnLoadSystemAbility success"); + DCLOGI("source systemAbilityMgr UnLoadSystemAbility success"); return DCAMERA_OK; } int32_t DistributedCameraSourceService::RegisterDistributedHardware(const std::string& devId, const std::string& dhId, const std::string& reqId, const EnableParam& param) { - DHLOGI("RegisterDistributedHardware devId: %s, dhId: %s, sinkVersion: %s", + DCLOGI("RegisterDistributedHardware devId: %s, dhId: %s, sinkVersion: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.sinkVersion.c_str()); if (GetCamDevNum() > MAX_CAMERAS_NUMBER) { - DHLOGE("cameras exceed the upper limit"); + DCLOGE("cameras exceed the upper limit"); return DCAMERA_BAD_VALUE; } DCameraIndex camIndex(devId, dhId); int32_t ret = DCAMERA_OK; std::shared_ptr camDev = GetCamDevByIndex(camIndex); if (camDev == nullptr) { - DHLOGI("new dev devId: %s, dhId: %s, sinkVersion: %s", + DCLOGI("new dev devId: %s, dhId: %s, sinkVersion: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.sinkVersion.c_str()); camDev = std::make_shared(devId, dhId, listener_); ret = camDev->InitDCameraSourceDev(); if (ret != DCAMERA_OK) { - DHLOGE("RegisterDistributedHardware failed %d InitDev devId: %s, dhId: %s", + DCLOGE("RegisterDistributedHardware failed %d InitDev devId: %s, dhId: %s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return ret; } CamDevInsert(camIndex, camDev); } else { - DHLOGE("RegisterDistributedHardware exist devId: %s, dhId: %s, sinkVersion: %s", + DCLOGE("RegisterDistributedHardware exist devId: %s, dhId: %s, sinkVersion: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.sinkVersion.c_str()); return DCAMERA_ALREADY_EXISTS; } ret = camDev->RegisterDistributedHardware(devId, dhId, reqId, param); if (ret != DCAMERA_OK) { - DHLOGE("RegisterDistributedHardware failed, ret: %d", ret); + DCLOGE("RegisterDistributedHardware failed, ret: %d", ret); ReportRegisterCameraFail(DCAMERA_REGISTER_FAIL, GetAnonyString(devId), dhId, param.sinkVersion, "dcamera source RegisterDistributedHardware fail."); CamDevErase(camIndex); } - DHLOGI("RegisterDistributedHardware end devId: %s, dhId: %s, sinkVersion: %s", + DCLOGI("RegisterDistributedHardware end devId: %s, dhId: %s, sinkVersion: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.sinkVersion.c_str()); return ret; } @@ -168,18 +168,18 @@ int32_t DistributedCameraSourceService::RegisterDistributedHardware(const std::s int32_t DistributedCameraSourceService::UnregisterDistributedHardware(const std::string& devId, const std::string& dhId, const std::string& reqId) { - DHLOGI("UnregisterDistributedHardware devId: %s, dhId: %s", + DCLOGI("UnregisterDistributedHardware devId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); DCameraIndex camIndex(devId, dhId); std::shared_ptr camDev = GetCamDevByIndex(camIndex); if (camDev == nullptr) { - DHLOGE("DistributedCameraSourceService UnregisterDistributedHardware not found device"); + DCLOGE("DistributedCameraSourceService UnregisterDistributedHardware not found device"); return DCAMERA_NOT_FOUND; } int32_t ret = camDev->UnRegisterDistributedHardware(devId, dhId, reqId); if (ret != DCAMERA_OK) { - DHLOGE("UnregisterDistributedHardware failed, ret: %d", ret); + DCLOGE("UnregisterDistributedHardware failed, ret: %d", ret); } return ret; } @@ -187,18 +187,18 @@ int32_t DistributedCameraSourceService::UnregisterDistributedHardware(const std: int32_t DistributedCameraSourceService::DCameraNotify(const std::string& devId, const std::string& dhId, std::string& events) { - DHLOGI("DCameraNotify devId: %s, dhId: %s", GetAnonyString(devId).c_str(), + DCLOGI("DCameraNotify devId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); DCameraIndex camIndex(devId, dhId); std::shared_ptr camDev = GetCamDevByIndex(camIndex); if (camDev == nullptr) { - DHLOGE("DistributedCameraSourceService DCameraNotify not found device"); + DCLOGE("DistributedCameraSourceService DCameraNotify not found device"); return DCAMERA_NOT_FOUND; } int32_t ret = camDev->DCameraNotify(events); if (ret != DCAMERA_OK) { - DHLOGE("DCameraNotify failed, ret: %d", ret); + DCLOGE("DCameraNotify failed, ret: %d", ret); } return ret; } @@ -206,34 +206,34 @@ int32_t DistributedCameraSourceService::DCameraNotify(const std::string& devId, int32_t DistributedCameraSourceService::LoadDCameraHDF() { DCAMERA_SYNC_TRACE(DCAMERA_LOAD_HDF); - DHLOGI("load hdf driver start"); + DCLOGI("load hdf driver start"); int32_t ret = DCameraHdfOperate::GetInstance().LoadDcameraHDFImpl(); if (ret != DCAMERA_OK) { - DHLOGE("load hdf driver failed, ret %d", ret); + DCLOGE("load hdf driver failed, ret %d", ret); ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_HDF_ERROR, CreateMsg("dcamera load hdf driver fail.")); return ret; } - DHLOGI("load hdf driver end"); + DCLOGI("load hdf driver end"); return DCAMERA_OK; } int32_t DistributedCameraSourceService::UnLoadCameraHDF() { - DHLOGI("unload hdf driver start"); + DCLOGI("unload hdf driver start"); int32_t ret = DCameraHdfOperate::GetInstance().UnLoadDcameraHDFImpl(); if (ret != DCAMERA_OK) { - DHLOGE("unload hdf driver failed, ret %d", ret); + DCLOGE("unload hdf driver failed, ret %d", ret); return ret; } - DHLOGI("unload hdf driver end"); + DCLOGI("unload hdf driver end"); return DCAMERA_OK; } int DistributedCameraSourceService::Dump(int32_t fd, const std::vector& args) { - DHLOGI("DistributedCameraSourceService Dump."); + DCLOGI("DistributedCameraSourceService Dump."); if (args.size() > DUMP_MAX_SIZE) { - DHLOGE("DistributedCameraSourceService Dump input is invalid"); + DCLOGE("DistributedCameraSourceService Dump input is invalid"); return DCAMERA_BAD_VALUE; } std::string result; @@ -243,13 +243,13 @@ int DistributedCameraSourceService::Dump(int32_t fd, const std::vector PARAM_MAX_SIZE) { - DHLOGE("input params is invalid"); + DCLOGE("input params is invalid"); ret = DCAMERA_BAD_VALUE; break; } sptr remoteObj = data.ReadRemoteObject(); if (remoteObj == nullptr) { - DHLOGE("read object failed"); + DCLOGE("read object failed"); ret = DCAMERA_BAD_VALUE; break; } sptr callbackProxy(new DCameraSourceCallbackProxy(remoteObj)); if (callbackProxy == nullptr) { - DHLOGE("get proxy failed"); + DCLOGE("get proxy failed"); ret = DCAMERA_BAD_VALUE; break; } @@ -91,7 +91,7 @@ int32_t DistributedCameraSourceStub::InitSourceInner(MessageParcel &data, Messag int32_t DistributedCameraSourceStub::ReleaseSourceInner(MessageParcel &data, MessageParcel &reply) { - DHLOGD("enter"); + DCLOGD("enter"); (void)data; int32_t ret = ReleaseSource(); reply.WriteInt32(ret); @@ -100,7 +100,7 @@ int32_t DistributedCameraSourceStub::ReleaseSourceInner(MessageParcel &data, Mes int32_t DistributedCameraSourceStub::RegisterDistributedHardwareInner(MessageParcel &data, MessageParcel &reply) { - DHLOGD("enter"); + DCLOGD("enter"); int32_t ret = DCAMERA_OK; do { std::string devId = data.ReadString(); @@ -112,12 +112,12 @@ int32_t DistributedCameraSourceStub::RegisterDistributedHardwareInner(MessagePar params.sourceVersion = data.ReadString(); params.sourceAttrs = data.ReadString(); if (!CheckRegParams(devId, dhId, reqId, params)) { - DHLOGE("input is invalid"); + DCLOGE("input is invalid"); ret = DCAMERA_BAD_VALUE; break; } ret = RegisterDistributedHardware(devId, dhId, reqId, params); - DHLOGI("DistributedCameraSourceStub RegisterDistributedHardware %d", ret); + DCLOGI("DistributedCameraSourceStub RegisterDistributedHardware %d", ret); } while (0); reply.WriteInt32(ret); return DCAMERA_OK; @@ -127,12 +127,12 @@ bool DistributedCameraSourceStub::CheckRegParams(const std::string& devId, const const std::string& reqId, const EnableParam& param) { if (devId.empty() || devId.size() > DID_MAX_SIZE || dhId.empty() || dhId.size() > DID_MAX_SIZE) { - DHLOGE("devId or dhId is invalid"); + DCLOGE("devId or dhId is invalid"); return false; } if (reqId.empty() || reqId.size() > DID_MAX_SIZE) { - DHLOGE("reqId is invalid"); + DCLOGE("reqId is invalid"); return false; } @@ -140,7 +140,7 @@ bool DistributedCameraSourceStub::CheckRegParams(const std::string& devId, const param.sinkAttrs.empty() || param.sinkAttrs.size() > PARAM_MAX_SIZE || param.sourceVersion.empty() || param.sourceVersion.size() > PARAM_MAX_SIZE || param.sourceAttrs.empty() || param.sourceAttrs.size() > PARAM_MAX_SIZE) { - DHLOGE("param is invalid"); + DCLOGE("param is invalid"); return false; } return true; @@ -148,14 +148,14 @@ bool DistributedCameraSourceStub::CheckRegParams(const std::string& devId, const int32_t DistributedCameraSourceStub::UnregisterDistributedHardwareInner(MessageParcel &data, MessageParcel &reply) { - DHLOGD("enter"); + DCLOGD("enter"); int32_t ret = DCAMERA_OK; do { std::string devId = data.ReadString(); std::string dhId = data.ReadString(); std::string reqId = data.ReadString(); if (!CheckUnregParams(devId, dhId, reqId)) { - DHLOGE("input is invalid"); + DCLOGE("input is invalid"); ret = DCAMERA_BAD_VALUE; break; } @@ -169,12 +169,12 @@ bool DistributedCameraSourceStub::CheckUnregParams(const std::string& devId, con const std::string& reqId) { if (devId.empty() || devId.size() > DID_MAX_SIZE || dhId.empty() || dhId.size() > DID_MAX_SIZE) { - DHLOGE("devId or dhId is invalid"); + DCLOGE("devId or dhId is invalid"); return false; } if (reqId.empty() || reqId.size() > DID_MAX_SIZE) { - DHLOGE("reqId is invalid"); + DCLOGE("reqId is invalid"); return false; } return true; @@ -188,7 +188,7 @@ int32_t DistributedCameraSourceStub::DCameraNotifyInner(MessageParcel &data, Mes std::string dhId = data.ReadString(); std::string events = data.ReadString(); if (!CheckNotifyParams(devId, dhId, events)) { - DHLOGE("input is invalid"); + DCLOGE("input is invalid"); ret = DCAMERA_BAD_VALUE; break; } @@ -202,12 +202,12 @@ bool DistributedCameraSourceStub::CheckNotifyParams(const std::string& devId, co std::string& events) { if (devId.empty() || devId.size() > DID_MAX_SIZE || dhId.empty() || dhId.size() > DID_MAX_SIZE) { - DHLOGE("devId or dhId is invalid"); + DCLOGE("devId or dhId is invalid"); return false; } if (events.empty() || events.size() > PARAM_MAX_SIZE) { - DHLOGE("events is invalid"); + DCLOGE("events is invalid"); return false; } return true; diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp index ba11a523a96ff308fa45df536ebe7a8fb25c9eb4..2a35d26ed9cc5ac0864045c1cf23834b7419d956 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp @@ -20,7 +20,7 @@ #include "dcamera_hitrace_adapter.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "dcamera_channel_info_cmd.h" #include "dcamera_info_cmd.h" @@ -34,7 +34,7 @@ namespace DistributedHardware { DCameraSourceDev::DCameraSourceDev(std::string devId, std::string dhId, std::shared_ptr& stateLisener) : devId_(devId), dhId_(dhId), stateListener_(stateLisener) { - DHLOGI("DCameraSourceDev Construct devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev Construct devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); memberFuncMap_[DCAMERA_EVENT_REGIST] = &DCameraSourceDev::NotifyRegisterResult; memberFuncMap_[DCAMERA_EVENT_UNREGIST] = &DCameraSourceDev::NotifyRegisterResult; @@ -57,7 +57,7 @@ DCameraSourceDev::DCameraSourceDev(std::string devId, std::string dhId, DCameraSourceDev::~DCameraSourceDev() { - DHLOGI("DCameraSourceDev Delete devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev Delete devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); eventBus_ = nullptr; hdiCallback_ = nullptr; @@ -68,13 +68,13 @@ DCameraSourceDev::~DCameraSourceDev() eventResultMap_.clear(); memberFuncMap_.clear(); - DHLOGI("DCameraSourceDev Delete devId %s dhId %s end", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev Delete devId %s dhId %s end", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } int32_t DCameraSourceDev::InitDCameraSourceDev() { - DHLOGI("DCameraSourceDev InitDCameraSourceDev devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev InitDCameraSourceDev devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); eventBus_ = std::make_shared("SrcDevHandler"); DCameraSourceEvent event(*this); @@ -86,10 +86,10 @@ int32_t DCameraSourceDev::InitDCameraSourceDev() input_ = std::make_shared(devId_, dhId_, cameraSourceDev); hdiCallback_ = new (std::nothrow) DCameraProviderCallbackImpl(devId_, dhId_, cameraSourceDev); if (hdiCallback_ == nullptr) { - DHLOGE("DCameraSourceDev InitDCameraSourceDev failed, hdiCallback is null."); + DCLOGE("DCameraSourceDev InitDCameraSourceDev failed, hdiCallback is null."); return DCAMERA_BAD_VALUE; } - DHLOGI("DCameraSourceDev InitDCameraSourceDev end devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev InitDCameraSourceDev end devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } @@ -97,7 +97,7 @@ int32_t DCameraSourceDev::InitDCameraSourceDev() int32_t DCameraSourceDev::RegisterDistributedHardware(const std::string& devId, const std::string& dhId, const std::string& reqId, const EnableParam& param) { - DHLOGI("DCameraSourceDev PostTask RegisterDistributedHardware devId %s dhId %s", GetAnonyString(devId).c_str(), + DCLOGI("DCameraSourceDev PostTask RegisterDistributedHardware devId %s dhId %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); version_ = param.sinkVersion; DCameraIndex index(devId, dhId); @@ -113,7 +113,7 @@ int32_t DCameraSourceDev::RegisterDistributedHardware(const std::string& devId, int32_t DCameraSourceDev::UnRegisterDistributedHardware(const std::string devId, const std::string dhId, const std::string reqId) { - DHLOGI("DCameraSourceDev PostTask UnRegisterDistributedHardware devId %s dhId %s", GetAnonyString(devId).c_str(), + DCLOGI("DCameraSourceDev PostTask UnRegisterDistributedHardware devId %s dhId %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); std::string sinkAttrs; std::string sourceAttrs; @@ -126,12 +126,12 @@ int32_t DCameraSourceDev::UnRegisterDistributedHardware(const std::string devId, int32_t DCameraSourceDev::DCameraNotify(std::string& eventStr) { - DHLOGI("DCameraSourceDev PostTask DCameraNotify devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev PostTask DCameraNotify devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DCameraEventCmd cmd; int32_t ret = cmd.Unmarshal(eventStr); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev DCameraNotify devId %s dhId %s marshal failed, ret: %d", + DCLOGE("DCameraSourceDev DCameraNotify devId %s dhId %s marshal failed, ret: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), ret); return ret; } @@ -143,7 +143,7 @@ int32_t DCameraSourceDev::DCameraNotify(std::string& eventStr) int32_t DCameraSourceDev::OpenSession(DCameraIndex& camIndex) { - DHLOGI("DCameraSourceDev PostTask OpenSession devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev PostTask OpenSession devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DCameraSourceEvent event(*this, DCAMERA_EVENT_OPEN, camIndex); eventBus_->PostEvent(event); @@ -152,7 +152,7 @@ int32_t DCameraSourceDev::OpenSession(DCameraIndex& camIndex) int32_t DCameraSourceDev::CloseSession(DCameraIndex& camIndex) { - DHLOGI("DCameraSourceDev PostTask CloseSession devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev PostTask CloseSession devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DCameraSourceEvent event(*this, DCAMERA_EVENT_CLOSE, camIndex); eventBus_->PostEvent(event); @@ -161,7 +161,7 @@ int32_t DCameraSourceDev::CloseSession(DCameraIndex& camIndex) int32_t DCameraSourceDev::ConfigCameraStreams(const std::vector>& streamInfos) { - DHLOGI("DCameraSourceDev PostTask ConfigStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev PostTask ConfigStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DCameraSourceEvent event(*this, DCAMERA_EVENT_CONFIG_STREAMS, streamInfos); eventBus_->PostEvent(event); @@ -170,7 +170,7 @@ int32_t DCameraSourceDev::ConfigCameraStreams(const std::vector& streamIds) { - DHLOGI("DCameraSourceDev PostTask ReleaseStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev PostTask ReleaseStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DCameraSourceEvent event(*this, DCAMERA_EVENT_RELEASE_STREAMS, streamIds); eventBus_->PostEvent(event); @@ -179,7 +179,7 @@ int32_t DCameraSourceDev::ReleaseCameraStreams(const std::vector& streamIds int32_t DCameraSourceDev::StartCameraCapture(const std::vector>& captureInfos) { - DHLOGI("DCameraSourceDev PostTask StartCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev PostTask StartCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DCameraSourceEvent event(*this, DCAMERA_EVENT_START_CAPTURE, captureInfos); eventBus_->PostEvent(event); @@ -188,7 +188,7 @@ int32_t DCameraSourceDev::StartCameraCapture(const std::vector& streamIds) { - DHLOGI("DCameraSourceDev PostTask StopCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev PostTask StopCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DCameraSourceEvent event(*this, DCAMERA_EVENT_STOP_CAPTURE, streamIds); eventBus_->PostEvent(event); @@ -197,7 +197,7 @@ int32_t DCameraSourceDev::StopCameraCapture(const std::vector& streamIds) int32_t DCameraSourceDev::UpdateCameraSettings(const std::vector>& settings) { - DHLOGI("DCameraSourceDev PostTask UpdateCameraSettings devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev PostTask UpdateCameraSettings devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DCameraSourceEvent event(*this, DCAMERA_EVENT_UPDATE_SETTINGS, settings); eventBus_->PostEvent(event); @@ -206,11 +206,11 @@ int32_t DCameraSourceDev::UpdateCameraSettings(const std::vectorExecute(event.GetEventType(), event); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev OnEvent failed, ret: %d, devId: %s dhId: %s", ret, + DCLOGE("DCameraSourceDev OnEvent failed, ret: %d, devId: %s dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } NotifyResult(event.GetEventType(), event, ret); @@ -219,7 +219,7 @@ void DCameraSourceDev::OnEvent(DCameraSourceEvent& event) int32_t DCameraSourceDev::Register(std::shared_ptr& param) { DCAMERA_SYNC_TRACE(DCAMERA_REGISTER_CAMERA); - DHLOGI("DCameraSourceDev Execute Register devId: %s dhId: %s", + DCLOGI("DCameraSourceDev Execute Register devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); ReportRegisterCameraEvent(REGIST_CAMERA_EVENT, GetAnonyString(devId_), dhId_, version_, "execute register event."); @@ -227,14 +227,14 @@ int32_t DCameraSourceDev::Register(std::shared_ptr& param) actualDevInfo.assign(actualDevInfo_.begin(), actualDevInfo_.end()); int32_t ret = controller_->Init(actualDevInfo); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute Register controller init failed, ret: %d, devId: %s dhId: %s", ret, + DCLOGE("DCameraSourceDev Execute Register controller init failed, ret: %d, devId: %s dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } ret = input_->Init(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute Register input init failed, ret: %d, devId: %s dhId: %s", ret, + DCLOGE("DCameraSourceDev Execute Register input init failed, ret: %d, devId: %s dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); controller_->UnInit(); return ret; @@ -242,7 +242,7 @@ int32_t DCameraSourceDev::Register(std::shared_ptr& param) sptr camHdiProvider = IDCameraProvider::Get(HDF_DCAMERA_EXT_SERVICE); if (camHdiProvider == nullptr) { - DHLOGI("Register camHdiProvider is nullptr devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DCLOGI("Register camHdiProvider is nullptr devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); controller_->UnInit(); input_->UnInit(); @@ -252,7 +252,7 @@ int32_t DCameraSourceDev::Register(std::shared_ptr& param) dhBase.deviceId_ = param->devId_; dhBase.dhId_ = param->dhId_; int32_t retHdi = camHdiProvider->EnableDCameraDevice(dhBase, param->sinkParam_, hdiCallback_); - DHLOGI("DCameraSourceDev Execute Register register hal, ret: %d, devId: %s dhId: %s", retHdi, + DCLOGI("DCameraSourceDev Execute Register register hal, ret: %d, devId: %s dhId: %s", retHdi, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (retHdi != SUCCESS) { controller_->UnInit(); @@ -265,25 +265,25 @@ int32_t DCameraSourceDev::Register(std::shared_ptr& param) int32_t DCameraSourceDev::UnRegister(std::shared_ptr& param) { DCAMERA_SYNC_TRACE(DCAMERA_UNREGISTER_CAMERA); - DHLOGI("DCameraSourceDev Execute UnRegister devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev Execute UnRegister devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); ReportRegisterCameraEvent(UNREGIST_CAMERA_EVENT, GetAnonyString(devId_), dhId_, version_, "execute unregister event."); int32_t ret = controller_->UnInit(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute UnRegister controller uninit failed, ret: %d, devId: %s dhId: %s", ret, + DCLOGE("DCameraSourceDev Execute UnRegister controller uninit failed, ret: %d, devId: %s dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } ret = input_->UnInit(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute UnRegister input uninit failed, ret: %d, devId: %s dhId: %s", ret, + DCLOGE("DCameraSourceDev Execute UnRegister input uninit failed, ret: %d, devId: %s dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } sptr camHdiProvider = IDCameraProvider::Get(HDF_DCAMERA_EXT_SERVICE); if (camHdiProvider == nullptr) { - DHLOGI("UnRegister camHdiProvider is nullptr devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DCLOGI("UnRegister camHdiProvider is nullptr devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return DCAMERA_BAD_OPERATE; } @@ -292,7 +292,7 @@ int32_t DCameraSourceDev::UnRegister(std::shared_ptr& param) dhBase.deviceId_ = param->devId_; dhBase.dhId_ = param->dhId_; int32_t retHdi = camHdiProvider->DisableDCameraDevice(dhBase); - DHLOGI("DCameraSourceDev Execute UnRegister unregister hal, ret: %d, devId: %s dhId: %s", retHdi, + DCLOGI("DCameraSourceDev Execute UnRegister unregister hal, ret: %d, devId: %s dhId: %s", retHdi, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (retHdi != SUCCESS) { return DCAMERA_UNREGIST_HAL_FAILED; @@ -302,13 +302,13 @@ int32_t DCameraSourceDev::UnRegister(std::shared_ptr& param) int32_t DCameraSourceDev::OpenCamera() { - DHLOGI("DCameraSourceDev Execute OpenCamera devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev Execute OpenCamera devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); ReportCameraOperaterEvent(OPEN_CAMERA_EVENT, GetAnonyString(devId_), dhId_, "execute open camera event."); std::shared_ptr openInfo = std::make_shared(); int32_t ret = GetLocalDeviceNetworkId(openInfo->sourceDevId_); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev getMyId failed ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("DCameraSourceDev getMyId failed ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -316,7 +316,7 @@ int32_t DCameraSourceDev::OpenCamera() DcameraStartAsyncTrace(DCAMERA_OPEN_CHANNEL_CONTROL, DCAMERA_OPEN_CHANNEL_TASKID); ret = controller_->OpenChannel(openInfo); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute OpenCamera OpenChannel failed, ret: %d, devId: %s dhId: %s", ret, + DCLOGE("DCameraSourceDev Execute OpenCamera OpenChannel failed, ret: %d, devId: %s dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DcameraFinishAsyncTrace(DCAMERA_OPEN_CHANNEL_CONTROL, DCAMERA_OPEN_CHANNEL_TASKID); return DCAMERA_OPEN_CONFLICT; @@ -326,17 +326,17 @@ int32_t DCameraSourceDev::OpenCamera() int32_t DCameraSourceDev::CloseCamera() { - DHLOGI("DCameraSourceDev Execute CloseCamera devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev Execute CloseCamera devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); ReportCameraOperaterEvent(CLOSE_CAMERA_EVENT, GetAnonyString(devId_), dhId_, "execute close camera event."); int32_t ret = input_->CloseChannel(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute CloseCamera input CloseChannel failed, ret: %d, devId: %s dhId: %s", ret, + DCLOGE("DCameraSourceDev Execute CloseCamera input CloseChannel failed, ret: %d, devId: %s dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } ret = controller_->CloseChannel(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute CloseCamera controller CloseChannel failed, ret: %d, devId: %s dhId: %s", ret, + DCLOGE("DCameraSourceDev Execute CloseCamera controller CloseChannel failed, ret: %d, devId: %s dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } return DCAMERA_OK; @@ -344,11 +344,11 @@ int32_t DCameraSourceDev::CloseCamera() int32_t DCameraSourceDev::ConfigStreams(std::vector>& streamInfos) { - DHLOGI("DCameraSourceDev Execute ConfigStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev Execute ConfigStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = input_->ConfigStreams(streamInfos); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute ConfigStreams ConfigStreams failed, ret: %d, devId: %s dhId: %s", ret, + DCLOGE("DCameraSourceDev Execute ConfigStreams ConfigStreams failed, ret: %d, devId: %s dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -356,7 +356,7 @@ int32_t DCameraSourceDev::ConfigStreams(std::vector chanInfo = std::make_shared(); ret = GetLocalDeviceNetworkId(chanInfo->sourceDevId_); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev getLocalNetworkId failed ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("DCameraSourceDev getLocalNetworkId failed ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -367,7 +367,7 @@ int32_t DCameraSourceDev::ConfigStreams(std::vectorChannelNeg(chanInfo); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev ChannelNeg failed ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("DCameraSourceDev ChannelNeg failed ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -376,7 +376,7 @@ int32_t DCameraSourceDev::ConfigStreams(std::vectorOpenChannel(actualDevInfo); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev ChannelNeg OpenChannel failed ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("DCameraSourceDev ChannelNeg OpenChannel failed ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -385,11 +385,11 @@ int32_t DCameraSourceDev::ConfigStreams(std::vector& streamIds, bool& isAllRelease) { - DHLOGI("DCameraSourceDev Execute ReleaseStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev Execute ReleaseStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = input_->ReleaseStreams(streamIds, isAllRelease); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute ReleaseStreams failed ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("DCameraSourceDev Execute ReleaseStreams failed ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -398,11 +398,11 @@ int32_t DCameraSourceDev::ReleaseStreams(std::vector& streamIds, bool& isAl int32_t DCameraSourceDev::ReleaseAllStreams() { - DHLOGI("DCameraSourceDev Execute ReleaseAllStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev Execute ReleaseAllStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = input_->ReleaseAllStreams(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute ReleaseAllStreams failed ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("DCameraSourceDev Execute ReleaseAllStreams failed ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -412,11 +412,11 @@ int32_t DCameraSourceDev::ReleaseAllStreams() int32_t DCameraSourceDev::StartCapture(std::vector>& captureInfos) { HitraceAndHisyseventImpl(captureInfos); - DHLOGI("DCameraSourceDev Execute StartCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev Execute StartCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = input_->StartCapture(captureInfos); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev input StartCapture failed ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("DCameraSourceDev input StartCapture failed ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DcameraFinishAsyncTrace(DCAMERA_CONTINUE_FIRST_FRAME, DCAMERA_CONTINUE_FIRST_FRAME_TASKID); DcameraFinishAsyncTrace(DCAMERA_SNAPSHOT_FIRST_FRAME, DCAMERA_SNAPSHOT_FIRST_FRAME_TASKID); @@ -432,7 +432,7 @@ int32_t DCameraSourceDev::StartCapture(std::vectorisCapture_ = (*iter)->isCapture_; capture->encodeType_ = (*iter)->encodeType_; capture->streamType_ = (*iter)->type_; - DHLOGI("StartCapture devId %s dhId %s settings size: %d w: %d h: %d fmt: %d isC: %d enc: %d streamT: %d", + DCLOGI("StartCapture devId %s dhId %s settings size: %d w: %d h: %d fmt: %d isC: %d enc: %d streamT: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), (*iter)->captureSettings_.size(), capture->width_, capture->height_, capture->format_, capture->isCapture_ ? 1 : 0, capture->encodeType_, capture->streamType_); @@ -448,7 +448,7 @@ int32_t DCameraSourceDev::StartCapture(std::vectorStartCapture(captures); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute StartCapture StartCapture failed, ret: %d, devId: %s dhId: %s", ret, + DCLOGE("DCameraSourceDev Execute StartCapture StartCapture failed, ret: %d, devId: %s dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DcameraFinishAsyncTrace(DCAMERA_CONTINUE_FIRST_FRAME, DCAMERA_CONTINUE_FIRST_FRAME_TASKID); DcameraFinishAsyncTrace(DCAMERA_SNAPSHOT_FIRST_FRAME, DCAMERA_SNAPSHOT_FIRST_FRAME_TASKID); @@ -479,17 +479,17 @@ void DCameraSourceDev::HitraceAndHisyseventImpl(std::vector& streamIds, bool& isAllStop) { - DHLOGI("DCameraSourceDev Execute StopCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev Execute StopCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = input_->StopCapture(streamIds, isAllStop); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute StopCapture input StopCapture failed, ret: %d, devId: %s dhId: %s", ret, + DCLOGE("DCameraSourceDev Execute StopCapture input StopCapture failed, ret: %d, devId: %s dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } if (isAllStop) { ret = controller_->StopCapture(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute StopCapture controller StopCapture failed, ret: %d, devId: %s dhId: %s", + DCLOGE("DCameraSourceDev Execute StopCapture controller StopCapture failed, ret: %d, devId: %s dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } } @@ -498,16 +498,16 @@ int32_t DCameraSourceDev::StopCapture(std::vector& streamIds, bool& isAllSt int32_t DCameraSourceDev::StopAllCapture() { - DHLOGI("DCameraSourceDev Execute StopAllCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev Execute StopAllCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = input_->StopAllCapture(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute StopAllCapture input StopAllCapture failed, ret: %d, devId: %s dhId: %s", + DCLOGE("DCameraSourceDev Execute StopAllCapture input StopAllCapture failed, ret: %d, devId: %s dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } ret = controller_->StopCapture(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute StopAllCapture controller StopAllCapture failed, ret: %d, devId: %s dhId: %s", + DCLOGE("DCameraSourceDev Execute StopAllCapture controller StopAllCapture failed, ret: %d, devId: %s dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } return DCAMERA_OK; @@ -515,17 +515,17 @@ int32_t DCameraSourceDev::StopAllCapture() int32_t DCameraSourceDev::UpdateSettings(std::vector>& settings) { - DHLOGI("DCameraSourceDev Execute UpdateSettings devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev Execute UpdateSettings devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = input_->UpdateSettings(settings); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute UpdateSettings input UpdateSettings failed, ret: %d, devId: %s dhId: %s", ret, + DCLOGE("DCameraSourceDev Execute UpdateSettings input UpdateSettings failed, ret: %d, devId: %s dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } ret = controller_->UpdateSettings(settings); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute UpdateSettings controller UpdateSettings failed, ret: %d, devId: %s dhId: %s", + DCLOGE("DCameraSourceDev Execute UpdateSettings controller UpdateSettings failed, ret: %d, devId: %s dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -534,11 +534,11 @@ int32_t DCameraSourceDev::UpdateSettings(std::vector& events) { - DHLOGI("DCameraSourceDev Execute CameraEventNotify devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDev Execute CameraEventNotify devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = controller_->DCameraNotify(events); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute CameraEventNotify DCameraNotify failed, ret: %d, devId: %s dhId: %s", ret, + DCLOGE("DCameraSourceDev Execute CameraEventNotify DCameraNotify failed, ret: %d, devId: %s dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -549,7 +549,7 @@ void DCameraSourceDev::NotifyResult(DCAMERA_EVENT eventType, DCameraSourceEvent& { auto itFunc = memberFuncMap_.find(eventType); if (itFunc == memberFuncMap_.end()) { - DHLOGE("Notify func map not find, execute %d notify, devId: %s dhId: %s", eventType, + DCLOGE("Notify func map not find, execute %d notify, devId: %s dhId: %s", eventType, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return; } @@ -569,7 +569,7 @@ void DCameraSourceDev::NotifyRegisterResult(DCAMERA_EVENT eventType, DCameraSour } if (stateListener_ == nullptr) { - DHLOGE("DCameraSourceDev can not get listener"); + DCLOGE("DCameraSourceDev can not get listener"); return; } if (eventType == DCAMERA_EVENT_REGIST) { @@ -581,7 +581,7 @@ void DCameraSourceDev::NotifyRegisterResult(DCAMERA_EVENT eventType, DCameraSour void DCameraSourceDev::NotifyHalResult(DCAMERA_EVENT eventType, DCameraSourceEvent& event, int32_t result) { - DHLOGI("DCameraSourceDev NotifyHalResult eventType: %d, result: %d devId: %s dhId: %s", eventType, result, + DCLOGI("DCameraSourceDev NotifyHalResult eventType: %d, result: %d devId: %s dhId: %s", eventType, result, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (result == DCAMERA_OK) { return; @@ -600,7 +600,7 @@ void DCameraSourceDev::NotifyHalResult(DCAMERA_EVENT eventType, DCameraSourceEve int32_t DCameraSourceDev::GetStateInfo() { - DHLOGI("GetStateInfo In state %d", stateMachine_->GetCameraState()); + DCLOGI("GetStateInfo In state %d", stateMachine_->GetCameraState()); return stateMachine_->GetCameraState(); } diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_event.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_event.cpp index bb13ff29e2b6b15291ee112d5ea55bbb2f43204a..04a0c0e15081497e732e4f2f856e65517cc6f039 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_event.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_event.cpp @@ -16,7 +16,7 @@ #include "dcamera_source_event.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -24,7 +24,7 @@ int32_t DCameraSourceEvent::GetDCameraIndex(DCameraIndex& index) { auto indexPtr = std::get_if(&eventParam_); if (indexPtr == nullptr) { - DHLOGE("DCameraSourceEvent can not get_if DCameraIndex"); + DCLOGE("DCameraSourceEvent can not get_if DCameraIndex"); return DCAMERA_NOT_FOUND; } @@ -36,7 +36,7 @@ int32_t DCameraSourceEvent::GetDCameraRegistParam(std::shared_ptr>(&eventParam_); if (paramPtr == nullptr) { - DHLOGE("DCameraSourceEvent can not get_if DCameraRegistParam"); + DCLOGE("DCameraSourceEvent can not get_if DCameraRegistParam"); return DCAMERA_NOT_FOUND; } param = *paramPtr; @@ -47,7 +47,7 @@ int32_t DCameraSourceEvent::GetStreamInfos(std::vector>>(&eventParam_); if (streamInfosPtr == nullptr) { - DHLOGE("DCameraSourceEvent can not get_if DCStreamInfo"); + DCLOGE("DCameraSourceEvent can not get_if DCStreamInfo"); return DCAMERA_NOT_FOUND; } streamInfos = std::move(*streamInfosPtr); @@ -58,7 +58,7 @@ int32_t DCameraSourceEvent::GetCaptureInfos(std::vector>>(&eventParam_); if (captureInfosPtr == nullptr) { - DHLOGE("DCameraSourceEvent can not get_if DCCaptureInfo"); + DCLOGE("DCameraSourceEvent can not get_if DCCaptureInfo"); return DCAMERA_NOT_FOUND; } captureInfos = std::move(*captureInfosPtr); @@ -69,7 +69,7 @@ int32_t DCameraSourceEvent::GetCameraSettings(std::vector>>(&eventParam_); if (settingsPtr == nullptr) { - DHLOGE("DCameraSourceEvent can not get_if DCameraSettings"); + DCLOGE("DCameraSourceEvent can not get_if DCameraSettings"); return DCAMERA_NOT_FOUND; } settings = std::move(*settingsPtr); @@ -80,7 +80,7 @@ int32_t DCameraSourceEvent::GetStreamIds(std::vector& streamIds) { auto streamIdsPtr = std::get_if>(&eventParam_); if (streamIdsPtr == nullptr) { - DHLOGE("DCameraSourceEvent can not get_if streamIds"); + DCLOGE("DCameraSourceEvent can not get_if streamIds"); return DCAMERA_NOT_FOUND; } streamIds = std::move(*streamIdsPtr); @@ -91,7 +91,7 @@ int32_t DCameraSourceEvent::GetCameraEvent(std::shared_ptr& camEve { auto camEventPtr = std::get_if>(&eventParam_); if (camEventPtr == nullptr) { - DHLOGE("DCameraSourceEvent can not get_if camEventPtr"); + DCLOGE("DCameraSourceEvent can not get_if camEventPtr"); return DCAMERA_NOT_FOUND; } camEvent = *camEventPtr; 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 b694a513852c8a6881c0aba957df42600148fc5d..c90d400abe7dfa0a1d63afcc1821d93423845c51 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_service_ipc.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_service_ipc.cpp @@ -21,18 +21,18 @@ #include "anonymous_string.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { DCameraSourceServiceIpc::DCameraSourceServiceIpc() : isInit_(false) { - DHLOGI("DCameraSourceServiceIpc Create"); + DCLOGI("DCameraSourceServiceIpc Create"); } DCameraSourceServiceIpc::~DCameraSourceServiceIpc() { - DHLOGI("DCameraSourceServiceIpc Delete"); + DCLOGI("DCameraSourceServiceIpc Delete"); UnInit(); } @@ -41,35 +41,35 @@ IMPLEMENT_SINGLE_INSTANCE(DCameraSourceServiceIpc); void DCameraSourceServiceIpc::Init() { std::lock_guard autoLock(initCamSrvLock_); - DHLOGI("Start"); + DCLOGI("Start"); if (isInit_) { - DHLOGI("DCameraSourceServiceIpc has already init"); + DCLOGI("DCameraSourceServiceIpc has already init"); return; } sinkRemoteRecipient_ = new SinkRemoteRecipient(); isInit_ = true; - DHLOGI("End"); + DCLOGI("End"); } void DCameraSourceServiceIpc::UnInit() { std::lock_guard autoLock(initCamSrvLock_); - DHLOGI("Start"); + DCLOGI("Start"); if (!isInit_) { - DHLOGI("DCameraSourceServiceIpc has already UnInit"); + DCLOGI("DCameraSourceServiceIpc has already UnInit"); return; } ClearSinkRemoteCamSrv(); - DHLOGI("Start free recipient"); + DCLOGI("Start free recipient"); sinkRemoteRecipient_ = nullptr; isInit_ = false; - DHLOGI("End"); + DCLOGI("End"); } sptr DCameraSourceServiceIpc::GetSinkRemoteCamSrv(const std::string& deviceId) { if (deviceId.empty()) { - DHLOGE("GetSinkRemoteCamSrv deviceId is empty"); + DCLOGE("GetSinkRemoteCamSrv deviceId is empty"); return nullptr; } { @@ -78,28 +78,28 @@ sptr DCameraSourceServiceIpc::GetSinkRemoteCamSrv(const if (iter != remoteSinks_.end()) { auto object = iter->second; if (object != nullptr) { - DHLOGI("DCameraSourceServiceIpc GetSinkRemoteCamSrv from cache devId: %s", + DCLOGI("DCameraSourceServiceIpc GetSinkRemoteCamSrv from cache devId: %s", GetAnonyString(deviceId).c_str()); return object; } } } - DHLOGI("GetSinkRemoteCamSrv remote deviceid is %s", GetAnonyString(deviceId).c_str()); + DCLOGI("GetSinkRemoteCamSrv remote deviceid is %s", GetAnonyString(deviceId).c_str()); auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (samgr == nullptr) { - DHLOGE("GetSinkRemoteCamSrv failed to connect to systemAbilityMgr!"); + DCLOGE("GetSinkRemoteCamSrv failed to connect to systemAbilityMgr!"); return nullptr; } auto object = samgr->CheckSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, deviceId); if (object == nullptr) { - DHLOGE("GetSinkRemoteCamSrv failed get remote CamSrv %s", GetAnonyString(deviceId).c_str()); + DCLOGE("GetSinkRemoteCamSrv failed get remote CamSrv %s", GetAnonyString(deviceId).c_str()); return nullptr; } int32_t ret = object->AddDeathRecipient(sinkRemoteRecipient_); sptr remoteCamSrvObj = iface_cast(object); if (remoteCamSrvObj == nullptr) { - DHLOGI("GetSinkRemoteCamSrv failed, remoteCamSrvObj is null ret: %d", ret); + DCLOGI("GetSinkRemoteCamSrv failed, remoteCamSrvObj is null ret: %d", ret); return nullptr; } { @@ -110,17 +110,17 @@ sptr DCameraSourceServiceIpc::GetSinkRemoteCamSrv(const } remoteSinks_[deviceId] = remoteCamSrvObj; } - DHLOGI("GetSinkRemoteCamSrv success, AddDeathRecipient ret: %d", ret); + DCLOGI("GetSinkRemoteCamSrv success, AddDeathRecipient ret: %d", ret); return remoteCamSrvObj; } void DCameraSourceServiceIpc::DeleteSinkRemoteCamSrv(const std::string& deviceId) { - DHLOGI("DeleteSinkRemoteCamSrv devId: %s", GetAnonyString(deviceId).c_str()); + DCLOGI("DeleteSinkRemoteCamSrv devId: %s", GetAnonyString(deviceId).c_str()); std::lock_guard autoLock(sinkRemoteCamSrvLock_); auto item = remoteSinks_.find(deviceId); if (item == remoteSinks_.end()) { - DHLOGI("DeleteSinkRemoteCamSrv not found device: %s", GetAnonyString(deviceId).c_str()); + DCLOGI("DeleteSinkRemoteCamSrv not found device: %s", GetAnonyString(deviceId).c_str()); return; } @@ -132,7 +132,7 @@ void DCameraSourceServiceIpc::DeleteSinkRemoteCamSrv(const std::string& deviceId void DCameraSourceServiceIpc::ClearSinkRemoteCamSrv() { - DHLOGI("ClearSinkRemoteCamSrv Start"); + DCLOGI("ClearSinkRemoteCamSrv Start"); std::lock_guard autoLock(sinkRemoteCamSrvLock_); for (auto iter = remoteSinks_.begin(); iter != remoteSinks_.end(); iter++) { if (iter->second != nullptr) { @@ -140,22 +140,22 @@ void DCameraSourceServiceIpc::ClearSinkRemoteCamSrv() } } remoteSinks_.clear(); - DHLOGI("ClearSinkRemoteCamSrv end"); + DCLOGI("ClearSinkRemoteCamSrv end"); } void DCameraSourceServiceIpc::SinkRemoteRecipient::OnRemoteDied(const wptr& remote) { - DHLOGI("SinkRemoteRecipient OnRemoteDied received died notify!"); + DCLOGI("SinkRemoteRecipient OnRemoteDied received died notify!"); DCameraSourceServiceIpc::GetInstance().OnSinkRemoteCamSrvDied(remote); } void DCameraSourceServiceIpc::OnSinkRemoteCamSrvDied(const wptr& remote) { - DHLOGI("OnSinkRemoteCamSrvDied delete diedRemoted"); + DCLOGI("OnSinkRemoteCamSrvDied delete diedRemoted"); std::lock_guard autoLock(sinkRemoteCamSrvLock_); sptr diedRemoted = remote.promote(); if (diedRemoted == nullptr) { - DHLOGE("OnSinkRemoteCamSrvDied promote failed!"); + DCLOGE("OnSinkRemoteCamSrvDied promote failed!"); return; } auto iter = std::find_if(remoteSinks_.begin(), remoteSinks_.end(), [&]( @@ -163,11 +163,11 @@ void DCameraSourceServiceIpc::OnSinkRemoteCamSrvDied(const wptr& return item.second->AsObject() == diedRemoted; }); if (iter == remoteSinks_.end()) { - DHLOGI("OnSinkRemoteCamSrvDied not found remote object"); + DCLOGI("OnSinkRemoteCamSrvDied not found remote object"); return; } - DHLOGI("OnSinkRemoteCamSrvDied remote.devId: %s", GetAnonyString(iter->first).c_str()); + DCLOGI("OnSinkRemoteCamSrvDied remote.devId: %s", GetAnonyString(iter->first).c_str()); if (iter->second != nullptr) { iter->second->AsObject()->RemoveDeathRecipient(sinkRemoteRecipient_); } 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 432d8d33d23eec491dfbf606029aba2662a3e962..4a27d8fc40d375af35141cc607cb6ffe5b990457 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp @@ -30,7 +30,7 @@ #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "idistributed_camera_sink.h" #include "dcamera_low_latency.h" @@ -41,14 +41,14 @@ DCameraSourceController::DCameraSourceController(std::string devId, std::string : devId_(devId), dhId_(dhId), stateMachine_(stateMachine), camDev_(camDev), channelState_(DCAMERA_CHANNEL_STATE_DISCONNECTED) { - DHLOGI("DCameraSourceController create devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceController create devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); isInit = false; } DCameraSourceController::~DCameraSourceController() { - DHLOGI("DCameraSourceController delete devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceController delete devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (isInit) { UnInit(); @@ -59,13 +59,13 @@ DCameraSourceController::~DCameraSourceController() int32_t DCameraSourceController::StartCapture(std::vector>& captureInfos) { if (indexs_.size() > DCAMERA_MAX_NUM) { - DHLOGE("StartCapture not support operate %d camera", indexs_.size()); + DCLOGE("StartCapture not support operate %d camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } std::string dhId = indexs_.begin()->dhId_; std::string devId = indexs_.begin()->devId_; - DHLOGI("StartCapture devId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); + DCLOGI("StartCapture devId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); DCameraCaptureInfoCmd cmd; cmd.type_ = DCAMERA_PROTOCOL_TYPE_OPERATION; cmd.dhId_ = dhId; @@ -74,27 +74,27 @@ int32_t DCameraSourceController::StartCapture(std::vector buffer = std::make_shared(jsonStr.length() + 1); ret = memcpy_s(buffer->Data(), buffer->Capacity(), reinterpret_cast(const_cast(jsonStr.c_str())), jsonStr.length()); if (ret != EOK) { - DHLOGE("memcpy_s failed %d, devId: %s, dhId: %s", ret, + DCLOGE("memcpy_s failed %d, devId: %s, dhId: %s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return ret; } ret = channel_->SendData(buffer); if (ret != DCAMERA_OK) { - DHLOGE("SendData failed %d, devId: %s, dhId: %s", ret, + DCLOGE("SendData failed %d, devId: %s, dhId: %s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return ret; } - DHLOGI("StartCapture devId: %s, dhId: %s success", GetAnonyString(devId).c_str(), + DCLOGI("StartCapture devId: %s, dhId: %s success", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return DCAMERA_OK; } @@ -102,25 +102,25 @@ int32_t DCameraSourceController::StartCapture(std::vector DCAMERA_MAX_NUM) { - DHLOGE("StopCapture not support operate %d camera", indexs_.size()); + DCLOGE("StopCapture not support operate %d camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } std::string dhId = indexs_.begin()->dhId_; std::string devId = indexs_.begin()->devId_; - DHLOGI("StopCapture devId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); + DCLOGI("StopCapture devId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteCamSrv(devId); if (camSinkSrv == nullptr) { - DHLOGE("can not get service, devId: %s", GetAnonyString(devId).c_str()); + DCLOGE("can not get service, devId: %s", GetAnonyString(devId).c_str()); return DCAMERA_BAD_OPERATE; } int32_t ret = camSinkSrv->StopCapture(dhId); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture failed: %d, devId: %s, dhId: %s", ret, + DCLOGE("StopCapture failed: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return DCAMERA_BAD_OPERATE; } - DHLOGI("StopCapture devId: %s, dhId: %s success", GetAnonyString(devId).c_str(), + DCLOGI("StopCapture devId: %s, dhId: %s success", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return DCAMERA_OK; } @@ -128,17 +128,17 @@ int32_t DCameraSourceController::StopCapture() int32_t DCameraSourceController::ChannelNeg(std::shared_ptr& info) { if (indexs_.size() > DCAMERA_MAX_NUM) { - DHLOGE("ChannelNeg not support operate %d camera", indexs_.size()); + DCLOGE("ChannelNeg not support operate %d camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } std::string dhId = indexs_.begin()->dhId_; std::string devId = indexs_.begin()->devId_; - DHLOGI("ChannelNeg devId: %s, dhId: %s", GetAnonyString(devId).c_str(), + DCLOGI("ChannelNeg devId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteCamSrv(devId); if (camSinkSrv == nullptr) { - DHLOGE("can not get service, devId: %s", GetAnonyString(devId).c_str()); + DCLOGE("can not get service, devId: %s", GetAnonyString(devId).c_str()); return DCAMERA_BAD_OPERATE; } DCameraChannelInfoCmd cmd; @@ -149,19 +149,19 @@ int32_t DCameraSourceController::ChannelNeg(std::shared_ptr& std::string jsonStr; int32_t ret = cmd.Marshal(jsonStr); if (ret != DCAMERA_OK) { - DHLOGE("Marshal failed ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("Marshal failed ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return ret; } - DHLOGD("devId: %s, dhId: %s channelNegCommand: %s", + DCLOGD("devId: %s, dhId: %s channelNegCommand: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), cmd.command_.c_str()); ret = camSinkSrv->ChannelNeg(dhId, jsonStr); if (ret != DCAMERA_OK) { - DHLOGE("ChannelNeg rpc failed ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("ChannelNeg rpc failed ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return ret; } - DHLOGD("DCameraSourceController ChannelNeg devId: %s, dhId: %s success", GetAnonyString(devId).c_str(), + DCLOGD("DCameraSourceController ChannelNeg devId: %s, dhId: %s success", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return DCAMERA_OK; } @@ -173,7 +173,7 @@ int32_t DCameraSourceController::DCameraNotify(std::shared_ptr& ev DcameraFinishAsyncTrace(DCAMERA_SNAPSHOT_FIRST_FRAME, DCAMERA_SNAPSHOT_FIRST_FRAME_TASKID); } if (camHdiProvider_ == nullptr) { - DHLOGI("DCameraNotify camHdiProvider is nullptr devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraNotify camHdiProvider is nullptr devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return DCAMERA_BAD_OPERATE; } @@ -185,7 +185,7 @@ int32_t DCameraSourceController::DCameraNotify(std::shared_ptr& ev hdiEvent.result_ = events->eventResult_; hdiEvent.content_ = events->eventContent_; int32_t retHdi = camHdiProvider_->Notify(dhBase, hdiEvent); - DHLOGI("Nofify hal, ret: %d, devId: %s dhId: %s, type: %d, result: %d, content: %s", retHdi, + DCLOGI("Nofify hal, ret: %d, devId: %s dhId: %s, type: %d, result: %d, content: %s", retHdi, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), events->eventType_, events->eventResult_, events->eventContent_.c_str()); if (retHdi != SUCCESS) { @@ -197,13 +197,13 @@ int32_t DCameraSourceController::DCameraNotify(std::shared_ptr& ev int32_t DCameraSourceController::UpdateSettings(std::vector>& settings) { if (indexs_.size() > DCAMERA_MAX_NUM) { - DHLOGE("UpdateSettings not support operate %d camera", indexs_.size()); + DCLOGE("UpdateSettings not support operate %d camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } std::string dhId = indexs_.begin()->dhId_; std::string devId = indexs_.begin()->devId_; - DHLOGI("UpdateSettings devId: %s, dhId: %s", GetAnonyString(devId).c_str(), + DCLOGI("UpdateSettings devId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); DCameraMetadataSettingCmd cmd; cmd.type_ = DCAMERA_PROTOCOL_TYPE_MESSAGE; @@ -213,7 +213,7 @@ int32_t DCameraSourceController::UpdateSettings(std::vectorData(), buffer->Capacity(), reinterpret_cast(const_cast(jsonStr.c_str())), jsonStr.length()); if (ret != EOK) { - DHLOGE("memcpy_s failed %d, devId: %s, dhId: %s", ret, + DCLOGE("memcpy_s failed %d, devId: %s, dhId: %s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return ret; } ret = channel_->SendData(buffer); if (ret != DCAMERA_OK) { - DHLOGE("SendData failed %d, devId: %s, dhId: %s", ret, + DCLOGE("SendData failed %d, devId: %s, dhId: %s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return ret; } - DHLOGI("UpdateSettings devId: %s, dhId: %s success", GetAnonyString(devId).c_str(), + DCLOGI("UpdateSettings devId: %s, dhId: %s success", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return DCAMERA_OK; } @@ -239,30 +239,30 @@ int32_t DCameraSourceController::UpdateSettings(std::vector& camInfo) { if (indexs_.size() > DCAMERA_MAX_NUM) { - DHLOGE("GetCameraInfo not support operate %d camera", indexs_.size()); + DCLOGE("GetCameraInfo not support operate %d camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } std::string dhId = indexs_.begin()->dhId_; std::string devId = indexs_.begin()->devId_; - DHLOGI("GetCameraInfo devId: %s, dhId: %s", GetAnonyString(devId).c_str(), + DCLOGI("GetCameraInfo devId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteCamSrv(devId); if (camSinkSrv == nullptr) { - DHLOGE("can not get service, devId: %s", GetAnonyString(devId).c_str()); + DCLOGE("can not get service, devId: %s", GetAnonyString(devId).c_str()); return DCAMERA_BAD_OPERATE; } std::string camInfoJson; int32_t ret = camSinkSrv->GetCameraInfo(dhId, camInfoJson); if (ret != DCAMERA_OK) { - DHLOGE("GetCameraInfo failed: %d, devId: %s, dhId: %s", ret, + DCLOGE("GetCameraInfo failed: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return ret; } DCameraInfoCmd cmd; ret = cmd.Unmarshal(camInfoJson); if (ret != DCAMERA_OK) { - DHLOGE("DCameraInfoCmd Unmarshal failed: %d", ret); + DCLOGE("DCameraInfoCmd Unmarshal failed: %d", ret); return ret; } camInfo = cmd.value_; @@ -272,16 +272,16 @@ int32_t DCameraSourceController::GetCameraInfo(std::shared_ptr& cam int32_t DCameraSourceController::OpenChannel(std::shared_ptr& openInfo) { if (indexs_.size() > DCAMERA_MAX_NUM) { - DHLOGE("OpenChannel not support operate %d camera", indexs_.size()); + DCLOGE("OpenChannel not support operate %d camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } std::string dhId = indexs_.begin()->dhId_; std::string devId = indexs_.begin()->devId_; - DHLOGI("OpenChannel devId: %s, dhId: %s", GetAnonyString(devId).c_str(), + DCLOGI("OpenChannel devId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteCamSrv(devId); if (camSinkSrv == nullptr) { - DHLOGE("DCameraSourceController can not get service, devId: %s", GetAnonyString(devId).c_str()); + DCLOGE("DCameraSourceController can not get service, devId: %s", GetAnonyString(devId).c_str()); return DCAMERA_BAD_OPERATE; } std::string jsonStr; @@ -292,27 +292,27 @@ int32_t DCameraSourceController::OpenChannel(std::shared_ptr& o cmd.value_ = openInfo; int32_t ret = cmd.Marshal(jsonStr); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceController Marshal OpenInfo failed %d", ret); + DCLOGE("DCameraSourceController Marshal OpenInfo failed %d", ret); return ret; } ret = camSinkSrv->OpenChannel(dhId, jsonStr); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceController SA OpenChannel failed %d", ret); + DCLOGE("DCameraSourceController SA OpenChannel failed %d", ret); return ret; } - DHLOGD("DCameraSourceController OpenChannel devId: %s, dhId: %s success", GetAnonyString(devId).c_str(), + DCLOGD("DCameraSourceController OpenChannel devId: %s, dhId: %s success", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); std::vector indexs; indexs.push_back(DCameraIndex(devId, dhId)); ret = channel_->CreateSession(indexs, SESSION_FLAG, DCAMERA_SESSION_MODE_CTRL, listener_); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceController CreateSession failed %d", ret); + DCLOGE("DCameraSourceController CreateSession failed %d", ret); return ret; } ret = channel_->OpenSession(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceController OpenSession failed."); + DCLOGE("DCameraSourceController OpenSession failed."); PostChannelDisconnectedEvent(); return ret; } @@ -322,31 +322,31 @@ int32_t DCameraSourceController::OpenChannel(std::shared_ptr& o int32_t DCameraSourceController::CloseChannel() { if (indexs_.size() > DCAMERA_MAX_NUM) { - DHLOGE("CloseChannel not support operate %d camera", indexs_.size()); + DCLOGE("CloseChannel not support operate %d camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } DCameraLowLatency::GetInstance().DisableLowLatency(); DCameraSoftbusLatency::GetInstance().StopSoftbusTimeSync(devId_); std::string dhId = indexs_.begin()->dhId_; std::string devId = indexs_.begin()->devId_; - DHLOGI("CloseChannel devId: %s, dhId: %s", GetAnonyString(devId).c_str(), + DCLOGI("CloseChannel devId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); int32_t ret = channel_->CloseSession(); if (ret != DCAMERA_OK) { - DHLOGE("CloseSession failed %d", ret); + DCLOGE("CloseSession failed %d", ret); } - DHLOGI("CloseChannel devId: %s, dhId: %s success", GetAnonyString(devId).c_str(), + DCLOGI("CloseChannel devId: %s, dhId: %s success", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); channelState_ = DCAMERA_CHANNEL_STATE_DISCONNECTED; ret = channel_->ReleaseSession(); if (ret != DCAMERA_OK) { - DHLOGE("ReleaseSession failed %d", ret); + DCLOGE("ReleaseSession failed %d", ret); } sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteCamSrv(devId); if (camSinkSrv != nullptr) { ret = camSinkSrv->CloseChannel(dhId); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceController SA CloseChannel failed %d", ret); + DCLOGE("DCameraSourceController SA CloseChannel failed %d", ret); } DCameraSourceServiceIpc::GetInstance().DeleteSinkRemoteCamSrv(devId); } @@ -355,14 +355,14 @@ int32_t DCameraSourceController::CloseChannel() int32_t DCameraSourceController::Init(std::vector& indexs) { - DHLOGI("DCameraSourceController Init"); + DCLOGI("DCameraSourceController Init"); if (indexs.size() > DCAMERA_MAX_NUM) { - DHLOGE("DCameraSourceController init error"); + DCLOGE("DCameraSourceController init error"); return DCAMERA_INIT_ERR; } camHdiProvider_ = IDCameraProvider::Get(HDF_DCAMERA_EXT_SERVICE); if (camHdiProvider_ == nullptr) { - DHLOGE("camHdiProvider_ is null."); + DCLOGE("camHdiProvider_ is null."); } indexs_.assign(indexs.begin(), indexs.end()); std::string dhId = indexs_.begin()->dhId_; @@ -370,7 +370,7 @@ int32_t DCameraSourceController::Init(std::vector& indexs) auto controller = std::shared_ptr(shared_from_this()); listener_ = std::make_shared(controller); channel_ = std::make_shared(); - DHLOGI("DCameraSourceController Init GetProvider end devId: %s, dhId: %s", GetAnonyString(devId).c_str(), + DCLOGI("DCameraSourceController Init GetProvider end devId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); isInit = true; return DCAMERA_OK; @@ -378,7 +378,7 @@ int32_t DCameraSourceController::Init(std::vector& indexs) int32_t DCameraSourceController::UnInit() { - DHLOGI("DCameraSourceController UnInit"); + DCLOGI("DCameraSourceController UnInit"); indexs_.clear(); isInit = false; isChannelConnected_.store(false); @@ -387,7 +387,7 @@ int32_t DCameraSourceController::UnInit() void DCameraSourceController::OnSessionState(int32_t state) { - DHLOGI("DCameraSourceController OnSessionState state %d", state); + DCLOGI("DCameraSourceController OnSessionState state %d", state); channelState_ = state; switch (state) { case DCAMERA_CHANNEL_STATE_CONNECTED: { @@ -397,7 +397,7 @@ void DCameraSourceController::OnSessionState(int32_t state) stateMachine_->UpdateState(DCAMERA_STATE_OPENED); std::shared_ptr camDev = camDev_.lock(); if (camDev == nullptr) { - DHLOGE("DCameraSourceController OnSessionState camDev is nullptr"); + DCLOGE("DCameraSourceController OnSessionState camDev is nullptr"); break; } camDev->OnChannelConnectedEvent(); @@ -405,7 +405,7 @@ void DCameraSourceController::OnSessionState(int32_t state) } case DCAMERA_CHANNEL_STATE_DISCONNECTED: { DcameraFinishAsyncTrace(DCAMERA_OPEN_CHANNEL_CONTROL, DCAMERA_OPEN_CHANNEL_TASKID); - DHLOGI("DCameraSourceDev PostTask Controller CloseSession OnClose devId %s dhId %s", + DCLOGI("DCameraSourceDev PostTask Controller CloseSession OnClose devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); isChannelConnected_.store(false); PostChannelDisconnectedEvent(); @@ -419,7 +419,7 @@ void DCameraSourceController::OnSessionState(int32_t state) void DCameraSourceController::OnSessionError(int32_t eventType, int32_t eventReason, std::string detail) { - DHLOGI("DCameraSourceController OnSessionError devId: %s, dhId: %s, eventType: %d, eventReason: %d, detail %s", + DCLOGI("DCameraSourceController OnSessionError devId: %s, dhId: %s, eventType: %d, eventReason: %d, detail %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), eventType, eventReason, detail.c_str()); return; } @@ -427,7 +427,7 @@ void DCameraSourceController::OnSessionError(int32_t eventType, int32_t eventRea void DCameraSourceController::OnDataReceived(std::vector>& buffers) { if (buffers.empty()) { - DHLOGI("DCameraSourceController OnDataReceived empty, devId: %s, dhId: %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceController OnDataReceived empty, devId: %s, dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return; } @@ -456,14 +456,14 @@ void DCameraSourceController::OnDataReceived(std::vectortype_; setting.value_ = (*iter)->value_; int32_t retHdi = camHdiProvider_->OnSettingsResult(dhBase, setting); - DHLOGI("OnSettingsResult hal, ret: %d, devId: %s dhId: %s", retHdi, GetAnonyString(devId_).c_str(), + DCLOGI("OnSettingsResult hal, ret: %d, devId: %s dhId: %s", retHdi, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } } @@ -484,11 +484,11 @@ int32_t DCameraSourceController::WaitforSessionResult(const std::string& devId) { isChannelConnected_.store(false); std::unique_lock lck(channelMtx_); - DHLOGD("wait for channel session callback notify."); + DCLOGD("wait for channel session callback notify."); bool isChannelConnected = channelCond_.wait_for(lck, std::chrono::seconds(CHANNEL_REL_SECONDS), [this]() { return isChannelConnected_.load(); }); if (!isChannelConnected) { - DHLOGE("wait for channel session callback timeout(%ds).", + DCLOGE("wait for channel session callback timeout(%ds).", CHANNEL_REL_SECONDS); PostChannelDisconnectedEvent(); return DCAMERA_BAD_VALUE; @@ -502,7 +502,7 @@ void DCameraSourceController::PostChannelDisconnectedEvent() { std::shared_ptr camDev = camDev_.lock(); if (camDev == nullptr) { - DHLOGE("DCameraSourceController PostChannelDisconnectedEvent camDev is nullptr"); + DCLOGE("DCameraSourceController PostChannelDisconnectedEvent camDev is nullptr"); return; } camDev->OnChannelDisconnectedEvent(); 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 289c6024e65db82c68e5524e2f41506b6c73ffce..b7202eca7793b93725c6e4e27edda3db60e0c8d2 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 @@ -16,7 +16,7 @@ #include "dcamera_source_controller_channel_listener.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "dcamera_source_controller.h" @@ -35,7 +35,7 @@ void DCameraSourceControllerChannelListener::OnSessionState(int32_t state) { std::shared_ptr controller = controller_.lock(); if (controller == nullptr) { - DHLOGE("DCameraSourceController OnSessionState not found controller"); + DCLOGE("DCameraSourceController OnSessionState not found controller"); return; } @@ -46,7 +46,7 @@ void DCameraSourceControllerChannelListener::OnSessionError(int32_t eventType, i { std::shared_ptr controller = controller_.lock(); if (controller == nullptr) { - DHLOGE("DCameraSourceController OnSessionError not found controller"); + DCLOGE("DCameraSourceController OnSessionError not found controller"); return; } @@ -57,7 +57,7 @@ void DCameraSourceControllerChannelListener::OnDataReceived(std::vector controller = controller_.lock(); if (controller == nullptr) { - DHLOGE("DCameraSourceController OnDataReceived not found controller"); + DCLOGE("DCameraSourceController OnDataReceived not found controller"); return; } 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 e8cf1e2db54210e1d7412686a1183035fd7c0ccc..066ff1903077e4998b2104d961c6bff6e6b7baa1 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 @@ -19,20 +19,20 @@ #include "dcamera_hitrace_adapter.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { DCameraSourceDataProcess::DCameraSourceDataProcess(std::string devId, std::string dhId, DCStreamType streamType) : devId_(devId), dhId_(dhId), streamType_(streamType), isFirstContStream_(true) { - DHLOGI("DCameraSourceDataProcess Constructor devId %s dhId %s streamType %d", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDataProcess Constructor devId %s dhId %s streamType %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_); } DCameraSourceDataProcess::~DCameraSourceDataProcess() { - DHLOGI("DCameraSourceDataProcess Destructor devId %s dhId %s streamType %d", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDataProcess Destructor devId %s dhId %s streamType %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_); streamProcess_.clear(); streamIds_.clear(); @@ -47,13 +47,13 @@ int32_t DCameraSourceDataProcess::FeedStream(std::vector DCAMERA_MAX_NUM) { - DHLOGI("DCameraSourceDataProcess FeedStream devId %s dhId %s size: %d over flow", + DCLOGI("DCameraSourceDataProcess FeedStream devId %s dhId %s size: %d over flow", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), buffers.size()); return DCAMERA_BAD_VALUE; } auto buffer = *(buffers.begin()); - DHLOGD("DCameraSourceDataProcess FeedStream devId %s dhId %s streamType %d streamSize: %d", + DCLOGD("DCameraSourceDataProcess FeedStream devId %s dhId %s streamType %d streamSize: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, buffer->Size()); std::lock_guard autoLock(streamMutex_); for (auto iter = streamProcess_.begin(); iter != streamProcess_.end(); iter++) { @@ -64,10 +64,10 @@ int32_t DCameraSourceDataProcess::FeedStream(std::vector>& streamInfos) { - DHLOGI("DCameraSourceDataProcess ConfigStreams devId %s dhId %s streamType %d size %d", + DCLOGI("DCameraSourceDataProcess ConfigStreams devId %s dhId %s streamType %d size %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamInfos.size()); if (streamInfos.empty()) { - DHLOGI("DCameraSourceDataProcess ConfigStreams is empty"); + DCLOGI("DCameraSourceDataProcess ConfigStreams is empty"); return DCAMERA_OK; } std::map> streamConfigs; @@ -75,7 +75,7 @@ int32_t DCameraSourceDataProcess::ConfigStreams(std::vector streamInfo = *iter; DCameraStreamConfig streamConfig(streamInfo->width_, streamInfo->height_, streamInfo->format_, streamInfo->dataspace_, streamInfo->encodeType_, streamInfo->type_); - DHLOGI("DCameraSourceDataProcess ConfigStreams devId %s dhId %s, streamId: %d info: width: %d, height: %d," + + DCLOGI("DCameraSourceDataProcess ConfigStreams devId %s dhId %s, streamId: %d info: width: %d, height: %d," + "format: %d, dataspace: %d, encodeType: %d streamType: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamInfo->streamId_, streamConfig.width_, streamConfig.height_, streamConfig.format_, streamConfig.dataspace_, streamConfig.encodeType_, streamConfig.type_); @@ -88,7 +88,7 @@ int32_t DCameraSourceDataProcess::ConfigStreams(std::vectorfirst.width_, iter->first.height_, iter->first.format_, iter->first.dataspace_, iter->first.encodeType_, iter->first.type_); @@ -108,7 +108,7 @@ int32_t DCameraSourceDataProcess::ConfigStreams(std::vector& streamIds) { - DHLOGI("DCameraSourceDataProcess ReleaseStreams devId %s dhId %s streamType: %d", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDataProcess ReleaseStreams devId %s dhId %s streamType: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_); std::lock_guard autoLock(streamMutex_); std::set streamIdSet(streamIds.begin(), streamIds.end()); @@ -129,7 +129,7 @@ int32_t DCameraSourceDataProcess::ReleaseStreams(std::vector& streamIds strStreams += (std::to_string(*iterSet) + std::string(" ")); streamIds_.erase(*iterSet); } - DHLOGI("DCameraSourceDataProcess ReleaseStreams devId %s dhId %s streamType: %d streamProcessSize: %d streams: %s", + DCLOGI("DCameraSourceDataProcess ReleaseStreams devId %s dhId %s streamType: %d streamProcessSize: %d streams: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamProcess_.size(), strStreams.c_str()); return DCAMERA_OK; @@ -137,7 +137,7 @@ int32_t DCameraSourceDataProcess::ReleaseStreams(std::vector& streamIds int32_t DCameraSourceDataProcess::StartCapture(std::shared_ptr& captureInfo) { - DHLOGI("DCameraSourceDataProcess StartCapture devId %s dhId %s width: %d, height: %d, format: %d, isCapture: %d," + + DCLOGI("DCameraSourceDataProcess StartCapture devId %s dhId %s width: %d, height: %d, format: %d, isCapture: %d," + "dataspace: %d, encodeType: %d, streamType: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), captureInfo->width_, captureInfo->height_, captureInfo->format_, captureInfo->isCapture_, captureInfo->dataspace_, captureInfo->encodeType_, captureInfo->type_); @@ -150,7 +150,7 @@ int32_t DCameraSourceDataProcess::StartCapture(std::shared_ptr& c captureInfo->dataspace_, captureInfo->encodeType_, captureInfo->type_); std::set streamIds(captureInfo->streamIds_.begin(), captureInfo->streamIds_.end()); for (auto iterSet = streamIds.begin(); iterSet != streamIds.end(); iterSet++) { - DHLOGI("DCameraSourceDataProcess StartCapture devId %s dhId %s StartCapture id: %d", + DCLOGI("DCameraSourceDataProcess StartCapture devId %s dhId %s StartCapture id: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), *iterSet); } for (auto iter = streamProcess_.begin(); iter != streamProcess_.end(); iter++) { @@ -161,11 +161,11 @@ int32_t DCameraSourceDataProcess::StartCapture(std::shared_ptr& c int32_t DCameraSourceDataProcess::StopCapture(std::vector& streamIds) { - DHLOGI("DCameraSourceDataProcess StopCapture devId %s dhId %s streamType: %d", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDataProcess StopCapture devId %s dhId %s streamType: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_); std::set streamIdSet(streamIds.begin(), streamIds.end()); for (auto iterSet = streamIdSet.begin(); iterSet != streamIdSet.end(); iterSet++) { - DHLOGI("DCameraSourceDataProcess StopCapture devId %s dhId %s stream id: %d", + DCLOGI("DCameraSourceDataProcess StopCapture devId %s dhId %s stream id: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), *iterSet); } for (auto iter = streamProcess_.begin(); iter != streamProcess_.end(); iter++) { @@ -179,7 +179,7 @@ int32_t DCameraSourceDataProcess::StopCapture(std::vector& streamIds) void DCameraSourceDataProcess::DestroyPipeline() { - DHLOGI("DCameraSourceDataProcess DestroyPipeline devId %s dhId %s streamType: %d", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceDataProcess DestroyPipeline devId %s dhId %s streamType: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_); for (auto iter = streamProcess_.begin(); iter != streamProcess_.end(); iter++) { (*iter)->DestroyPipeline(); @@ -194,7 +194,7 @@ int32_t DCameraSourceDataProcess::GetProducerSize() int32_t size = streamDataProcess->GetProducerSize(); ret += size; } - DHLOGI("DCameraSourceDataProcess GetProducerSize devId %s dhId %s size %d", + DCLOGI("DCameraSourceDataProcess GetProducerSize devId %s dhId %s size %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), ret); return ret; } 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 948f7286783d049c338977ece9a12ea2953dece3..9b8d9486d554dfcd44ecc39897198d5e017d2080 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input.cpp @@ -24,20 +24,20 @@ #include "dcamera_softbus_latency.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { DCameraSourceInput::DCameraSourceInput(std::string devId, std::string dhId, std::shared_ptr& camDev) : devId_(devId), dhId_(dhId), camDev_(camDev), isInit(false) { - DHLOGI("DCameraSourceInput Constructor devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceInput Constructor devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } DCameraSourceInput::~DCameraSourceInput() { - DHLOGI("DCameraSourceInput Destructor devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceInput Destructor devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (isInit) { UnInit(); @@ -46,11 +46,11 @@ DCameraSourceInput::~DCameraSourceInput() int32_t DCameraSourceInput::ConfigStreams(std::vector>& streamInfos) { - DHLOGI("DCameraSourceInput ConfigStreams devId %s dhId %s, size: %d", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceInput ConfigStreams devId %s dhId %s, size: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamInfos.size()); int32_t ret = ReleaseAllStreams(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput ConfigStreams ReleaseAllStreams failed %d devId: %s, dhId: %s", ret, + DCLOGE("DCameraSourceInput ConfigStreams ReleaseAllStreams failed %d devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -63,7 +63,7 @@ int32_t DCameraSourceInput::ConfigStreams(std::vector> continueStreams; for (auto iter = streamInfos.begin(); iter != streamInfos.end(); iter++) { std::shared_ptr streamInfo = *iter; - DHLOGI("DCameraSourceInput ConfigStreams devId: %s, dhId: %s, streamId: %d, width: %d, height: %d," + + DCLOGI("DCameraSourceInput ConfigStreams devId: %s, dhId: %s, streamId: %d, width: %d, height: %d," + "format: %d, dataspace: %d, encodeType:%d streamType: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamInfo->streamId_, streamInfo->width_, streamInfo->height_, streamInfo->format_, streamInfo->dataspace_, streamInfo->encodeType_, streamInfo->type_); @@ -78,13 +78,13 @@ int32_t DCameraSourceInput::ConfigStreams(std::vectorConfigStreams(continueStreams); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput ConfigStreams continue failed %d devId %s dhId %s", ret, + DCLOGE("DCameraSourceInput ConfigStreams continue failed %d devId %s dhId %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); break; } ret = dataProcess_[SNAPSHOT_FRAME]->ConfigStreams(snapStreams); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput ConfigStreams snapshot failed %d devId %s dhId %s", ret, + DCLOGE("DCameraSourceInput ConfigStreams snapshot failed %d devId %s dhId %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); break; } @@ -98,17 +98,17 @@ int32_t DCameraSourceInput::ConfigStreams(std::vector& streamIds, bool& isAllRelease) { - DHLOGI("DCameraSourceInput ReleaseStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceInput ReleaseStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = dataProcess_[CONTINUOUS_FRAME]->ReleaseStreams(streamIds); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput ReleaseStreams continue stream ReleaseStreams ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("DCameraSourceInput ReleaseStreams continue stream ReleaseStreams ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } ret = dataProcess_[SNAPSHOT_FRAME]->ReleaseStreams(streamIds); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput ReleaseStreams snapshot stream ReleaseStreams ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("DCameraSourceInput ReleaseStreams snapshot stream ReleaseStreams ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -125,20 +125,20 @@ int32_t DCameraSourceInput::ReleaseStreams(std::vector& streamIds, bool& is int32_t DCameraSourceInput::StartCapture(std::vector>& captureInfos) { - DHLOGI("DCameraSourceInput StartCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceInput StartCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); for (auto iter = captureInfos.begin(); iter != captureInfos.end(); iter++) { int32_t ret = DCAMERA_OK; for (auto iterSet = (*iter)->streamIds_.begin(); iterSet != (*iter)->streamIds_.end(); iterSet++) { - DHLOGI("DCameraSourceInput StartCapture devId %s dhId %s StartCapture id: %d", + DCLOGI("DCameraSourceInput StartCapture devId %s dhId %s StartCapture id: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), *iterSet); } - DHLOGI("DCameraSourceInput StartCapture Inner devId %s dhId %s streamType: %d idSize: %d isCap: %d", + DCLOGI("DCameraSourceInput StartCapture Inner devId %s dhId %s streamType: %d idSize: %d isCap: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), (*iter)->type_, (*iter)->streamIds_.size(), (*iter)->isCapture_ ? 1 : 0); ret = dataProcess_[(*iter)->type_]->StartCapture(*iter); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput StartCapture ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("DCameraSourceInput StartCapture ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -148,11 +148,11 @@ int32_t DCameraSourceInput::StartCapture(std::vector& streamIds, bool& isAllStop) { - DHLOGI("DCameraSourceInput StopCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceInput StopCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = dataProcess_[CONTINUOUS_FRAME]->StopCapture(streamIds); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput StopCapture continue ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("DCameraSourceInput StopCapture continue ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -164,7 +164,7 @@ int32_t DCameraSourceInput::StopCapture(std::vector& streamIds, bool& isAll dataProcess_[SNAPSHOT_FRAME]->GetAllStreamIds(snapStreamIds); ret = dataProcess_[SNAPSHOT_FRAME]->StopCapture(snapStreamIds); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput StopCapture snapshot ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("DCameraSourceInput StopCapture snapshot ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -174,13 +174,13 @@ int32_t DCameraSourceInput::StopCapture(std::vector& streamIds, bool& isAll int32_t DCameraSourceInput::OpenChannel(std::vector& indexs) { - DHLOGI("DCameraSourceInput OpenChannel devId %s dhId %s continue state: %d, snapshot state: %d", + DCLOGI("DCameraSourceInput OpenChannel devId %s dhId %s continue state: %d, snapshot state: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), channelState_[CONTINUOUS_FRAME], channelState_[SNAPSHOT_FRAME]); if (channelState_[CONTINUOUS_FRAME] == DCAMERA_CHANNEL_STATE_DISCONNECTED) { int32_t ret = EstablishContinuousFrameSession(indexs); if (ret != DCAMERA_OK) { - DHLOGE("esdablish continuous frame failed ret: %d,"+ + DCLOGE("esdablish continuous frame failed ret: %d,"+ "devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -188,7 +188,7 @@ int32_t DCameraSourceInput::OpenChannel(std::vector& indexs) if (channelState_[SNAPSHOT_FRAME] == DCAMERA_CHANNEL_STATE_DISCONNECTED) { int32_t ret = EstablishSnapshotFrameSession(indexs); if (ret != DCAMERA_OK) { - DHLOGE("esdablish snapshot frame failed ret: %d,"+ + DCLOGE("esdablish snapshot frame failed ret: %d,"+ "devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -198,21 +198,21 @@ int32_t DCameraSourceInput::OpenChannel(std::vector& indexs) int32_t DCameraSourceInput::CloseChannel() { - DHLOGI("DCameraSourceInput CloseChannel devId %s dhId %s continue state: %d, snapshot state: %d", + DCLOGI("DCameraSourceInput CloseChannel devId %s dhId %s continue state: %d, snapshot state: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), channelState_[CONTINUOUS_FRAME], channelState_[SNAPSHOT_FRAME]); if (channelState_[CONTINUOUS_FRAME] != DCAMERA_CHANNEL_STATE_DISCONNECTED) { int32_t ret = DCAMERA_OK; ret = channels_[CONTINUOUS_FRAME]->CloseSession(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput CloseChannel continue stream failed ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("DCameraSourceInput CloseChannel continue stream failed ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } channelState_[CONTINUOUS_FRAME] = DCAMERA_CHANNEL_STATE_DISCONNECTED; ret = channels_[CONTINUOUS_FRAME]->ReleaseSession(); if (ret != DCAMERA_OK) { - DHLOGI("DCameraSourceInput release continue session failed: %d devId %s dhId %s", ret, + DCLOGI("DCameraSourceInput release continue session failed: %d devId %s dhId %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } } @@ -221,14 +221,14 @@ int32_t DCameraSourceInput::CloseChannel() int32_t ret = DCAMERA_OK; ret = channels_[SNAPSHOT_FRAME]->CloseSession(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput CloseChannel snapshot stream failed ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("DCameraSourceInput CloseChannel snapshot stream failed ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } channelState_[SNAPSHOT_FRAME] = DCAMERA_CHANNEL_STATE_DISCONNECTED; ret = channels_[SNAPSHOT_FRAME]->ReleaseSession(); if (ret != DCAMERA_OK) { - DHLOGI("DCameraSourceInput release snapshot session failed: %d devId %s dhId %s", ret, + DCLOGI("DCameraSourceInput release snapshot session failed: %d devId %s dhId %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } } @@ -237,7 +237,7 @@ int32_t DCameraSourceInput::CloseChannel() int32_t DCameraSourceInput::Init() { - DHLOGI("DCameraSourceInput Init devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceInput Init devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); auto input = std::shared_ptr(shared_from_this()); std::shared_ptr conDataProcess = std::make_shared(devId_, dhId_, @@ -260,14 +260,14 @@ int32_t DCameraSourceInput::Init() dataProcess_.emplace(SNAPSHOT_FRAME, snapDataProcess); channelState_.emplace(SNAPSHOT_FRAME, DCAMERA_CHANNEL_STATE_DISCONNECTED); isInit = true; - DHLOGI("DCameraSourceInput Init devId end %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceInput Init devId end %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSourceInput::UnInit() { - DHLOGI("DCameraSourceInput UnInit devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraSourceInput UnInit devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); channels_.clear(); listeners_.clear(); @@ -285,13 +285,13 @@ int32_t DCameraSourceInput::UpdateSettings(std::vectorframeInfo_.offset = DCameraSoftbusLatency::GetInstance().GetTimeSyncInfo(devId_); int32_t ret = dataProcess_[streamType]->FeedStream(buffers); if (ret != DCAMERA_OK) { - DHLOGE("OnDataReceived FeedStream %d stream failed ret: %d, devId: %s, dhId: %s", streamType, + DCLOGE("OnDataReceived FeedStream %d stream failed ret: %d, devId: %s, dhId: %s", streamType, ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } } int32_t DCameraSourceInput::ReleaseAllStreams() { - DHLOGI("ReleaseAllStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("ReleaseAllStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); std::vector continueStreamIds; dataProcess_[CONTINUOUS_FRAME]->GetAllStreamIds(continueStreamIds); int32_t ret = dataProcess_[CONTINUOUS_FRAME]->ReleaseStreams(continueStreamIds); if (ret != DCAMERA_OK) { - DHLOGE("continue stream ReleaseStreams ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("continue stream ReleaseStreams ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -355,7 +355,7 @@ int32_t DCameraSourceInput::ReleaseAllStreams() dataProcess_[SNAPSHOT_FRAME]->GetAllStreamIds(snapStreamIds); ret = dataProcess_[SNAPSHOT_FRAME]->ReleaseStreams(snapStreamIds); if (ret != DCAMERA_OK) { - DHLOGE("ReleaseAllStreams snapshot stream ReleaseStreams ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("ReleaseAllStreams snapshot stream ReleaseStreams ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -364,13 +364,13 @@ int32_t DCameraSourceInput::ReleaseAllStreams() int32_t DCameraSourceInput::StopAllCapture() { - DHLOGI("StopAllCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("StopAllCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); std::vector continueStreamIds; dataProcess_[CONTINUOUS_FRAME]->GetAllStreamIds(continueStreamIds); int32_t ret = dataProcess_[CONTINUOUS_FRAME]->StopCapture(continueStreamIds); if (ret != DCAMERA_OK) { - DHLOGE("StopAllCapture continue ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("StopAllCapture continue ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -379,7 +379,7 @@ int32_t DCameraSourceInput::StopAllCapture() dataProcess_[SNAPSHOT_FRAME]->GetAllStreamIds(snapStreamIds); ret = dataProcess_[SNAPSHOT_FRAME]->StopCapture(snapStreamIds); if (ret != DCAMERA_OK) { - DHLOGE("StopAllCapture snapshot ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("StopAllCapture snapshot ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -390,7 +390,7 @@ void DCameraSourceInput::PostChannelDisconnectedEvent() { std::shared_ptr camDev = camDev_.lock(); if (camDev == nullptr) { - DHLOGE("DCameraSourceInput PostChannelDisconnectedEvent camDev is nullptr"); + DCLOGE("DCameraSourceInput PostChannelDisconnectedEvent camDev is nullptr"); return; } camDev->OnChannelDisconnectedEvent(); @@ -400,11 +400,11 @@ int32_t DCameraSourceInput::WaitforSessionResult() { isChannelConnected_.store(false); std::unique_lock lck(channelMtx_); - DHLOGD("wait for channel session callback notify."); + DCLOGD("wait for channel session callback notify."); bool isChannelConnected = channelCond_.wait_for(lck, std::chrono::seconds(CHANNEL_REL_SECONDS), [this]() { return isChannelConnected_.load(); }); if (!isChannelConnected) { - DHLOGE("wait for channel session callback timeout(%ds).", + DCLOGE("wait for channel session callback timeout(%ds).", CHANNEL_REL_SECONDS); PostChannelDisconnectedEvent(); return DCAMERA_BAD_VALUE; @@ -418,7 +418,7 @@ int32_t DCameraSourceInput::EstablishContinuousFrameSession(std::vectorCreateSession(indexs, CONTINUE_SESSION_FLAG, DCAMERA_SESSION_MODE_VIDEO, listeners_[CONTINUOUS_FRAME]); if (ret != DCAMERA_OK) { - DHLOGE("Create Session failed ret: %d,"+ + DCLOGE("Create Session failed ret: %d,"+ "devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DcameraFinishAsyncTrace(DCAMERA_OPEN_DATA_CONTINUE, DCAMERA_OPEN_DATA_CONTINUE_TASKID); return ret; @@ -426,7 +426,7 @@ int32_t DCameraSourceInput::EstablishContinuousFrameSession(std::vectorOpenSession(); if (ret != DCAMERA_OK) { - DHLOGE("open session failed ret: %d,"+ + DCLOGE("open session failed ret: %d,"+ "devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); PostChannelDisconnectedEvent(); DcameraFinishAsyncTrace(DCAMERA_OPEN_DATA_CONTINUE, DCAMERA_OPEN_DATA_CONTINUE_TASKID); @@ -435,7 +435,7 @@ int32_t DCameraSourceInput::EstablishContinuousFrameSession(std::vectorCreateSession(indexs, SNAP_SHOT_SESSION_FLAG, DCAMERA_SESSION_MODE_JPEG, listeners_[SNAPSHOT_FRAME]); if (ret != DCAMERA_OK) { - DHLOGE("create session failed ret: %d,"+ + DCLOGE("create session failed ret: %d,"+ "devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DcameraFinishAsyncTrace(DCAMERA_OPEN_DATA_SNAPSHOT, DCAMERA_OPEN_DATA_SNAPSHOT_TASKID); return ret; @@ -458,7 +458,7 @@ int32_t DCameraSourceInput::EstablishSnapshotFrameSession(std::vectorOpenSession(); if (ret != DCAMERA_OK) { - DHLOGE("open session failed ret: %d,"+ + DCLOGE("open session failed ret: %d,"+ "devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); PostChannelDisconnectedEvent(); DcameraFinishAsyncTrace(DCAMERA_OPEN_DATA_SNAPSHOT, DCAMERA_OPEN_DATA_SNAPSHOT_TASKID); @@ -467,7 +467,7 @@ int32_t DCameraSourceInput::EstablishSnapshotFrameSession(std::vector input = input_.lock(); if (input == nullptr) { - DHLOGE("DCameraSourceInput OnSessionState not found input"); + DCLOGE("DCameraSourceInput OnSessionState not found input"); return; } @@ -46,7 +46,7 @@ void DCameraSourceInputChannelListener::OnSessionError(int32_t eventType, int32_ { std::shared_ptr input = input_.lock(); if (input == nullptr) { - DHLOGE("DCameraSourceInput OnSessionError not found input"); + DCLOGE("DCameraSourceInput OnSessionError not found input"); return; } @@ -57,7 +57,7 @@ void DCameraSourceInputChannelListener::OnDataReceived(std::vector input = input_.lock(); if (input == nullptr) { - DHLOGE("DCameraSourceInput OnDataReceived not found input"); + DCLOGE("DCameraSourceInput OnDataReceived not found input"); return; } 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 2693db07c401f19dca8b32510439dc1c8274a3a3..ef3e76edfbaa36e2ab086a5b82113e8545b4cf0e 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 @@ -18,7 +18,7 @@ #include "anonymous_string.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "dcamera_pipeline_source.h" #include "dcamera_stream_data_process_pipeline_listener.h" @@ -28,7 +28,7 @@ namespace DistributedHardware { DCameraStreamDataProcess::DCameraStreamDataProcess(std::string devId, std::string dhId, DCStreamType streamType) : devId_(devId), dhId_(dhId), streamType_(streamType) { - DHLOGI("DCameraStreamDataProcess Constructor devId %s dhId %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraStreamDataProcess Constructor devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); pipeline_ = nullptr; listener_ = nullptr; @@ -36,7 +36,7 @@ DCameraStreamDataProcess::DCameraStreamDataProcess(std::string devId, std::strin DCameraStreamDataProcess::~DCameraStreamDataProcess() { - DHLOGI("DCameraStreamDataProcess Destructor devId %s dhId %s streamType: %d", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraStreamDataProcess Destructor devId %s dhId %s streamType: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_); streamIds_.clear(); producers_.clear(); @@ -48,7 +48,7 @@ DCameraStreamDataProcess::~DCameraStreamDataProcess() void DCameraStreamDataProcess::FeedStream(std::shared_ptr& buffer) { for (auto streamId : streamIds_) { - DHLOGD("FeedStream devId %s dhId %s streamId %d streamType %d streamSize: %d", + DCLOGD("FeedStream devId %s dhId %s streamId %d streamType %d streamSize: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId, streamType_, buffer->Size()); } switch (streamType_) { @@ -69,7 +69,7 @@ void DCameraStreamDataProcess::ConfigStreams(std::shared_ptr& streamIds) { for (auto streamId : streamIds) { - DHLOGI("ConfigStreams devId %s dhId %s streamId %d, width: %d, height: %d, " + + DCLOGI("ConfigStreams devId %s dhId %s streamId %d, width: %d, height: %d, " + "format: %d, dataspace: %d, encodeType: %d, streamType: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId, dstConfig->width_, dstConfig->height_, dstConfig->format_, dstConfig->dataspace_, dstConfig->encodeType_, dstConfig->type_); @@ -81,13 +81,13 @@ void DCameraStreamDataProcess::ConfigStreams(std::shared_ptr& streamIds) { for (auto streamId : streamIds) { - DHLOGI("ReleaseStreams devId %s dhId %s streamId %d streamType %d", + DCLOGI("ReleaseStreams devId %s dhId %s streamId %d streamType %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId, streamType_); } std::lock_guard autoLock(producerMutex_); for (auto iter = streamIds.begin(); iter != streamIds.end(); iter++) { int32_t streamId = *iter; - DHLOGI("ReleaseStreams devId %s dhId %s streamId: %d", GetAnonyString(devId_).c_str(), + DCLOGI("ReleaseStreams devId %s dhId %s streamId: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId); streamIds_.erase(streamId); auto producerIter = producers_.find(streamId); @@ -103,7 +103,7 @@ void DCameraStreamDataProcess::StartCapture(std::shared_ptr std::set& streamIds) { for (auto iter = streamIds.begin(); iter != streamIds.end(); iter++) { - DHLOGI("StartCapture devId %s dhId %s streamType: %d streamId: %d, " + + DCLOGI("StartCapture devId %s dhId %s streamType: %d streamId: %d, " + "srcConfig: width: %d, height: %d, format: %d, dataspace: %d, streamType: %d, encodeType: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, *iter, srcConfig->width_, srcConfig->height_, srcConfig->format_, srcConfig->dataspace_, @@ -117,18 +117,18 @@ void DCameraStreamDataProcess::StartCapture(std::shared_ptr std::lock_guard autoLock(producerMutex_); for (auto iter = streamIds_.begin(); iter != streamIds_.end(); iter++) { uint32_t streamId = *iter; - DHLOGI("StartCapture streamId: %d", streamId); + DCLOGI("StartCapture streamId: %d", streamId); if (streamIds.find(streamId) == streamIds.end()) { continue; } - DHLOGI("StartCapture findProducer devId %s dhId %s streamType: %d streamId: %d", + DCLOGI("StartCapture findProducer devId %s dhId %s streamType: %d streamId: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId); auto producerIter = producers_.find(streamId); if (producerIter != producers_.end()) { continue; } - DHLOGI("StartCapture CreateProducer devId %s dhId %s streamType: %d streamId: %d", + DCLOGI("StartCapture CreateProducer devId %s dhId %s streamType: %d streamId: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId); producers_[streamId] = std::make_shared(devId_, dhId_, streamId, streamType_); @@ -140,27 +140,27 @@ void DCameraStreamDataProcess::StartCapture(std::shared_ptr void DCameraStreamDataProcess::StopCapture(std::set& streamIds) { for (auto iter = streamIds.begin(); iter != streamIds.end(); iter++) { - DHLOGI("StopCapture devId %s dhId %s streamType: %d streamId: %d", + DCLOGI("StopCapture devId %s dhId %s streamType: %d streamId: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, *iter); } { std::lock_guard autoLock(producerMutex_); for (auto iter = streamIds_.begin(); iter != streamIds_.end(); iter++) { uint32_t streamId = *iter; - DHLOGI("StopCapture streamId: %d", streamId); + DCLOGI("StopCapture streamId: %d", streamId); if (streamIds.find(streamId) == streamIds.end()) { continue; } - DHLOGI("StopCapture findProducer devId %s dhId %s streamType: %d streamId: %d", + DCLOGI("StopCapture findProducer devId %s dhId %s streamType: %d streamId: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId); auto producerIter = producers_.find(streamId); if (producerIter == producers_.end()) { - DHLOGE("StopCapture no producer, devId %s dhId %s streamType: %d streamId: %d", + DCLOGE("StopCapture no producer, devId %s dhId %s streamType: %d streamId: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId); continue; } - DHLOGI("StopCapture stop producer, devId %s dhId %s streamType: %d streamId: %d", + DCLOGI("StopCapture stop producer, devId %s dhId %s streamType: %d streamId: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId); producerIter->second->Stop(); producerIter = producers_.erase(producerIter); @@ -175,7 +175,7 @@ void DCameraStreamDataProcess::GetAllStreamIds(std::set& streamIds) int32_t DCameraStreamDataProcess::GetProducerSize() { - DHLOGI("DCameraStreamDataProcess GetProducerSize devId %s dhId %s", + DCLOGI("DCameraStreamDataProcess GetProducerSize devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); std::lock_guard autoLock(producerMutex_); return producers_.size(); @@ -183,7 +183,7 @@ int32_t DCameraStreamDataProcess::GetProducerSize() void DCameraStreamDataProcess::FeedStreamToSnapShot(const std::shared_ptr& buffer) { - DHLOGD("DCameraStreamDataProcess FeedStreamToSnapShot devId %s dhId %s streamType %d streamSize: %d", + DCLOGD("DCameraStreamDataProcess FeedStreamToSnapShot devId %s dhId %s streamType %d streamSize: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, buffer->Size()); std::lock_guard autoLock(producerMutex_); for (auto iter = producers_.begin(); iter != producers_.end(); iter++) { @@ -193,25 +193,25 @@ void DCameraStreamDataProcess::FeedStreamToSnapShot(const std::shared_ptr& buffer) { - DHLOGD("DCameraStreamDataProcess FeedStreamToContinue devId %s dhId %s streamType %d streamSize: %d", + DCLOGD("DCameraStreamDataProcess FeedStreamToContinue devId %s dhId %s streamType %d streamSize: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, buffer->Size()); std::lock_guard autoLock(pipelineMutex_); std::vector> buffers; buffers.push_back(buffer); if (pipeline_ == nullptr) { - DHLOGE("pipeline null devId %s dhId %s type: %d streamSize: %d", + DCLOGE("pipeline null devId %s dhId %s type: %d streamSize: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, buffer->Size()); return; } int32_t ret = pipeline_->ProcessData(buffers); if (ret != DCAMERA_OK) { - DHLOGE("pipeline ProcessData failed, ret: %d", ret); + DCLOGE("pipeline ProcessData failed, ret: %d", ret); } } void DCameraStreamDataProcess::OnProcessedVideoBuffer(const std::shared_ptr& videoResult) { - DHLOGI("DCameraStreamDataProcess OnProcessedVideoBuffer devId %s dhId %s streamType: %d streamSize: %d", + DCLOGI("DCameraStreamDataProcess OnProcessedVideoBuffer devId %s dhId %s streamType: %d streamSize: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, videoResult->Size()); std::lock_guard autoLock(producerMutex_); for (auto iter = producers_.begin(); iter != producers_.end(); iter++) { @@ -221,16 +221,16 @@ void DCameraStreamDataProcess::OnProcessedVideoBuffer(const std::shared_ptr autoLock(pipelineMutex_); if (pipeline_ != nullptr) { - DHLOGI("DCameraStreamDataProcess CreatePipeline already exist, devId %s dhId %s", + DCLOGI("DCameraStreamDataProcess CreatePipeline already exist, devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return; } @@ -243,13 +243,13 @@ void DCameraStreamDataProcess::CreatePipeline() DCAMERA_PRODUCER_FPS_DEFAULT, dstConfig_->width_, dstConfig_->height_); int32_t ret = pipeline_->CreateDataProcessPipeline(PipelineType::VIDEO, srcParams, dstParams, listener_); if (ret != DCAMERA_OK) { - DHLOGE("DCameraStreamDataProcess CreateDataProcessPipeline type: %d failed, ret: %d", PipelineType::VIDEO, ret); + DCLOGE("DCameraStreamDataProcess CreateDataProcessPipeline type: %d failed, ret: %d", PipelineType::VIDEO, ret); } } void DCameraStreamDataProcess::DestroyPipeline() { - DHLOGI("DCameraStreamDataProcess DestroyPipeline devId %s dhId %s", + DCLOGI("DCameraStreamDataProcess DestroyPipeline devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); std::lock_guard autoLock(pipelineMutex_); if (pipeline_ == nullptr) { 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 22944375c94e869e894e306d7cb89ada414ded83..9769363375bdf0223ea04b654b8338a8edcf6003 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 @@ -19,7 +19,7 @@ #include "anonymous_string.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -36,7 +36,7 @@ void DCameraStreamDataProcessPipelineListener::OnProcessedVideoBuffer(const std: { std::shared_ptr process = process_.lock(); if (process == nullptr) { - DHLOGE("DCameraStreamDataProcessPipelineListener OnProcessedVideoBuffer not found process"); + DCLOGE("DCameraStreamDataProcessPipelineListener OnProcessedVideoBuffer not found process"); return; } process->OnProcessedVideoBuffer(videoResult); @@ -46,7 +46,7 @@ void DCameraStreamDataProcessPipelineListener::OnError(DataProcessErrorType erro { std::shared_ptr process = process_.lock(); if (process == nullptr) { - DHLOGE("DCameraStreamDataProcessPipelineListener OnProcessedVideoBuffer not found process"); + DCLOGE("DCameraStreamDataProcessPipelineListener OnProcessedVideoBuffer not found process"); return; } process->OnError(errorType); 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 e7a3c7c6bbc893503ba98688c15a25e88b0cbb47..b7075c7007998afcc20cbe82b5d293b564d92c7a 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 @@ -23,7 +23,7 @@ #include "dcamera_utils_tools.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include #include "dcamera_frame_info.h" @@ -34,7 +34,7 @@ DCameraStreamDataProcessProducer::DCameraStreamDataProcessProducer(std::string d : devId_(devId), dhId_(dhId), streamId_(streamId), streamType_(streamType), eventHandler_(nullptr), camHdiProvider_(nullptr) { - DHLOGI("DCameraStreamDataProcessProducer Constructor devId %s dhId %s streamType: %d streamId: %d", + DCLOGI("DCameraStreamDataProcessProducer Constructor devId %s dhId %s streamType: %d streamId: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_); state_ = DCAMERA_PRODUCER_STATE_STOP; interval_ = DCAMERA_PRODUCER_ONE_MINUTE_MS / DCAMERA_PRODUCER_FPS_DEFAULT; @@ -42,7 +42,7 @@ DCameraStreamDataProcessProducer::DCameraStreamDataProcessProducer(std::string d DCameraStreamDataProcessProducer::~DCameraStreamDataProcessProducer() { - DHLOGI("DCameraStreamDataProcessProducer Destructor devId %s dhId %s state: %d streamType: %d streamId: %d", + DCLOGI("DCameraStreamDataProcessProducer Destructor devId %s dhId %s state: %d streamType: %d streamId: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), state_, streamType_, streamId_); if (state_ == DCAMERA_PRODUCER_STATE_START) { Stop(); @@ -51,11 +51,11 @@ DCameraStreamDataProcessProducer::~DCameraStreamDataProcessProducer() void DCameraStreamDataProcessProducer::Start() { - DHLOGI("DCameraStreamDataProcessProducer Start producer devId: %s dhId: %s streamType: %d streamId: %d", + DCLOGI("DCameraStreamDataProcessProducer Start producer devId: %s dhId: %s streamType: %d streamId: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_); camHdiProvider_ = IDCameraProvider::Get(HDF_DCAMERA_EXT_SERVICE); if (camHdiProvider_ == nullptr) { - DHLOGE("camHdiProvider_ is null."); + DCLOGE("camHdiProvider_ is null."); } state_ = DCAMERA_PRODUCER_STATE_START; if (streamType_ == CONTINUOUS_FRAME) { @@ -75,7 +75,7 @@ void DCameraStreamDataProcessProducer::Start() void DCameraStreamDataProcessProducer::Stop() { - DHLOGI("DCameraStreamDataProcessProducer Stop devId: %s dhId: %s streamType: %d streamId: %d state: %d", + DCLOGI("DCameraStreamDataProcessProducer Stop devId: %s dhId: %s streamType: %d streamId: %d state: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_, state_); { std::lock_guard lock(bufferMutex_); @@ -93,7 +93,7 @@ void DCameraStreamDataProcessProducer::Stop() producerThread_.join(); } camHdiProvider_ = nullptr; - DHLOGI("DCameraStreamDataProcessProducer Stop end devId: %s dhId: %s streamType: %d streamId: %d state: %d", + DCLOGI("DCameraStreamDataProcessProducer Stop end devId: %s dhId: %s streamType: %d streamId: %d state: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_, state_); } @@ -102,11 +102,11 @@ void DCameraStreamDataProcessProducer::FeedStream(const std::shared_ptrframeInfo_.timePonit.startSmooth = GetNowTimeStampUs(); { std::lock_guard lock(bufferMutex_); - DHLOGD("DCameraStreamDataProcessProducer FeedStream devId %s dhId %s streamId: %d streamType: %d" + + DCLOGD("DCameraStreamDataProcessProducer FeedStream devId %s dhId %s streamId: %d streamType: %d" + " streamSize: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId_, streamType_, buffer->Size()); if (buffers_.size() >= DCAMERA_PRODUCER_MAX_BUFFER_SIZE) { - DHLOGD("DCameraStreamDataProcessProducer FeedStream OverSize devId %s dhId %s streamType: %d" + + DCLOGD("DCameraStreamDataProcessProducer FeedStream OverSize devId %s dhId %s streamType: %d" + " streamSize: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, buffer->Size()); buffers_.pop_front(); @@ -135,7 +135,7 @@ void DCameraStreamDataProcessProducer::StartEvent() void DCameraStreamDataProcessProducer::LooperSnapShot() { - DHLOGI("LooperSnapShot producer devId: %s dhId: %s streamType: %d streamId: %d state: %d", + DCLOGI("LooperSnapShot producer devId: %s dhId: %s streamType: %d streamId: %d state: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_, state_); std::string name = PRODUCER + std::to_string(streamType_); prctl(PR_SET_NAME, name.c_str()); @@ -155,14 +155,14 @@ void DCameraStreamDataProcessProducer::LooperSnapShot() } if (!buffers_.empty()) { - DHLOGI("LooperSnapShot producer get buffer devId: %s dhId: %s streamType: %d streamId: %d state: %d", + DCLOGI("LooperSnapShot producer get buffer devId: %s dhId: %s streamType: %d streamId: %d state: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_, state_); buffer = buffers_.front(); } } if (buffer == nullptr) { - DHLOGI("LooperSnapShot producer get buffer failed devId: %s dhId: %s streamType: %d streamId: %d state: %d", + DCLOGI("LooperSnapShot producer get buffer failed devId: %s dhId: %s streamType: %d streamId: %d state: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_, state_); continue; } @@ -176,23 +176,23 @@ void DCameraStreamDataProcessProducer::LooperSnapShot() buffers_.pop_front(); } } - DHLOGI("LooperSnapShot producer end devId: %s dhId: %s streamType: %d streamId: %d state: %d", + DCLOGI("LooperSnapShot producer end devId: %s dhId: %s streamType: %d streamId: %d state: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_, state_); } int32_t DCameraStreamDataProcessProducer::FeedStreamToDriver(const DHBase& dhBase, const std::shared_ptr& buffer) { - DHLOGD("LooperFeed devId %s dhId %s streamSize: %d streamType: %d, streamId: %d", GetAnonyString(devId_).c_str(), + DCLOGD("LooperFeed devId %s dhId %s streamSize: %d streamType: %d, streamId: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), buffer->Size(), streamType_, streamId_); if (camHdiProvider_ == nullptr) { - DHLOGI("camHdiProvider is nullptr"); + DCLOGI("camHdiProvider is nullptr"); return DCAMERA_BAD_VALUE; } DCameraBuffer sharedMemory; int32_t ret = camHdiProvider_->AcquireBuffer(dhBase, streamId_, sharedMemory); if (ret != SUCCESS) { - DHLOGE("AcquireBuffer devId: %s dhId: %s streamId: %d ret: %d", + DCLOGE("AcquireBuffer devId: %s dhId: %s streamId: %d ret: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId_, ret); return DCAMERA_BAD_OPERATE; } @@ -200,20 +200,20 @@ int32_t DCameraStreamDataProcessProducer::FeedStreamToDriver(const DHBase& dhBas do { ret = CheckSharedMemory(sharedMemory, buffer); if (ret != DCAMERA_OK) { - DHLOGE("CheckSharedMemory failed devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DCLOGE("CheckSharedMemory failed devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); break; } sharedMemory.bufferHandle_->GetBufferHandle()->virAddr = DCameraMemoryMap(sharedMemory.bufferHandle_->GetBufferHandle()); if (sharedMemory.bufferHandle_->GetBufferHandle()->virAddr == nullptr) { - DHLOGE("mmap failed devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DCLOGE("mmap failed devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); break; } ret = memcpy_s(sharedMemory.bufferHandle_->GetBufferHandle()->virAddr, sharedMemory.size_, buffer->Data(), buffer->Size()); if (ret != EOK) { - DHLOGE("memcpy_s devId: %s dhId: %s streamId: %d bufSize: %d, addressSize: %d", + DCLOGE("memcpy_s devId: %s dhId: %s streamId: %d bufSize: %d, addressSize: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId_, buffer->Size(), sharedMemory.size_); break; @@ -226,11 +226,11 @@ int32_t DCameraStreamDataProcessProducer::FeedStreamToDriver(const DHBase& dhBas DCameraMemoryUnmap(sharedMemory.bufferHandle_->GetBufferHandle()); } if (ret != SUCCESS) { - DHLOGE("ShutterBuffer devId: %s dhId: %s streamId: %d ret: %d", + DCLOGE("ShutterBuffer devId: %s dhId: %s streamId: %d ret: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId_, ret); return DCAMERA_BAD_OPERATE; } - DHLOGD("LooperFeed end devId %s dhId %s streamSize: %d streamType: %d, streamId: %d", + DCLOGD("LooperFeed end devId %s dhId %s streamSize: %d streamType: %d, streamId: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), buffer->Size(), streamType_, streamId_); return ret; } @@ -239,13 +239,13 @@ int32_t DCameraStreamDataProcessProducer::CheckSharedMemory(const DCameraBuffer& const std::shared_ptr& buffer) { if (sharedMemory.bufferHandle_ == nullptr || sharedMemory.bufferHandle_->GetBufferHandle() == nullptr) { - DHLOGE("bufferHandle read failed devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DCLOGE("bufferHandle read failed devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return DCAMERA_MEMORY_OPT_ERROR; } if (buffer->Size() > sharedMemory.size_) { - DHLOGE("sharedMemory devId: %s dhId: %s streamId: %d bufSize: %d, addressSize: %d", + DCLOGE("sharedMemory devId: %s dhId: %s streamId: %d bufSize: %d, addressSize: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId_, buffer->Size(), sharedMemory.size_); return DCAMERA_MEMORY_OPT_ERROR; diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/base/ifeeding_smoother.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/base/ifeeding_smoother.cpp index d303b8e147f009845e48818be493590f76d15595..c6a83eeb77597990058134328813e59df9c0a454 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/base/ifeeding_smoother.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/base/ifeeding_smoother.cpp @@ -17,7 +17,7 @@ #include #include "dcamera_utils_tools.h" #include -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "smoother_constants.h" namespace OHOS { @@ -35,7 +35,7 @@ void IFeedingSmoother::PushData(const std::shared_ptr& data) { std::lock_guard lock(stateMutex_); if (state_ == SMOOTH_STOP) { - DHLOGD("Smoother stop, push data failed."); + DCLOGD("Smoother stop, push data failed."); return; } } @@ -54,7 +54,7 @@ int32_t IFeedingSmoother::StartSmooth() { std::lock_guard lock(stateMutex_); if (state_ == SMOOTH_START) { - DHLOGD("Smoother is started."); + DCLOGD("Smoother is started."); return SMOOTH_IS_STARTED; } state_ = SMOOTH_START; @@ -83,7 +83,7 @@ void IFeedingSmoother::LooperSmooth() SmoothFeeding(data); int32_t ret = NotifySmoothFinished(data); if (ret == NOTIFY_FAILED) { - DHLOGD("Smoother listener notify producer failed."); + DCLOGD("Smoother listener notify producer failed."); return; } { @@ -124,7 +124,7 @@ void IFeedingSmoother::SmoothFeeding(const std::shared_ptr& data) return (this->state_ == SMOOTH_STOP); }); if (state_ == SMOOTH_STOP) { - DHLOGD("Notify to interrupt sleep."); + DCLOGD("Notify to interrupt sleep."); return; } } @@ -182,7 +182,7 @@ void IFeedingSmoother::InitBaseline(const int64_t timeStampBaseline, const int64 int32_t IFeedingSmoother::NotifySmoothFinished(const std::shared_ptr& data) { if (listener_ == nullptr) { - DHLOGE("Smoother listener is nullptr."); + DCLOGE("Smoother listener is nullptr."); return NOTIFY_FAILED; } return listener_->OnSmoothFinished(data); @@ -195,11 +195,11 @@ void IFeedingSmoother::AdjustSleepTime(const int64_t interval) int64_t sleep = sleep_ - adjustThre; delta_ -= (sleep < 0) ? sleep_ : adjustThre; sleep_ = sleep; - DHLOGD("Delta more than thre, adjust sleep to %ld us.", sleep_); + DCLOGD("Delta more than thre, adjust sleep to %ld us.", sleep_); } else if (delta_ < -adjustThre) { sleep_ += delta_; delta_ = 0; - DHLOGD("Delta less than negative thre, adjust sleep to %ld us.", sleep_); + DCLOGD("Delta less than negative thre, adjust sleep to %ld us.", sleep_); } } @@ -210,13 +210,13 @@ void IFeedingSmoother::SyncClock(const int64_t timeStamp, const int64_t interval int64_t offset = timeStamp - sleep_ - clock; if (offset > waitThre || offset < -trackThre) { sleep_ += offset; - DHLOGD("Offset is not in the threshold range, adjust sleep to %ld us.", sleep_); + DCLOGD("Offset is not in the threshold range, adjust sleep to %ld us.", sleep_); } if (sleep_ < 0) { sleep_ = 0; - DHLOGD("Sleep less than zero, adjust sleep to zero."); + DCLOGD("Sleep less than zero, adjust sleep to zero."); } - DHLOGD("Offset is %ld us, sleep is %ld us after syncing clock.", offset, sleep_); + DCLOGD("Offset is %ld us, sleep is %ld us after syncing clock.", offset, sleep_); } void IFeedingSmoother::RecordTime(const int64_t enterTime, const int64_t timeStamp) @@ -232,7 +232,7 @@ int32_t IFeedingSmoother::StopSmooth() { std::lock_guard lock(stateMutex_); if (state_ == SMOOTH_STOP) { - DHLOGD("Smooth is stoped."); + DCLOGD("Smooth is stoped."); return SMOOTH_IS_STOPED; } state_ = SMOOTH_STOP; @@ -243,7 +243,7 @@ int32_t IFeedingSmoother::StopSmooth() sleepCon_.notify_one(); smoothThread_.join(); std::queue>().swap(dataQueue_); - DHLOGD("Stop smooth success."); + DCLOGD("Stop smooth success."); return SMOOTH_SUCCESS; } diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/base/time_statistician.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/base/time_statistician.cpp index 31c8c4402ac149602df488e52a07c38f8876fa2a..2078303df99959da226bec2950036f24b60d6e6f 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/base/time_statistician.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/base/time_statistician.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ #include "time_statistician.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "dcamera_utils_tools.h" namespace OHOS { diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/derived/dcamera_feeding_smoother.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/derived/dcamera_feeding_smoother.cpp index dcd189a653648b37ea7dc20d416a4db96d6b2335..f7b9cee205da34ffbf46ff9b5242b141832a7dc7 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/derived/dcamera_feeding_smoother.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/derived/dcamera_feeding_smoother.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ #include "dcamera_feeding_smoother.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include #include "data_buffer.h" #include "dcamera_utils_tools.h" @@ -54,7 +54,7 @@ int32_t DCameraFeedingSmoother::NotifySmoothFinished(const std::shared_ptrframeInfo_.timePonit.finishSmooth = finishSmoothT; dCameraStatistician_->CalWholeProcessTime(buffer); if (listener_ == nullptr) { - DHLOGE("Smoother listener is nullptr."); + DCLOGE("Smoother listener is nullptr."); return NOTIFY_FAILED; } return listener_->OnSmoothFinished(buffer); diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/derived/dcamera_time_statistician.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/derived/dcamera_time_statistician.cpp index 3ddc51183d08e68d4c4914e9dbb714a7f911e09a..f2e9e8a5ce8a0c1d41dc012b982cabc409c4ba12 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/derived/dcamera_time_statistician.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/derived/dcamera_time_statistician.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ #include "dcamera_time_statistician.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "distributed_camera_constants.h" #include @@ -38,7 +38,7 @@ void DCameraTimeStatistician::CalProcessTime(const std::shared_ptr producer = producer_.lock(); if (producer == nullptr) { - DHLOGE("Producer is nullptr, notify failed."); + DCLOGE("Producer is nullptr, notify failed."); return NOTIFY_FAILED; } producer->OnSmoothFinished(data); diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_hdf_operate.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_hdf_operate.cpp index 9aa84a383f1bd1f5fc03b992e796a0e18786fbe7..16c0e9d5ee1da3dd1535ec3852e2fbf0db888643 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_hdf_operate.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_hdf_operate.cpp @@ -19,7 +19,7 @@ #include "anonymous_string.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -27,7 +27,7 @@ IMPLEMENT_SINGLE_INSTANCE(DCameraHdfOperate); void DCameraHdfServStatListener::OnReceive(const ServiceStatus& status) { - DHLOGI("service status on receive"); + DCLOGI("service status on receive"); if (status.serviceName == CAMERA_SERVICE_NAME || status.serviceName == PROVIDER_SERVICE_NAME) { callback_(status); } @@ -37,19 +37,19 @@ int32_t DCameraHdfOperate::LoadDcameraHDFImpl() { if (cameraServStatus_ == OHOS::HDI::ServiceManager::V1_0::SERVIE_STATUS_START && providerServStatus_ == OHOS::HDI::ServiceManager::V1_0::SERVIE_STATUS_START) { - DHLOGI("service has already start"); + DCLOGI("service has already start"); return DCAMERA_OK; } OHOS::sptr servMgr = IServiceManager::Get(); OHOS::sptr devmgr = IDeviceManager::Get(); if (servMgr == nullptr || devmgr == nullptr) { - DHLOGE("get hdi service manager or device manager failed!"); + DCLOGE("get hdi service manager or device manager failed!"); return DCAMERA_BAD_VALUE; } ::OHOS::sptr listener( new DCameraHdfServStatListener(DCameraHdfServStatListener::StatusCallback([&](const ServiceStatus& status) { - DHLOGI("LoadCameraService service status callback, serviceName: %s, status: %d", + DCLOGI("LoadCameraService service status callback, serviceName: %s, status: %d", status.serviceName.c_str(), status.status); std::unique_lock lock(hdfOperateMutex_); if (status.serviceName == CAMERA_SERVICE_NAME) { @@ -61,22 +61,22 @@ int32_t DCameraHdfOperate::LoadDcameraHDFImpl() } }))); if (servMgr->RegisterServiceStatusListener(listener, DEVICE_CLASS_CAMERA) != 0) { - DHLOGE("RegisterServiceStatusListener failed!"); + DCLOGE("RegisterServiceStatusListener failed!"); return DCAMERA_BAD_VALUE; } - DHLOGI("Load camera service."); + DCLOGI("Load camera service."); if (devmgr->LoadDevice(CAMERA_SERVICE_NAME) != 0) { - DHLOGE("Load camera service failed!"); + DCLOGE("Load camera service failed!"); return DCAMERA_BAD_OPERATE; } if (WaitLoadCameraService() != DCAMERA_OK) { return DCAMERA_BAD_OPERATE; } - DHLOGI("Load provider service."); + DCLOGI("Load provider service."); if (devmgr->LoadDevice(PROVIDER_SERVICE_NAME) != 0) { - DHLOGE("Load provider service failed!"); + DCLOGE("Load provider service failed!"); return DCAMERA_BAD_OPERATE; } if (WaitLoadProviderService() != DCAMERA_OK) { @@ -84,21 +84,21 @@ int32_t DCameraHdfOperate::LoadDcameraHDFImpl() } if (servMgr->UnregisterServiceStatusListener(listener) != 0) { - DHLOGE("UnregisterServiceStatusListener failed!"); + DCLOGE("UnregisterServiceStatusListener failed!"); } return DCAMERA_OK; } int32_t DCameraHdfOperate::WaitLoadCameraService() { - DHLOGI("wait Load camera service."); + DCLOGI("wait Load camera service."); std::unique_lock lock(hdfOperateMutex_); hdfOperateCon_.wait_for(lock, std::chrono::milliseconds(WAIT_TIME), [this] { return (this->cameraServStatus_ == OHOS::HDI::ServiceManager::V1_0::SERVIE_STATUS_START); }); if (cameraServStatus_ != OHOS::HDI::ServiceManager::V1_0::SERVIE_STATUS_START) { - DHLOGE("wait load cameraService failed, status %d", cameraServStatus_); + DCLOGE("wait load cameraService failed, status %d", cameraServStatus_); return DCAMERA_BAD_OPERATE; } @@ -107,14 +107,14 @@ int32_t DCameraHdfOperate::WaitLoadCameraService() int32_t DCameraHdfOperate::WaitLoadProviderService() { - DHLOGI("wait Load provider service."); + DCLOGI("wait Load provider service."); std::unique_lock lock(hdfOperateMutex_); hdfOperateCon_.wait_for(lock, std::chrono::milliseconds(WAIT_TIME), [this] { return (this->providerServStatus_ == OHOS::HDI::ServiceManager::V1_0::SERVIE_STATUS_START); }); if (providerServStatus_ != OHOS::HDI::ServiceManager::V1_0::SERVIE_STATUS_START) { - DHLOGE("wait load providerService failed, status %d", providerServStatus_); + DCLOGE("wait load providerService failed, status %d", providerServStatus_); return DCAMERA_BAD_OPERATE; } @@ -123,24 +123,24 @@ int32_t DCameraHdfOperate::WaitLoadProviderService() int32_t DCameraHdfOperate::UnLoadDcameraHDFImpl() { - DHLOGI("UnLoadCameraHDFImpl begin!"); + DCLOGI("UnLoadCameraHDFImpl begin!"); OHOS::sptr devmgr = IDeviceManager::Get(); if (devmgr == nullptr) { - DHLOGE("get hdi device manager failed!"); + DCLOGE("get hdi device manager failed!"); return DCAMERA_BAD_VALUE; } int32_t ret = devmgr->UnloadDevice(CAMERA_SERVICE_NAME); if (ret != 0) { - DHLOGE("Unload camera service failed, ret: %d", ret); + DCLOGE("Unload camera service failed, ret: %d", ret); } ret = devmgr->UnloadDevice(PROVIDER_SERVICE_NAME); if (ret != 0) { - DHLOGE("Unload provider service failed, ret: %d", ret); + DCLOGE("Unload provider service failed, ret: %d", ret); } cameraServStatus_ = INVALID_VALUE; providerServStatus_ = INVALID_VALUE; - DHLOGI("UnLoadCameraHDFImpl end!"); + DCLOGI("UnLoadCameraHDFImpl end!"); return DCAMERA_OK; } } // namespace DistributedHardware 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 1096d5660eb600657cfcd93b44f88942da839bb6..853c57d336a687ec205a66b593daaf4d2eaa65ec 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 @@ -20,41 +20,41 @@ #include "anonymous_string.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { DCameraProviderCallbackImpl::DCameraProviderCallbackImpl(std::string devId, std::string dhId, std::shared_ptr& sourceDev) : devId_(devId), dhId_(dhId), sourceDev_(sourceDev) { - DHLOGI("DCameraProviderCallbackImpl create devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraProviderCallbackImpl create devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } DCameraProviderCallbackImpl::~DCameraProviderCallbackImpl() { - DHLOGI("DCameraProviderCallbackImpl delete devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DCLOGI("DCameraProviderCallbackImpl delete devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } int32_t DCameraProviderCallbackImpl::OpenSession(const DHBase& dhBase) { - DHLOGI("OpenSession devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DCLOGI("OpenSession devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (!CheckDHBase(dhBase)) { - DHLOGE("input is invalid"); + DCLOGE("input is invalid"); return FAILED; } std::shared_ptr sourceDev = sourceDev_.lock(); if (sourceDev == nullptr) { - DHLOGE("OpenSession failed, can not get device, devId: %s, dhId: %s", + DCLOGE("OpenSession failed, can not get device, devId: %s, dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } DCameraIndex camIndex(devId_, dhId_); int32_t ret = sourceDev->OpenSession(camIndex); if (ret != DCAMERA_OK) { - DHLOGE("OpenSession failed, ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("OpenSession failed, ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } @@ -63,22 +63,22 @@ int32_t DCameraProviderCallbackImpl::OpenSession(const DHBase& dhBase) int32_t DCameraProviderCallbackImpl::CloseSession(const DHBase& dhBase) { - DHLOGI("CloseSession devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DCLOGI("CloseSession devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (!CheckDHBase(dhBase)) { - DHLOGE("input is invalid"); + DCLOGE("input is invalid"); return FAILED; } std::shared_ptr sourceDev = sourceDev_.lock(); if (sourceDev == nullptr) { - DHLOGE("CloseSession failed, can not get device, devId: %s, dhId: %s", + DCLOGE("CloseSession failed, can not get device, devId: %s, dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } DCameraIndex camIndex(devId_, dhId_); int32_t ret = sourceDev->CloseSession(camIndex); if (ret != DCAMERA_OK) { - DHLOGE("CloseSession failed, ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("CloseSession failed, ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } @@ -89,7 +89,7 @@ bool DCameraProviderCallbackImpl::CheckDHBase(const DHBase& dhBase) { if (dhBase.deviceId_.empty() || dhBase.deviceId_.size() > DID_MAX_SIZE || dhBase.dhId_.empty() || dhBase.dhId_.size() > DID_MAX_SIZE) { - DHLOGE("dhBase is invalid"); + DCLOGE("dhBase is invalid"); return false; } return true; @@ -98,22 +98,22 @@ bool DCameraProviderCallbackImpl::CheckDHBase(const DHBase& dhBase) int32_t DCameraProviderCallbackImpl::ConfigureStreams(const DHBase& dhBase, const std::vector& streamInfos) { - DHLOGI("ConfigStreams devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DCLOGI("ConfigStreams devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (!CheckDHBase(dhBase) || streamInfos.empty() || streamInfos.size() > PARAM_MAX_SIZE) { - DHLOGE("input is invalid"); + DCLOGE("input is invalid"); return FAILED; } std::shared_ptr sourceDev = sourceDev_.lock(); if (sourceDev == nullptr) { - DHLOGE("ConfigStreams failed, can not get device, devId: %s, dhId: %s", + DCLOGE("ConfigStreams failed, can not get device, devId: %s, dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } std::vector> streams; for (auto iter = streamInfos.begin(); iter != streamInfos.end(); iter++) { if (!CheckStreamInfo(*iter)) { - DHLOGE("streamInfo is invalid"); + DCLOGE("streamInfo is invalid"); return FAILED; } std::shared_ptr stream = std::make_shared(); @@ -129,7 +129,7 @@ int32_t DCameraProviderCallbackImpl::ConfigureStreams(const DHBase& dhBase, } int32_t ret = sourceDev->ConfigCameraStreams(streams); if (ret != DCAMERA_OK) { - DHLOGE("CloseSession failed, ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("CloseSession failed, ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } @@ -140,12 +140,12 @@ bool DCameraProviderCallbackImpl::CheckStreamInfo(const DCStreamInfo& stream) { if (stream.streamId_ < 0 || stream.width_ < 0 || stream.height_ < 0 || (stream.width_ * stream.height_ > RESOLUTION_MAX_WIDTH * RESOLUTION_MAX_HEIGHT)) { - DHLOGE("stream is invalid"); + DCLOGE("stream is invalid"); return false; } if (stream.stride_ < 0 || stream.format_ < 0 || stream.dataspace_ < 0) { - DHLOGE("stream is invalid"); + DCLOGE("stream is invalid"); return false; } return true; @@ -153,21 +153,21 @@ bool DCameraProviderCallbackImpl::CheckStreamInfo(const DCStreamInfo& stream) int32_t DCameraProviderCallbackImpl::ReleaseStreams(const DHBase& dhBase, const std::vector& streamIds) { - DHLOGI("ReleaseStreams devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DCLOGI("ReleaseStreams devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (!CheckDHBase(dhBase) || streamIds.size() > PARAM_MAX_SIZE) { - DHLOGE("input is invalid"); + DCLOGE("input is invalid"); return FAILED; } std::shared_ptr sourceDev = sourceDev_.lock(); if (sourceDev == nullptr) { - DHLOGE("ReleaseStreams failed, can not get device, devId: %s, dhId: %s", + DCLOGE("ReleaseStreams failed, can not get device, devId: %s, dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } int32_t ret = sourceDev->ReleaseCameraStreams(streamIds); if (ret != DCAMERA_OK) { - DHLOGE("ReleaseStreams failed, ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("ReleaseStreams failed, ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } @@ -176,15 +176,15 @@ int32_t DCameraProviderCallbackImpl::ReleaseStreams(const DHBase& dhBase, const int32_t DCameraProviderCallbackImpl::StartCapture(const DHBase& dhBase, const std::vector& captureInfos) { - DHLOGI("StartCapture devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DCLOGI("StartCapture devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (!CheckDHBase(dhBase) || captureInfos.empty() || captureInfos.size() > PARAM_MAX_SIZE) { - DHLOGE("input is invalid"); + DCLOGE("input is invalid"); return FAILED; } std::shared_ptr sourceDev = sourceDev_.lock(); if (sourceDev == nullptr) { - DHLOGE("StartCapture failed, can not get device, devId: %s, dhId: %s", + DCLOGE("StartCapture failed, can not get device, devId: %s, dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } @@ -192,12 +192,12 @@ int32_t DCameraProviderCallbackImpl::StartCapture(const DHBase& dhBase, const st std::vector> captures; for (auto iter = captureInfos.begin(); iter != captureInfos.end(); iter++) { if (!CheckCaptureInfo(*iter)) { - DHLOGE("captureInfo is invalid"); + DCLOGE("captureInfo is invalid"); return FAILED; } for (auto item : iter->captureSettings_) { if (item.value_.size() > PARAM_MAX_SIZE) { - DHLOGE("captureSettings value is too long"); + DCLOGE("captureSettings value is too long"); return FAILED; } } @@ -216,7 +216,7 @@ int32_t DCameraProviderCallbackImpl::StartCapture(const DHBase& dhBase, const st } int32_t ret = sourceDev->StartCameraCapture(captures); if (ret != DCAMERA_OK) { - DHLOGE("StartCapture failed, ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("StartCapture failed, ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } @@ -227,13 +227,13 @@ bool DCameraProviderCallbackImpl::CheckCaptureInfo(const DCCaptureInfo& captureI { if (sizeof(captureInfo.streamIds_) > PARAM_MAX_SIZE || captureInfo.width_ < 0 || captureInfo.height_ < 0 || (captureInfo.width_ * captureInfo.height_ > RESOLUTION_MAX_WIDTH * RESOLUTION_MAX_HEIGHT)) { - DHLOGE("captureInfo is invalid"); + DCLOGE("captureInfo is invalid"); return false; } if (captureInfo.stride_ < 0 || captureInfo.format_ < 0 || captureInfo.dataspace_ < 0 || sizeof(captureInfo.captureSettings_) > PARAM_MAX_SIZE) { - DHLOGE("captureInfo is invalid"); + DCLOGE("captureInfo is invalid"); return false; } return true; @@ -241,21 +241,21 @@ bool DCameraProviderCallbackImpl::CheckCaptureInfo(const DCCaptureInfo& captureI int32_t DCameraProviderCallbackImpl::StopCapture(const DHBase& dhBase, const std::vector& streamIds) { - DHLOGI("StopCapture devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DCLOGI("StopCapture devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (!CheckDHBase(dhBase) || streamIds.size() > PARAM_MAX_SIZE) { - DHLOGE("input is invalid"); + DCLOGE("input is invalid"); return FAILED; } std::shared_ptr sourceDev = sourceDev_.lock(); if (sourceDev == nullptr) { - DHLOGE("StopCapture failed, can not get device, devId: %s, dhId: %s", + DCLOGE("StopCapture failed, can not get device, devId: %s, dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } int32_t ret = sourceDev->StopCameraCapture(streamIds); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture failed, ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("StopCapture failed, ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } @@ -264,15 +264,15 @@ int32_t DCameraProviderCallbackImpl::StopCapture(const DHBase& dhBase, const std int32_t DCameraProviderCallbackImpl::UpdateSettings(const DHBase& dhBase, const std::vector& settings) { - DHLOGI("UpdateSettings devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DCLOGI("UpdateSettings devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (!CheckDHBase(dhBase) || settings.size() > PARAM_MAX_SIZE) { - DHLOGE("input is invalid"); + DCLOGE("input is invalid"); return FAILED; } std::shared_ptr sourceDev = sourceDev_.lock(); if (sourceDev == nullptr) { - DHLOGE("UpdateSettings failed, can not get device, devId: %s, dhId: %s", + DCLOGE("UpdateSettings failed, can not get device, devId: %s, dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } @@ -280,7 +280,7 @@ int32_t DCameraProviderCallbackImpl::UpdateSettings(const DHBase& dhBase, const std::vector> settingInfos; for (auto iter = settings.begin(); iter != settings.end(); iter++) { if (iter->value_.size() > PARAM_MAX_SIZE) { - DHLOGE("value is too long"); + DCLOGE("value is too long"); return FAILED; } std::shared_ptr settingInfo = std::make_shared(); @@ -290,7 +290,7 @@ int32_t DCameraProviderCallbackImpl::UpdateSettings(const DHBase& dhBase, const } int32_t ret = sourceDev->UpdateCameraSettings(settingInfos); if (ret != DCAMERA_OK) { - DHLOGE("UpdateSettings failed, ret: %d, devId: %s, dhId: %s", ret, + DCLOGE("UpdateSettings failed, ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_capture_state.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_capture_state.cpp index 0611908d35ccd2dcc4efd67eef76c8a7e5be539f..706c9d1c8896b19e7ba605abb9547310ff05bd5b 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_capture_state.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_capture_state.cpp @@ -18,7 +18,7 @@ #include "dcamera_source_dev.h" #include "dcamera_source_state_machine.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -40,14 +40,14 @@ int32_t DCameraSourceCaptureState::Execute(std::shared_ptr& ca { auto itFunc = memberFuncMap_.find(eventType); if (itFunc == memberFuncMap_.end()) { - DHLOGE("DCameraSourceCaptureState execute %d in wrong state", eventType); + DCLOGE("DCameraSourceCaptureState execute %d in wrong state", eventType); return DCAMERA_WRONG_STATE; } auto memberFunc = itFunc->second; int32_t ret = (this->*memberFunc)(camDev, event); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceCaptureState execute %d failed, ret: %d", eventType, ret); + DCLOGE("DCameraSourceCaptureState execute %d failed, ret: %d", eventType, ret); } return ret; } @@ -59,7 +59,7 @@ DCameraStateType DCameraSourceCaptureState::GetStateType() int32_t DCameraSourceCaptureState::DoRegisterTask(std::shared_ptr& camDev, DCameraSourceEvent& event) { - DHLOGI("DCameraSourceCaptureState DoRegisterTask Idempotent"); + DCLOGI("DCameraSourceCaptureState DoRegisterTask Idempotent"); return DCAMERA_OK; } @@ -71,25 +71,25 @@ int32_t DCameraSourceCaptureState::DoUnregisterTask(std::shared_ptreventResult_ = DCAMERA_EVENT_CHANNEL_DISCONNECTED; int32_t ret = camDev->CameraEventNotify(camEvent); if (ret != DCAMERA_OK) { - DHLOGE("CameraEventNotify failed: %d", ret); + DCLOGE("CameraEventNotify failed: %d", ret); return ret; } ret = camDev->StopAllCapture(); if (ret != DCAMERA_OK) { - DHLOGE("StopAllCapture failed: %d", ret); + DCLOGE("StopAllCapture failed: %d", ret); return ret; } ret = camDev->CloseCamera(); if (ret != DCAMERA_OK) { - DHLOGE("CloseCamera failed, ret: %d", ret); + DCLOGE("CloseCamera failed, ret: %d", ret); return ret; } ret = camDev->ReleaseAllStreams(); if (ret != DCAMERA_OK) { - DHLOGE("ReleaseAllStreams failed, ret: %d", ret); + DCLOGE("ReleaseAllStreams failed, ret: %d", ret); return ret; } @@ -100,12 +100,12 @@ int32_t DCameraSourceCaptureState::DoUnregisterTask(std::shared_ptrUnRegister(param); if (ret != DCAMERA_OK) { - DHLOGE("UnRegister failed: %d", ret); + DCLOGE("UnRegister failed: %d", ret); return ret; } std::shared_ptr stateMachine = stateMachine_.lock(); if (stateMachine == nullptr) { - DHLOGE("can not get stateMachine"); + DCLOGE("can not get stateMachine"); return DCAMERA_BAD_VALUE; } stateMachine->UpdateState(DCAMERA_STATE_INIT); @@ -114,7 +114,7 @@ int32_t DCameraSourceCaptureState::DoUnregisterTask(std::shared_ptr& camDev, DCameraSourceEvent& event) { - DHLOGI("DCameraSourceCaptureState DoOpenTask Idempotent"); + DCLOGI("DCameraSourceCaptureState DoOpenTask Idempotent"); return DCAMERA_OK; } @@ -122,24 +122,24 @@ int32_t DCameraSourceCaptureState::DoCloseTask(std::shared_ptr { int32_t ret = camDev->StopAllCapture(); if (ret != DCAMERA_OK) { - DHLOGE("StopAllCapture failed, ret: %d", ret); + DCLOGE("StopAllCapture failed, ret: %d", ret); return ret; } ret = camDev->ReleaseAllStreams(); if (ret != DCAMERA_OK) { - DHLOGE("ReleaseAllStreams failed, ret: %d", ret); + DCLOGE("ReleaseAllStreams failed, ret: %d", ret); return ret; } ret = camDev->CloseCamera(); if (ret != DCAMERA_OK) { - DHLOGE("CloseCamera failed, ret: %d", ret); + DCLOGE("CloseCamera failed, ret: %d", ret); return ret; } std::shared_ptr stateMachine = stateMachine_.lock(); if (stateMachine == nullptr) { - DHLOGE("can not get stateMachine"); + DCLOGE("can not get stateMachine"); return DCAMERA_BAD_VALUE; } stateMachine->UpdateState(DCAMERA_STATE_REGIST); @@ -157,7 +157,7 @@ int32_t DCameraSourceCaptureState::DoStartCaptureTask(std::shared_ptrStartCapture(captureInfos); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceCaptureState DoStartCaptureTask failed, ret: %d", ret); + DCLOGE("DCameraSourceCaptureState DoStartCaptureTask failed, ret: %d", ret); return ret; } return DCAMERA_OK; @@ -175,14 +175,14 @@ int32_t DCameraSourceCaptureState::DoStopCaptureTask(std::shared_ptrStopCapture(streamIds, isAllStop); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture failed, ret: %d", ret); + DCLOGE("StopCapture failed, ret: %d", ret); return ret; } if (isAllStop) { std::shared_ptr stateMachine = stateMachine_.lock(); if (stateMachine == nullptr) { - DHLOGE("can not get stateMachine"); + DCLOGE("can not get stateMachine"); return DCAMERA_BAD_VALUE; } stateMachine->UpdateState(DCAMERA_STATE_CONFIG_STREAM); @@ -201,7 +201,7 @@ int32_t DCameraSourceCaptureState::DoUpdateSettingsTask(std::shared_ptrUpdateSettings(settings); if (ret != DCAMERA_OK) { - DHLOGE("UpdateSettings failed, ret: %d", ret); + DCLOGE("UpdateSettings failed, ret: %d", ret); return ret; } return DCAMERA_OK; @@ -218,7 +218,7 @@ int32_t DCameraSourceCaptureState::DoEventNofityTask(std::shared_ptrCameraEventNotify(camEvent); if (ret != DCAMERA_OK) { - DHLOGE("CameraEventNotify failed, ret: %d", ret); + DCLOGE("CameraEventNotify failed, ret: %d", ret); return ret; } return DCAMERA_OK; diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_config_stream_state.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_config_stream_state.cpp index a72f3c15e5b4b22962338addf24bd20a4e26c827..f70a33a1150a5d2b16a3018ba2f279165484a621 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_config_stream_state.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_config_stream_state.cpp @@ -18,7 +18,7 @@ #include "dcamera_source_dev.h" #include "dcamera_source_state_machine.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -42,14 +42,14 @@ int32_t DCameraSourceConfigStreamState::Execute(std::shared_ptrsecond; int32_t ret = (this->*memberFunc)(camDev, event); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceConfigStreamState execute %d failed, ret: %d", eventType, ret); + DCLOGE("DCameraSourceConfigStreamState execute %d failed, ret: %d", eventType, ret); } return ret; } @@ -62,7 +62,7 @@ DCameraStateType DCameraSourceConfigStreamState::GetStateType() int32_t DCameraSourceConfigStreamState::DoRegisterTask(std::shared_ptr& camDev, DCameraSourceEvent& event) { - DHLOGI("DCameraSourceConfigStreamState DoRegisterTask Idempotent"); + DCLOGI("DCameraSourceConfigStreamState DoRegisterTask Idempotent"); return DCAMERA_OK; } @@ -74,19 +74,19 @@ int32_t DCameraSourceConfigStreamState::DoUnregisterTask(std::shared_ptreventResult_ = DCAMERA_EVENT_CHANNEL_DISCONNECTED; int32_t ret = camDev->CameraEventNotify(camEvent); if (ret != DCAMERA_OK) { - DHLOGE("CameraEventNotify failed: %d", ret); + DCLOGE("CameraEventNotify failed: %d", ret); return ret; } ret = camDev->CloseCamera(); if (ret != DCAMERA_OK) { - DHLOGE("CloseCamera failed, ret: %d", ret); + DCLOGE("CloseCamera failed, ret: %d", ret); return ret; } ret = camDev->ReleaseAllStreams(); if (ret != DCAMERA_OK) { - DHLOGE("ReleaseAllStreams failed, ret: %d", ret); + DCLOGE("ReleaseAllStreams failed, ret: %d", ret); return ret; } @@ -97,12 +97,12 @@ int32_t DCameraSourceConfigStreamState::DoUnregisterTask(std::shared_ptrUnRegister(param); if (ret != DCAMERA_OK) { - DHLOGE("UnRegister failed: %d", ret); + DCLOGE("UnRegister failed: %d", ret); return ret; } std::shared_ptr stateMachine = stateMachine_.lock(); if (stateMachine == nullptr) { - DHLOGE("can not get stateMachine"); + DCLOGE("can not get stateMachine"); return DCAMERA_BAD_VALUE; } stateMachine->UpdateState(DCAMERA_STATE_INIT); @@ -111,7 +111,7 @@ int32_t DCameraSourceConfigStreamState::DoUnregisterTask(std::shared_ptr& camDev, DCameraSourceEvent& event) { - DHLOGI("DCameraSourceConfigStreamState DoOpenTask Idempotent"); + DCLOGI("DCameraSourceConfigStreamState DoOpenTask Idempotent"); return DCAMERA_OK; } @@ -120,18 +120,18 @@ int32_t DCameraSourceConfigStreamState::DoCloseTask(std::shared_ptrCloseCamera(); if (ret != DCAMERA_OK) { - DHLOGE("CloseCamera failed, ret: %d", ret); + DCLOGE("CloseCamera failed, ret: %d", ret); return ret; } ret = camDev->ReleaseAllStreams(); if (ret != DCAMERA_OK) { - DHLOGE("ReleaseAllStreams failed, ret: %d", ret); + DCLOGE("ReleaseAllStreams failed, ret: %d", ret); return ret; } std::shared_ptr stateMachine = stateMachine_.lock(); if (stateMachine == nullptr) { - DHLOGE("can not get stateMachine"); + DCLOGE("can not get stateMachine"); return DCAMERA_BAD_VALUE; } stateMachine->UpdateState(DCAMERA_STATE_REGIST); @@ -149,14 +149,14 @@ int32_t DCameraSourceConfigStreamState::DoConfigStreamsTask(std::shared_ptrConfigStreams(streamInfos); if (ret != DCAMERA_OK) { - DHLOGE("ConfigStreams failed, ret: %d", ret); + DCLOGE("ConfigStreams failed, ret: %d", ret); return ret; } if (streamInfos.empty()) { std::shared_ptr stateMachine = stateMachine_.lock(); if (stateMachine == nullptr) { - DHLOGE("can not get stateMachine"); + DCLOGE("can not get stateMachine"); return DCAMERA_BAD_VALUE; } stateMachine->UpdateState(DCAMERA_STATE_OPENED); @@ -176,14 +176,14 @@ int32_t DCameraSourceConfigStreamState::DoReleaseStreamsTask(std::shared_ptrReleaseStreams(streamIds, isAllRelease); if (ret != DCAMERA_OK) { - DHLOGE("ReleaseStreams failed, ret: %d", ret); + DCLOGE("ReleaseStreams failed, ret: %d", ret); return ret; } if (isAllRelease) { std::shared_ptr stateMachine = stateMachine_.lock(); if (stateMachine == nullptr) { - DHLOGE("can not get stateMachine"); + DCLOGE("can not get stateMachine"); return DCAMERA_BAD_VALUE; } stateMachine->UpdateState(DCAMERA_STATE_OPENED); @@ -202,12 +202,12 @@ int32_t DCameraSourceConfigStreamState::DoStartCaptureTask(std::shared_ptrStartCapture(captureInfos); if (ret != DCAMERA_OK) { - DHLOGE("StartCapture failed, ret: %d", ret); + DCLOGE("StartCapture failed, ret: %d", ret); return ret; } std::shared_ptr stateMachine = stateMachine_.lock(); if (stateMachine == nullptr) { - DHLOGE("can not get stateMachine"); + DCLOGE("can not get stateMachine"); return DCAMERA_BAD_VALUE; } stateMachine->UpdateState(DCAMERA_STATE_CAPTURE); @@ -217,7 +217,7 @@ int32_t DCameraSourceConfigStreamState::DoStartCaptureTask(std::shared_ptr& camDev, DCameraSourceEvent& event) { - DHLOGI("DCameraSourceConfigStreamState DoStopCaptureTask Idempotent"); + DCLOGI("DCameraSourceConfigStreamState DoStopCaptureTask Idempotent"); return DCAMERA_OK; } @@ -232,7 +232,7 @@ int32_t DCameraSourceConfigStreamState::DoUpdateSettingsTask(std::shared_ptrUpdateSettings(settings); if (ret != DCAMERA_OK) { - DHLOGE("UpdateSettings failed, ret: %d", ret); + DCLOGE("UpdateSettings failed, ret: %d", ret); return ret; } return DCAMERA_OK; @@ -249,7 +249,7 @@ int32_t DCameraSourceConfigStreamState::DoEventNofityTask(std::shared_ptrCameraEventNotify(camEvent); if (ret != DCAMERA_OK) { - DHLOGE("CameraEventNotify failed, ret: %d", ret); + DCLOGE("CameraEventNotify failed, ret: %d", ret); return ret; } return DCAMERA_OK; diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_init_state.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_init_state.cpp index 5238a581ea7e7faa295934662c1d9edc02cc7767..01c448825ea63794f4be88e2c38804ec968e6831 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_init_state.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_init_state.cpp @@ -18,7 +18,7 @@ #include "dcamera_source_dev.h" #include "dcamera_source_state_machine.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -34,14 +34,14 @@ int32_t DCameraSourceInitState::Execute(std::shared_ptr& camDe { auto itFunc = memberFuncMap_.find(eventType); if (itFunc == memberFuncMap_.end()) { - DHLOGE("DCameraSourceInitState execute %d in wrong state", eventType); + DCLOGE("DCameraSourceInitState execute %d in wrong state", eventType); return DCAMERA_WRONG_STATE; } auto memberFunc = itFunc->second; int32_t ret = (this->*memberFunc)(camDev, event); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInitState execute %d failed, ret: %d", eventType, ret); + DCLOGE("DCameraSourceInitState execute %d failed, ret: %d", eventType, ret); } return ret; } @@ -64,7 +64,7 @@ int32_t DCameraSourceInitState::DoRegisterTask(std::shared_ptr } std::shared_ptr stateMachine = stateMachine_.lock(); if (stateMachine == nullptr) { - DHLOGE("DCameraSourceInitState can not get stateMachine"); + DCLOGE("DCameraSourceInitState can not get stateMachine"); return DCAMERA_BAD_VALUE; } stateMachine->UpdateState(DCAMERA_STATE_REGIST); @@ -73,7 +73,7 @@ int32_t DCameraSourceInitState::DoRegisterTask(std::shared_ptr int32_t DCameraSourceInitState::DoUnregisterTask(std::shared_ptr& camDev, DCameraSourceEvent& event) { - DHLOGI("DCameraSourceInitState DoUnregisterTask Idempotent"); + DCLOGI("DCameraSourceInitState DoUnregisterTask Idempotent"); (void)camDev; (void)event; return DCAMERA_OK; diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_opened_state.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_opened_state.cpp index 110767a7ff79d1ebac71d449d42b526f29582bff..faf44a5cec65cae28f535f338d9feb4706c35ddc 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_opened_state.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_opened_state.cpp @@ -18,7 +18,7 @@ #include "dcamera_source_dev.h" #include "dcamera_source_state_machine.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -40,14 +40,14 @@ int32_t DCameraSourceOpenedState::Execute(std::shared_ptr& cam { auto itFunc = memberFuncMap_.find(eventType); if (itFunc == memberFuncMap_.end()) { - DHLOGE("DCameraSourceOpenedState execute %d in wrong state", eventType); + DCLOGE("DCameraSourceOpenedState execute %d in wrong state", eventType); return DCAMERA_WRONG_STATE; } auto memberFunc = itFunc->second; int32_t ret = (this->*memberFunc)(camDev, event); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceOpenedState execute %d failed, ret: %d", eventType, ret); + DCLOGE("DCameraSourceOpenedState execute %d failed, ret: %d", eventType, ret); } return ret; } @@ -59,7 +59,7 @@ DCameraStateType DCameraSourceOpenedState::GetStateType() int32_t DCameraSourceOpenedState::DoRegisterTask(std::shared_ptr& camDev, DCameraSourceEvent& event) { - DHLOGI("DCameraSourceOpenedState DoRegisterTask Idempotent"); + DCLOGI("DCameraSourceOpenedState DoRegisterTask Idempotent"); (void)camDev; (void)event; return DCAMERA_OK; @@ -72,13 +72,13 @@ int32_t DCameraSourceOpenedState::DoUnregisterTask(std::shared_ptreventResult_ = DCAMERA_EVENT_CHANNEL_DISCONNECTED; int32_t ret = camDev->CameraEventNotify(camEvent); if (ret != DCAMERA_OK) { - DHLOGE("CameraEventNotify failed: %d", ret); + DCLOGE("CameraEventNotify failed: %d", ret); return ret; } ret = camDev->CloseCamera(); if (ret != DCAMERA_OK) { - DHLOGE("CloseCamera failed: %d", ret); + DCLOGE("CloseCamera failed: %d", ret); return ret; } @@ -89,12 +89,12 @@ int32_t DCameraSourceOpenedState::DoUnregisterTask(std::shared_ptrUnRegister(param); if (ret != DCAMERA_OK) { - DHLOGE("UnRegister failed: %d", ret); + DCLOGE("UnRegister failed: %d", ret); return ret; } std::shared_ptr stateMachine = stateMachine_.lock(); if (stateMachine == nullptr) { - DHLOGE("can not get stateMachine"); + DCLOGE("can not get stateMachine"); return DCAMERA_BAD_VALUE; } stateMachine->UpdateState(DCAMERA_STATE_INIT); @@ -112,12 +112,12 @@ int32_t DCameraSourceOpenedState::DoConfigStreamsTask(std::shared_ptrConfigStreams(streamInfos); if (ret != DCAMERA_OK) { - DHLOGE("ConfigStreams failed, ret: %d", ret); + DCLOGE("ConfigStreams failed, ret: %d", ret); return ret; } std::shared_ptr stateMachine = stateMachine_.lock(); if (stateMachine == nullptr) { - DHLOGE("can not get stateMachine"); + DCLOGE("can not get stateMachine"); return DCAMERA_BAD_VALUE; } stateMachine->UpdateState(DCAMERA_STATE_CONFIG_STREAM); @@ -127,7 +127,7 @@ int32_t DCameraSourceOpenedState::DoConfigStreamsTask(std::shared_ptr& camDev, DCameraSourceEvent& event) { - DHLOGI("DCameraSourceOpenedState DoReleaseStreamsTask Idempotent"); + DCLOGI("DCameraSourceOpenedState DoReleaseStreamsTask Idempotent"); (void)camDev; (void)event; return DCAMERA_OK; @@ -144,7 +144,7 @@ int32_t DCameraSourceOpenedState::DoUpdateSettingsTask(std::shared_ptrUpdateSettings(settings); if (ret != DCAMERA_OK) { - DHLOGE("UpdateSettings failed, ret: %d", ret); + DCLOGE("UpdateSettings failed, ret: %d", ret); return ret; } return DCAMERA_OK; @@ -152,7 +152,7 @@ int32_t DCameraSourceOpenedState::DoUpdateSettingsTask(std::shared_ptr& camDev, DCameraSourceEvent& event) { - DHLOGI("DCameraSourceOpenedState DoOpenTask Idempotent"); + DCLOGI("DCameraSourceOpenedState DoOpenTask Idempotent"); (void)camDev; (void)event; return DCAMERA_OK; @@ -162,12 +162,12 @@ int32_t DCameraSourceOpenedState::DoCloseTask(std::shared_ptr& { int32_t ret = camDev->CloseCamera(); if (ret != DCAMERA_OK) { - DHLOGE("CloseCamera failed, ret: %d", ret); + DCLOGE("CloseCamera failed, ret: %d", ret); return ret; } std::shared_ptr stateMachine = stateMachine_.lock(); if (stateMachine == nullptr) { - DHLOGE("can not get stateMachine"); + DCLOGE("can not get stateMachine"); return DCAMERA_BAD_VALUE; } stateMachine->UpdateState(DCAMERA_STATE_REGIST); @@ -185,7 +185,7 @@ int32_t DCameraSourceOpenedState::DoEventNofityTask(std::shared_ptrCameraEventNotify(camEvent); if (ret != DCAMERA_OK) { - DHLOGE("CameraEventNotify failed, ret: %d", ret); + DCLOGE("CameraEventNotify failed, ret: %d", ret); return ret; } return DCAMERA_OK; diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_regist_state.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_regist_state.cpp index 779c41721c15a05b380048e03e0599a1441aa35a..2ec3e729543fd4b72f4731f7ecec88921d3413aa 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_regist_state.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_regist_state.cpp @@ -18,7 +18,7 @@ #include "dcamera_source_dev.h" #include "dcamera_source_state_machine.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -37,14 +37,14 @@ int32_t DCameraSourceRegistState::Execute(std::shared_ptr& cam { auto itFunc = memberFuncMap_.find(eventType); if (itFunc == memberFuncMap_.end()) { - DHLOGE("DCameraSourceRegistState execute %d in wrong state", eventType); + DCLOGE("DCameraSourceRegistState execute %d in wrong state", eventType); return DCAMERA_WRONG_STATE; } auto memberFunc = itFunc->second; int32_t ret = (this->*memberFunc)(camDev, event); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceRegistState execute %d failed, ret: %d", eventType, ret); + DCLOGE("DCameraSourceRegistState execute %d failed, ret: %d", eventType, ret); } return ret; } @@ -56,7 +56,7 @@ DCameraStateType DCameraSourceRegistState::GetStateType() int32_t DCameraSourceRegistState::DoRegisterTask(std::shared_ptr& camDev, DCameraSourceEvent& event) { - DHLOGI("DCameraSourceRegistState DoRegisterTask Idempotent"); + DCLOGI("DCameraSourceRegistState DoRegisterTask Idempotent"); (void)camDev; (void)event; return DCAMERA_OK; @@ -76,7 +76,7 @@ int32_t DCameraSourceRegistState::DoUnregisterTask(std::shared_ptr stateMachine = stateMachine_.lock(); if (stateMachine == nullptr) { - DHLOGE("DCameraSourceRegistState DoUnregisterTask can not get stateMachine"); + DCLOGE("DCameraSourceRegistState DoUnregisterTask can not get stateMachine"); return DCAMERA_BAD_VALUE; } stateMachine->UpdateState(DCAMERA_STATE_INIT); @@ -87,7 +87,7 @@ int32_t DCameraSourceRegistState::DoOpenTask(std::shared_ptr& { int32_t ret = camDev->OpenCamera(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceRegistState OpenCamera failed, ret: %d", ret); + DCLOGE("DCameraSourceRegistState OpenCamera failed, ret: %d", ret); return ret; } return DCAMERA_OK; @@ -95,7 +95,7 @@ int32_t DCameraSourceRegistState::DoOpenTask(std::shared_ptr& int32_t DCameraSourceRegistState::DoCloseTask(std::shared_ptr& camDev, DCameraSourceEvent& event) { - DHLOGI("DCameraSourceRegistState DoCloseTask Idempotent"); + DCLOGI("DCameraSourceRegistState DoCloseTask Idempotent"); return DCAMERA_OK; } @@ -110,7 +110,7 @@ int32_t DCameraSourceRegistState::DoEventNofityTask(std::shared_ptrCameraEventNotify(camEvent); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceRegistState DoEventNofityTask CameraEventNotify failed, ret: %d", ret); + DCLOGE("DCameraSourceRegistState DoEventNofityTask CameraEventNotify failed, ret: %d", ret); return ret; } return DCAMERA_OK; diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_state_factory.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_state_factory.cpp index 7a80073e14efd76952b45e24282e71168ad81aba..debc80e7579e2114bdb270f676ce75bdad3d4554 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_state_factory.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_state_factory.cpp @@ -22,7 +22,7 @@ #include "dcamera_source_regist_state.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -54,7 +54,7 @@ std::shared_ptr DCameraSourceStateFactory::CreateState(DCame break; } default: { - DHLOGE("DCameraSourceStateFactory create state failed, wrong type %d", stateType); + DCLOGE("DCameraSourceStateFactory create state failed, wrong type %d", stateType); return nullptr; } } 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 31c851044f1c61b7912f49b546d99e0adba46f2e..9c2db2f740c5a8ac22f99300a9b6163ddc7b9809 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 @@ -19,31 +19,31 @@ #include "dcamera_source_state_factory.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { DCameraSourceStateMachine::DCameraSourceStateMachine(std::shared_ptr& camDev) : camDev_(camDev) { - DHLOGI("DCameraSourceStateMachine Create"); + DCLOGI("DCameraSourceStateMachine Create"); } DCameraSourceStateMachine::~DCameraSourceStateMachine() { - DHLOGI("DCameraSourceStateMachine Delete"); + DCLOGI("DCameraSourceStateMachine Delete"); } int32_t DCameraSourceStateMachine::Execute(DCAMERA_EVENT eventType, DCameraSourceEvent& event) { - DHLOGI("In state %d execute event %d", currentState_->GetStateType(), eventType); + DCLOGI("In state %d execute event %d", currentState_->GetStateType(), eventType); std::shared_ptr camDev = camDev_.lock(); if (camDev == nullptr) { - DHLOGE("DCameraSourceStateMachine execute failed, camDev is nullptr"); + DCLOGE("DCameraSourceStateMachine execute failed, camDev is nullptr"); return DCAMERA_BAD_VALUE; } int32_t ret = currentState_->Execute(camDev, event.GetEventType(), event); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceStateMachine currentState_: %d execute event: %d failed", currentState_->GetStateType(), + DCLOGE("DCameraSourceStateMachine currentState_: %d execute event: %d failed", currentState_->GetStateType(), event.GetEventType()); } return ret; @@ -52,9 +52,9 @@ int32_t DCameraSourceStateMachine::Execute(DCAMERA_EVENT eventType, DCameraSourc void DCameraSourceStateMachine::UpdateState(DCameraStateType stateType) { if (stateType != DCAMERA_STATE_INIT) { - DHLOGI("DCameraSourceStateMachine update state from %d to %d", currentState_->GetStateType(), stateType); + DCLOGI("DCameraSourceStateMachine update state from %d to %d", currentState_->GetStateType(), stateType); } else { - DHLOGI("DCameraSourceStateMachine update state %d", stateType); + DCLOGI("DCameraSourceStateMachine update state %d", stateType); } auto stateMachine = std::shared_ptr(shared_from_this()); currentState_ = DCameraSourceStateFactory::GetInstance().CreateState(stateType, stateMachine); @@ -62,7 +62,7 @@ void DCameraSourceStateMachine::UpdateState(DCameraStateType stateType) int32_t DCameraSourceStateMachine::GetCameraState() { - DHLOGI("GetCameraState In state %d", currentState_->GetStateType()); + DCLOGI("GetCameraState In state %d", currentState_->GetStateType()); return currentState_->GetStateType(); } } // namespace DistributedHardware diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn index f079e28231e5b1c5b9bad271d2c6f8f7cb5167b9..4f6fa9d6dfdae521e0f3a43d1d2ab97e913d2e03 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn @@ -88,7 +88,7 @@ ohos_unittest("DCameraSourceTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DCameraSourceTest\"", + "DC_LOG_TAG=\"DCameraSourceTest\"", "LOG_DOMAIN=0xD004100", ] } diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/dcamera_service_state_listener_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/dcamera_service_state_listener_test.cpp index 2acdb0b7056d51f12e602e63aa0ad6e1794cd6ff..dbcc3719d2d0057195417b6b63a804572e5f17f3 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/dcamera_service_state_listener_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/dcamera_service_state_listener_test.cpp @@ -18,7 +18,7 @@ #include "dcamera_service_state_listener.h" #include "dcamera_source_callback.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" using namespace testing::ext; @@ -43,23 +43,23 @@ std::string TEST_ATTRS = ""; void DcameraServiceStateListenerTest::SetUpTestCase(void) { - DHLOGI("DcameraServiceStateListenerTest::SetUpTestCase"); + DCLOGI("DcameraServiceStateListenerTest::SetUpTestCase"); } void DcameraServiceStateListenerTest::TearDownTestCase(void) { - DHLOGI("DcameraServiceStateListenerTest::TearDownTestCase"); + DCLOGI("DcameraServiceStateListenerTest::TearDownTestCase"); } void DcameraServiceStateListenerTest::SetUp(void) { - DHLOGI("DcameraServiceStateListenerTest::SetUp"); + DCLOGI("DcameraServiceStateListenerTest::SetUp"); testListener_ = std::make_shared(); } void DcameraServiceStateListenerTest::TearDown(void) { - DHLOGI("DcameraServiceStateListenerTest::TearDown"); + DCLOGI("DcameraServiceStateListenerTest::TearDown"); testListener_ = nullptr; } @@ -71,7 +71,7 @@ void DcameraServiceStateListenerTest::TearDown(void) */ HWTEST_F(DcameraServiceStateListenerTest, dcamera_service_state_listener_test_001, TestSize.Level1) { - DHLOGI("DcameraServiceStateListenerTest::dcamera_service_state_listener_test_001"); + DCLOGI("DcameraServiceStateListenerTest::dcamera_service_state_listener_test_001"); EXPECT_EQ(false, testListener_ == nullptr); int32_t status = 0; @@ -90,7 +90,7 @@ HWTEST_F(DcameraServiceStateListenerTest, dcamera_service_state_listener_test_00 */ HWTEST_F(DcameraServiceStateListenerTest, dcamera_service_state_listener_test_002, TestSize.Level1) { - DHLOGI("DcameraServiceStateListenerTest::dcamera_service_state_listener_test_002"); + DCLOGI("DcameraServiceStateListenerTest::dcamera_service_state_listener_test_002"); EXPECT_EQ(false, testListener_ == nullptr); sptr callback(new DCameraSourceCallback()); diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/dcamera_source_callback_proxy_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/dcamera_source_callback_proxy_test.cpp index 2c466a2c4976b6302b4ec5256b104baea948773e..79aa7a5258188d9cfbc36ab7a620eba446e208d3 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/dcamera_source_callback_proxy_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/dcamera_source_callback_proxy_test.cpp @@ -19,7 +19,7 @@ #include "distributed_camera_errno.h" #include "distributed_camera_constants.h" #include "distributed_camera_source_proxy.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "if_system_ability_manager.h" #include "iservice_registry.h" @@ -44,22 +44,22 @@ std::string TEST_ATTRS = ""; void DcameraSourceCallbackProxyTest::SetUpTestCase(void) { - DHLOGI("DcameraSourceCallbackProxyTest::SetUpTestCase"); + DCLOGI("DcameraSourceCallbackProxyTest::SetUpTestCase"); } void DcameraSourceCallbackProxyTest::TearDownTestCase(void) { - DHLOGI("DcameraSourceCallbackProxyTest::TearDownTestCase"); + DCLOGI("DcameraSourceCallbackProxyTest::TearDownTestCase"); } void DcameraSourceCallbackProxyTest::SetUp(void) { - DHLOGI("DcameraSourceCallbackProxyTest::SetUp"); + DCLOGI("DcameraSourceCallbackProxyTest::SetUp"); } void DcameraSourceCallbackProxyTest::TearDown(void) { - DHLOGI("DcameraSourceCallbackProxyTest::TearDown"); + DCLOGI("DcameraSourceCallbackProxyTest::TearDown"); } /** @@ -70,7 +70,7 @@ void DcameraSourceCallbackProxyTest::TearDown(void) */ HWTEST_F(DcameraSourceCallbackProxyTest, dcamera_source_callback_proxy_test_001, TestSize.Level1) { - DHLOGI("DcameraSourceCallbackProxyTest::dcamera_source_callback_proxy_test_001"); + DCLOGI("DcameraSourceCallbackProxyTest::dcamera_source_callback_proxy_test_001"); sptr samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); sptr remoteObject = samgr->GetSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID); @@ -94,7 +94,7 @@ HWTEST_F(DcameraSourceCallbackProxyTest, dcamera_source_callback_proxy_test_001, */ HWTEST_F(DcameraSourceCallbackProxyTest, dcamera_source_callback_proxy_test_002, TestSize.Level1) { - DHLOGI("DcameraSourceCallbackProxyTest::dcamera_source_callback_proxy_test_002"); + DCLOGI("DcameraSourceCallbackProxyTest::dcamera_source_callback_proxy_test_002"); sptr samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); sptr remoteObject = samgr->GetSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID); @@ -118,7 +118,7 @@ HWTEST_F(DcameraSourceCallbackProxyTest, dcamera_source_callback_proxy_test_002, */ HWTEST_F(DcameraSourceCallbackProxyTest, dcamera_source_callback_proxy_test_003, TestSize.Level1) { - DHLOGI("DcameraSourceCallbackProxyTest::dcamera_source_callback_proxy_test_003"); + DCLOGI("DcameraSourceCallbackProxyTest::dcamera_source_callback_proxy_test_003"); sptr samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); sptr remoteObject = samgr->GetSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID); diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/dcamera_source_hidumper_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/dcamera_source_hidumper_test.cpp index ce9ce260a19e42aa3eb194ac0f4f9b49bb26e1fc..7a53d0412263f769ba1c98c7e1c9b9d0e5dfe2df 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/dcamera_source_hidumper_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/dcamera_source_hidumper_test.cpp @@ -16,7 +16,7 @@ #include #include "dcamera_source_hidumper.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" using namespace testing::ext; @@ -32,22 +32,22 @@ public: void DcameraSourceHidumperTest::SetUpTestCase(void) { - DHLOGI("DcameraSourceHidumperTest::SetUpTestCase"); + DCLOGI("DcameraSourceHidumperTest::SetUpTestCase"); } void DcameraSourceHidumperTest::TearDownTestCase(void) { - DHLOGI("DcameraSourceHidumperTest::TearDownTestCase"); + DCLOGI("DcameraSourceHidumperTest::TearDownTestCase"); } void DcameraSourceHidumperTest::SetUp(void) { - DHLOGI("DcameraSourceHidumperTest::SetUp"); + DCLOGI("DcameraSourceHidumperTest::SetUp"); } void DcameraSourceHidumperTest::TearDown(void) { - DHLOGI("DcameraSourceHidumperTest::TearDown"); + DCLOGI("DcameraSourceHidumperTest::TearDown"); } /** @@ -58,7 +58,7 @@ void DcameraSourceHidumperTest::TearDown(void) */ HWTEST_F(DcameraSourceHidumperTest, dcamera_source_hidumper_test_001, TestSize.Level1) { - DHLOGI("DcameraSourceHidumperTest::dcamera_source_hidumper_test_001"); + DCLOGI("DcameraSourceHidumperTest::dcamera_source_hidumper_test_001"); std::vector args; std::string result; bool ret = DcameraSourceHidumper::GetInstance().Dump(args, result); @@ -73,7 +73,7 @@ HWTEST_F(DcameraSourceHidumperTest, dcamera_source_hidumper_test_001, TestSize.L */ HWTEST_F(DcameraSourceHidumperTest, dcamera_source_hidumper_test_002, TestSize.Level1) { - DHLOGI("DcameraSourceHidumperTest::dcamera_source_hidumper_test_002"); + DCLOGI("DcameraSourceHidumperTest::dcamera_source_hidumper_test_002"); std::vector args; std::string str1 = "--version"; std::string str2 = "--camNum"; @@ -92,7 +92,7 @@ HWTEST_F(DcameraSourceHidumperTest, dcamera_source_hidumper_test_002, TestSize.L */ HWTEST_F(DcameraSourceHidumperTest, dcamera_source_hidumper_test_003, TestSize.Level1) { - DHLOGI("DcameraSourceHidumperTest::dcamera_source_hidumper_test_003"); + DCLOGI("DcameraSourceHidumperTest::dcamera_source_hidumper_test_003"); std::vector args; std::string str1 = "--version"; args.push_back(str1); @@ -109,7 +109,7 @@ HWTEST_F(DcameraSourceHidumperTest, dcamera_source_hidumper_test_003, TestSize.L */ HWTEST_F(DcameraSourceHidumperTest, dcamera_source_hidumper_test_004, TestSize.Level1) { - DHLOGI("DcameraSourceHidumperTest::dcamera_source_hidumper_test_004"); + DCLOGI("DcameraSourceHidumperTest::dcamera_source_hidumper_test_004"); std::vector args; std::string str1 = "--registered"; args.push_back(str1); @@ -126,7 +126,7 @@ HWTEST_F(DcameraSourceHidumperTest, dcamera_source_hidumper_test_004, TestSize.L */ HWTEST_F(DcameraSourceHidumperTest, dcamera_source_hidumper_test_005, TestSize.Level1) { - DHLOGI("DcameraSourceHidumperTest::dcamera_source_hidumper_test_005"); + DCLOGI("DcameraSourceHidumperTest::dcamera_source_hidumper_test_005"); std::vector args; std::string str1 = "--curState"; args.push_back(str1); @@ -143,7 +143,7 @@ HWTEST_F(DcameraSourceHidumperTest, dcamera_source_hidumper_test_005, TestSize.L */ HWTEST_F(DcameraSourceHidumperTest, dcamera_source_hidumper_test_006, TestSize.Level1) { - DHLOGI("DcameraSourceHidumperTest::dcamera_source_hidumper_test_006"); + DCLOGI("DcameraSourceHidumperTest::dcamera_source_hidumper_test_006"); std::vector args; std::string str1 = "-h"; args.push_back(str1); diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_service_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_service_test.cpp index d45a0144b715e4a3ddede900afec0081afbbf122..3e43280b074fb86f2a8d380fcc01d694f4cb3cd0 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_service_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_service_test.cpp @@ -23,7 +23,7 @@ #include "dcamera_source_callback_proxy.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "if_system_ability_manager.h" #include "iservice_registry.h" @@ -49,23 +49,23 @@ const std::string TEST_REQID = "bb536a637105409e904d4da83790a4a7"; void DistributedCameraSourceServiceTest::SetUpTestCase(void) { - DHLOGI("DistributedCameraSourceServiceTest::SetUpTestCase"); + DCLOGI("DistributedCameraSourceServiceTest::SetUpTestCase"); } void DistributedCameraSourceServiceTest::TearDownTestCase(void) { - DHLOGI("DistributedCameraSourceServiceTest::TearDownTestCase"); + DCLOGI("DistributedCameraSourceServiceTest::TearDownTestCase"); } void DistributedCameraSourceServiceTest::SetUp(void) { - DHLOGI("DistributedCameraSourceServiceTest::SetUp"); + DCLOGI("DistributedCameraSourceServiceTest::SetUp"); testSrcService_ = std::make_shared(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, true); } void DistributedCameraSourceServiceTest::TearDown(void) { - DHLOGI("DistributedCameraSourceServiceTest::TearDown"); + DCLOGI("DistributedCameraSourceServiceTest::TearDown"); testSrcService_ = nullptr; } @@ -77,7 +77,7 @@ void DistributedCameraSourceServiceTest::TearDown(void) */ HWTEST_F(DistributedCameraSourceServiceTest, dcamera_source_service_test_001, TestSize.Level1) { - DHLOGI("DistributedCameraSourceServiceTest::dcamera_source_service_test_001"); + DCLOGI("DistributedCameraSourceServiceTest::dcamera_source_service_test_001"); EXPECT_EQ(false, testSrcService_ == nullptr); EnableParam param; @@ -96,7 +96,7 @@ HWTEST_F(DistributedCameraSourceServiceTest, dcamera_source_service_test_001, Te */ HWTEST_F(DistributedCameraSourceServiceTest, dcamera_source_service_test_002, TestSize.Level1) { - DHLOGI("DistributedCameraSourceServiceTest::dcamera_source_service_test_002"); + DCLOGI("DistributedCameraSourceServiceTest::dcamera_source_service_test_002"); EXPECT_EQ(false, testSrcService_ == nullptr); std::string events; @@ -112,7 +112,7 @@ HWTEST_F(DistributedCameraSourceServiceTest, dcamera_source_service_test_002, Te */ HWTEST_F(DistributedCameraSourceServiceTest, dcamera_source_service_test_003, TestSize.Level1) { - DHLOGI("DistributedCameraSourceServiceTest::dcamera_source_service_test_003"); + DCLOGI("DistributedCameraSourceServiceTest::dcamera_source_service_test_003"); EXPECT_EQ(false, testSrcService_ == nullptr); int32_t fd = 1; @@ -131,7 +131,7 @@ HWTEST_F(DistributedCameraSourceServiceTest, dcamera_source_service_test_003, Te */ HWTEST_F(DistributedCameraSourceServiceTest, dcamera_source_service_test_004, TestSize.Level1) { - DHLOGI("DistributedCameraSourceServiceTest::dcamera_source_service_test_004"); + DCLOGI("DistributedCameraSourceServiceTest::dcamera_source_service_test_004"); EXPECT_EQ(false, testSrcService_ == nullptr); int32_t ret = 0; @@ -148,7 +148,7 @@ HWTEST_F(DistributedCameraSourceServiceTest, dcamera_source_service_test_004, Te */ HWTEST_F(DistributedCameraSourceServiceTest, dcamera_source_service_test_005, TestSize.Level1) { - DHLOGI("DistributedCameraSourceServiceTest::dcamera_source_service_test_005"); + DCLOGI("DistributedCameraSourceServiceTest::dcamera_source_service_test_005"); EXPECT_EQ(false, testSrcService_ == nullptr); int32_t ret = 0; @@ -165,7 +165,7 @@ HWTEST_F(DistributedCameraSourceServiceTest, dcamera_source_service_test_005, Te */ HWTEST_F(DistributedCameraSourceServiceTest, dcamera_source_service_test_006, TestSize.Level1) { - DHLOGI("DistributedCameraSourceServiceTest::dcamera_source_service_test_006"); + DCLOGI("DistributedCameraSourceServiceTest::dcamera_source_service_test_006"); EXPECT_EQ(false, testSrcService_ == nullptr); std::string params = "test006"; @@ -186,7 +186,7 @@ HWTEST_F(DistributedCameraSourceServiceTest, dcamera_source_service_test_006, Te */ HWTEST_F(DistributedCameraSourceServiceTest, dcamera_source_service_test_007, TestSize.Level1) { - DHLOGI("DistributedCameraSourceServiceTest::dcamera_source_service_test_007"); + DCLOGI("DistributedCameraSourceServiceTest::dcamera_source_service_test_007"); EXPECT_EQ(false, testSrcService_ == nullptr); int32_t ret = testSrcService_->ReleaseSource(); @@ -201,7 +201,7 @@ HWTEST_F(DistributedCameraSourceServiceTest, dcamera_source_service_test_007, Te */ HWTEST_F(DistributedCameraSourceServiceTest, dcamera_source_service_test_008, TestSize.Level1) { - DHLOGI("DistributedCameraSourceServiceTest::dcamera_source_service_test_008"); + DCLOGI("DistributedCameraSourceServiceTest::dcamera_source_service_test_008"); EXPECT_EQ(false, testSrcService_ == nullptr); int32_t ret = testSrcService_->LoadDCameraHDF(); @@ -216,7 +216,7 @@ HWTEST_F(DistributedCameraSourceServiceTest, dcamera_source_service_test_008, Te */ HWTEST_F(DistributedCameraSourceServiceTest, dcamera_source_service_test_009, TestSize.Level1) { - DHLOGI("DistributedCameraSourceServiceTest::dcamera_source_service_test_009"); + DCLOGI("DistributedCameraSourceServiceTest::dcamera_source_service_test_009"); EXPECT_EQ(false, testSrcService_ == nullptr); int32_t ret = testSrcService_->LoadDCameraHDF(); diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_stub_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_stub_test.cpp index 1b653c24c18b89779b10a5309e415e3e073e25a8..e84ccac419a9dc64b36d4f52ed195431524bfaf9 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_stub_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_stub_test.cpp @@ -18,7 +18,7 @@ #include "dcamera_source_callback.h" #include "distributed_camera_source_proxy.h" #include "distributed_camera_source_stub.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "mock_distributed_camera_source_stub.h" using namespace testing::ext; @@ -35,22 +35,22 @@ public: void DcameraSourceStubTest::SetUpTestCase(void) { - DHLOGI("DcameraSourceStubTest::SetUpTestCase"); + DCLOGI("DcameraSourceStubTest::SetUpTestCase"); } void DcameraSourceStubTest::TearDownTestCase(void) { - DHLOGI("DcameraSourceStubTest::TearDownTestCase"); + DCLOGI("DcameraSourceStubTest::TearDownTestCase"); } void DcameraSourceStubTest::SetUp(void) { - DHLOGI("DcameraSourceStubTest::SetUp"); + DCLOGI("DcameraSourceStubTest::SetUp"); } void DcameraSourceStubTest::TearDown(void) { - DHLOGI("DcameraSourceStubTest::TearDown"); + DCLOGI("DcameraSourceStubTest::TearDown"); } /** @@ -61,7 +61,7 @@ void DcameraSourceStubTest::TearDown(void) */ HWTEST_F(DcameraSourceStubTest, dcamera_source_stub_test_001, TestSize.Level1) { - DHLOGI("DcameraSourceStubTest::dcamera_source_stub_test_001"); + DCLOGI("DcameraSourceStubTest::dcamera_source_stub_test_001"); sptr sourceStubPtr(new MockDistributedCameraSourceStub()); DistributedCameraSourceProxy sourceProxy(sourceStubPtr); std::string params = "params000"; @@ -78,7 +78,7 @@ HWTEST_F(DcameraSourceStubTest, dcamera_source_stub_test_001, TestSize.Level1) */ HWTEST_F(DcameraSourceStubTest, dcamera_source_stub_test_002, TestSize.Level1) { - DHLOGI("DcameraSourceStubTest::dcamera_source_stub_test_002"); + DCLOGI("DcameraSourceStubTest::dcamera_source_stub_test_002"); sptr sourceStubPtr(new MockDistributedCameraSourceStub()); DistributedCameraSourceProxy sourceProxy(sourceStubPtr); int32_t ret = sourceProxy.ReleaseSource(); @@ -93,7 +93,7 @@ HWTEST_F(DcameraSourceStubTest, dcamera_source_stub_test_002, TestSize.Level1) */ HWTEST_F(DcameraSourceStubTest, dcamera_source_stub_test_003, TestSize.Level1) { - DHLOGI("DcameraSourceStubTest::dcamera_source_stub_test_003"); + DCLOGI("DcameraSourceStubTest::dcamera_source_stub_test_003"); sptr sourceStubPtr(new MockDistributedCameraSourceStub()); DistributedCameraSourceProxy sourceProxy(sourceStubPtr); std::string devId = "devId000"; @@ -116,7 +116,7 @@ HWTEST_F(DcameraSourceStubTest, dcamera_source_stub_test_003, TestSize.Level1) */ HWTEST_F(DcameraSourceStubTest, dcamera_source_stub_test_004, TestSize.Level1) { - DHLOGI("DcameraSourceStubTest::dcamera_source_stub_test_004"); + DCLOGI("DcameraSourceStubTest::dcamera_source_stub_test_004"); sptr sourceStubPtr(new MockDistributedCameraSourceStub()); DistributedCameraSourceProxy sourceProxy(sourceStubPtr); std::string devId = "devId000"; @@ -134,7 +134,7 @@ HWTEST_F(DcameraSourceStubTest, dcamera_source_stub_test_004, TestSize.Level1) */ HWTEST_F(DcameraSourceStubTest, dcamera_source_stub_test_005, TestSize.Level1) { - DHLOGI("DcameraSourceStubTest::dcamera_source_stub_test_005"); + DCLOGI("DcameraSourceStubTest::dcamera_source_stub_test_005"); sptr sourceStubPtr(new MockDistributedCameraSourceStub()); DistributedCameraSourceProxy sourceProxy(sourceStubPtr); std::string devId = "devId000"; diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn index 4ff940092ea7ded6553cbbac6cb06d342c43c58a..780a3b5a8749657ffa4a082b2dff152ddcd96f11 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -102,7 +102,7 @@ ohos_unittest("DCameraSourceMgrTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DCameraSourceMgrTest\"", + "DC_LOG_TAG=\"DCameraSourceMgrTest\"", "LOG_DOMAIN=0xD004100", ] } diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_feeding_smoother_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_feeding_smoother_test.cpp index 66f8aefcb342c8e4c8673b0d5e48d0f5d16d9f7b..08502cf0a64407924db54685d0e71cbb6b53a1ba 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_feeding_smoother_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_feeding_smoother_test.cpp @@ -18,7 +18,7 @@ #include "dcamera_feeding_smoother.h" #undef private #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "dcamera_utils_tools.h" using namespace testing::ext; @@ -60,7 +60,7 @@ void DCameraFeedingSmotherTest::TearDown(void) */ HWTEST_F(DCameraFeedingSmotherTest, dcamera_feeding_smoother_test_001, TestSize.Level1) { - DHLOGI("dcamera_feeding_smoother_test_001"); + DCLOGI("dcamera_feeding_smoother_test_001"); std::unique_ptr smoother = std::make_unique(); smoother->state_ = SMOOTH_STOP; int32_t ret = smoother->StartSmooth(); @@ -79,7 +79,7 @@ HWTEST_F(DCameraFeedingSmotherTest, dcamera_feeding_smoother_test_001, TestSize. */ HWTEST_F(DCameraFeedingSmotherTest, dcamera_feeding_smoother_test_002, TestSize.Level1) { - DHLOGI("dcamera_feeding_smoother_test_002"); + DCLOGI("dcamera_feeding_smoother_test_002"); std::unique_ptr smoother = std::make_unique(); smoother->state_ = SMOOTH_STOP; int32_t ret = smoother->StopSmooth(); @@ -98,7 +98,7 @@ HWTEST_F(DCameraFeedingSmotherTest, dcamera_feeding_smoother_test_002, TestSize. */ HWTEST_F(DCameraFeedingSmotherTest, dcamera_feeding_smoother_test_003, TestSize.Level1) { - DHLOGI("dcamera_feeding_smoother_test_003"); + DCLOGI("dcamera_feeding_smoother_test_003"); std::unique_ptr smoother = std::make_unique(); int32_t ret = smoother->StartSmooth(); size_t capacity = 1; @@ -117,7 +117,7 @@ HWTEST_F(DCameraFeedingSmotherTest, dcamera_feeding_smoother_test_003, TestSize. */ HWTEST_F(DCameraFeedingSmotherTest, dcamera_feeding_smoother_test_004, TestSize.Level1) { - DHLOGI("dcamera_feeding_smoother_test_004"); + DCLOGI("dcamera_feeding_smoother_test_004"); std::unique_ptr smoother = std::make_unique(); int32_t ret = smoother->StartSmooth(); size_t capacity = 1; @@ -145,7 +145,7 @@ HWTEST_F(DCameraFeedingSmotherTest, dcamera_feeding_smoother_test_004, TestSize. */ HWTEST_F(DCameraFeedingSmotherTest, dcamera_feeding_smoother_test_005, TestSize.Level1) { - DHLOGI("dcamera_feeding_smoother_test_005"); + DCLOGI("dcamera_feeding_smoother_test_005"); std::unique_ptr smoother = std::make_unique(); smoother->CheckIsProcessInDynamicBalance(); smoother->SetProcessDynamicBalanceState(false); @@ -176,7 +176,7 @@ HWTEST_F(DCameraFeedingSmotherTest, dcamera_feeding_smoother_test_005, TestSize. */ HWTEST_F(DCameraFeedingSmotherTest, dcamera_feeding_smoother_test_006, TestSize.Level1) { - DHLOGI("dcamera_feeding_smoother_test_006"); + DCLOGI("dcamera_feeding_smoother_test_006"); std::unique_ptr smoother = std::make_unique(); smoother->delta_ = FRAME_INTERVAL; smoother->sleep_ = FRAME_INTERVAL; @@ -195,7 +195,7 @@ HWTEST_F(DCameraFeedingSmotherTest, dcamera_feeding_smoother_test_006, TestSize. */ HWTEST_F(DCameraFeedingSmotherTest, dcamera_feeding_smoother_test_007, TestSize.Level1) { - DHLOGI("dcamera_feeding_smoother_test_007"); + DCLOGI("dcamera_feeding_smoother_test_007"); std::unique_ptr smoother = std::make_unique(); int64_t timeStamp = TWOFOLD * FRAME_INTERVAL; int64_t clock = TWOFOLD * FRAME_INTERVAL; diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_hdf_operate_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_hdf_operate_test.cpp index 1b6fab4275caef14d042d218a494934d64c0dae1..7081c54f19e47babca88ffcf3685d40762d9d007 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_hdf_operate_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_hdf_operate_test.cpp @@ -20,7 +20,7 @@ #undef private #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" using namespace testing::ext; @@ -36,22 +36,22 @@ public: void DCameraHdfOperateTest::SetUpTestCase(void) { - DHLOGI("DCameraHdfOperateTest::SetUpTestCase"); + DCLOGI("DCameraHdfOperateTest::SetUpTestCase"); } void DCameraHdfOperateTest::TearDownTestCase(void) { - DHLOGI("DCameraHdfOperateTest::TearDownTestCase"); + DCLOGI("DCameraHdfOperateTest::TearDownTestCase"); } void DCameraHdfOperateTest::SetUp(void) { - DHLOGI("DCameraHdfOperateTest::SetUp"); + DCLOGI("DCameraHdfOperateTest::SetUp"); } void DCameraHdfOperateTest::TearDown(void) { - DHLOGI("DCameraHdfOperateTest::TearDown"); + DCLOGI("DCameraHdfOperateTest::TearDown"); } /** @@ -62,7 +62,7 @@ void DCameraHdfOperateTest::TearDown(void) */ HWTEST_F(DCameraHdfOperateTest, dcamera_hdf_operate_test_001, TestSize.Level1) { - DHLOGI("DCameraHdfOperateTest::dcamera_hdf_operate_test_001"); + DCLOGI("DCameraHdfOperateTest::dcamera_hdf_operate_test_001"); int32_t ret = DCameraHdfOperate::GetInstance().LoadDcameraHDFImpl(); EXPECT_EQ(DCAMERA_OK, ret); } @@ -75,7 +75,7 @@ HWTEST_F(DCameraHdfOperateTest, dcamera_hdf_operate_test_001, TestSize.Level1) */ HWTEST_F(DCameraHdfOperateTest, dcamera_hdf_operate_test_002, TestSize.Level1) { - DHLOGI("DCameraHdfOperateTest::dcamera_hdf_operate_test_002"); + DCLOGI("DCameraHdfOperateTest::dcamera_hdf_operate_test_002"); int32_t ret = DCameraHdfOperate::GetInstance().UnLoadDcameraHDFImpl(); EXPECT_EQ(DCAMERA_OK, ret); } @@ -88,7 +88,7 @@ HWTEST_F(DCameraHdfOperateTest, dcamera_hdf_operate_test_002, TestSize.Level1) */ HWTEST_F(DCameraHdfOperateTest, dcamera_hdf_operate_test_003, TestSize.Level1) { - DHLOGI("DCameraHdfOperateTest::dcamera_hdf_operate_test_003"); + DCLOGI("DCameraHdfOperateTest::dcamera_hdf_operate_test_003"); DCameraHdfOperate::GetInstance().cameraServStatus_ = OHOS::HDI::ServiceManager::V1_0::SERVIE_STATUS_START; DCameraHdfOperate::GetInstance().providerServStatus_ = OHOS::HDI::ServiceManager::V1_0::SERVIE_STATUS_START; int32_t ret = DCameraHdfOperate::GetInstance().LoadDcameraHDFImpl(); @@ -103,7 +103,7 @@ HWTEST_F(DCameraHdfOperateTest, dcamera_hdf_operate_test_003, TestSize.Level1) */ HWTEST_F(DCameraHdfOperateTest, dcamera_hdf_operate_test_004, TestSize.Level1) { - DHLOGI("DCameraHdfOperateTest::dcamera_hdf_operate_test_004"); + DCLOGI("DCameraHdfOperateTest::dcamera_hdf_operate_test_004"); DCameraHdfOperate::GetInstance().cameraServStatus_ = OHOS::HDI::ServiceManager::V1_0::SERVIE_STATUS_STOP; int32_t ret = DCameraHdfOperate::GetInstance().WaitLoadCameraService(); EXPECT_EQ(DCAMERA_BAD_OPERATE, ret); @@ -117,7 +117,7 @@ HWTEST_F(DCameraHdfOperateTest, dcamera_hdf_operate_test_004, TestSize.Level1) */ HWTEST_F(DCameraHdfOperateTest, dcamera_hdf_operate_test_005, TestSize.Level1) { - DHLOGI("DCameraHdfOperateTest::dcamera_hdf_operate_test_005"); + DCLOGI("DCameraHdfOperateTest::dcamera_hdf_operate_test_005"); DCameraHdfOperate::GetInstance().providerServStatus_ = OHOS::HDI::ServiceManager::V1_0::SERVIE_STATUS_STOP; int32_t ret = DCameraHdfOperate::GetInstance().WaitLoadProviderService(); EXPECT_EQ(DCAMERA_BAD_OPERATE, ret); diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_provider_callback_impl_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_provider_callback_impl_test.cpp index 9262477b4943accdf0029e3551d515d355984b6f..60b2100f9308a66f948a739eac68836670e055ca 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_provider_callback_impl_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_provider_callback_impl_test.cpp @@ -20,7 +20,7 @@ #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "mock_dcamera_source_dev.h" #include "mock_dcamera_source_state_listener.h" diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_config_stream_state_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_config_stream_state_test.cpp index 7c5720255776c31b77d3bce0b40f1994cafaa7ea..adb6fc88899a3b3b956f90bf9ec8fbdf2c8242e3 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_config_stream_state_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_config_stream_state_test.cpp @@ -29,7 +29,7 @@ #include "anonymous_string.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" using namespace testing::ext; diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_service_ipc_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_service_ipc_test.cpp index 0a22b70ce55557413680e02a971e6b37d67de90f..1dd76e69e027f7da9f1aa4ae4100d4d3d4ad2bc1 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_service_ipc_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_service_ipc_test.cpp @@ -23,7 +23,7 @@ #include "anonymous_string.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" using namespace testing::ext; @@ -39,22 +39,22 @@ public: void DCameraSourceServiceIpcTest::SetUpTestCase(void) { - DHLOGI("DCameraSourceServiceIpcTest::SetUpTestCase"); + DCLOGI("DCameraSourceServiceIpcTest::SetUpTestCase"); } void DCameraSourceServiceIpcTest::TearDownTestCase(void) { - DHLOGI("DCameraSourceServiceIpcTest::TearDownTestCase"); + DCLOGI("DCameraSourceServiceIpcTest::TearDownTestCase"); } void DCameraSourceServiceIpcTest::SetUp(void) { - DHLOGI("DCameraSourceServiceIpcTest::SetUp"); + DCLOGI("DCameraSourceServiceIpcTest::SetUp"); } void DCameraSourceServiceIpcTest::TearDown(void) { - DHLOGI("DCameraSourceServiceIpcTest::TearDown"); + DCLOGI("DCameraSourceServiceIpcTest::TearDown"); } /** @@ -65,7 +65,7 @@ void DCameraSourceServiceIpcTest::TearDown(void) */ HWTEST_F(DCameraSourceServiceIpcTest, dcamera_source_service_ipc_test_001, TestSize.Level1) { - DHLOGI("DCameraSourceServiceIpcTest::dcamera_source_service_ipc_test_001"); + DCLOGI("DCameraSourceServiceIpcTest::dcamera_source_service_ipc_test_001"); DCameraSourceServiceIpc::GetInstance().Init(); EXPECT_EQ(DCameraSourceServiceIpc::GetInstance().isInit_, true); DCameraSourceServiceIpc::GetInstance().Init(); @@ -80,7 +80,7 @@ HWTEST_F(DCameraSourceServiceIpcTest, dcamera_source_service_ipc_test_001, TestS */ HWTEST_F(DCameraSourceServiceIpcTest, dcamera_source_service_ipc_test_002, TestSize.Level1) { - DHLOGI("DCameraSourceServiceIpcTest::dcamera_source_service_ipc_test_002"); + DCLOGI("DCameraSourceServiceIpcTest::dcamera_source_service_ipc_test_002"); DCameraSourceServiceIpc::GetInstance().Init(); EXPECT_EQ(DCameraSourceServiceIpc::GetInstance().isInit_, true); DCameraSourceServiceIpc::GetInstance().UnInit(); @@ -97,7 +97,7 @@ HWTEST_F(DCameraSourceServiceIpcTest, dcamera_source_service_ipc_test_002, TestS */ HWTEST_F(DCameraSourceServiceIpcTest, dcamera_source_service_ipc_test_003, TestSize.Level1) { - DHLOGI("DCameraSourceServiceIpcTest::dcamera_source_service_ipc_test_003"); + DCLOGI("DCameraSourceServiceIpcTest::dcamera_source_service_ipc_test_003"); std::string deviceId = ""; DCameraSourceServiceIpc::GetInstance().Init(); sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteCamSrv(deviceId); @@ -114,7 +114,7 @@ HWTEST_F(DCameraSourceServiceIpcTest, dcamera_source_service_ipc_test_003, TestS */ HWTEST_F(DCameraSourceServiceIpcTest, dcamera_source_service_ipc_test_004, TestSize.Level1) { - DHLOGI("DCameraSourceServiceIpcTest::dcamera_source_service_ipc_test_004"); + DCLOGI("DCameraSourceServiceIpcTest::dcamera_source_service_ipc_test_004"); std::string deviceId = "test004"; DCameraSourceServiceIpc::GetInstance().Init(); sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteCamSrv(deviceId); @@ -137,7 +137,7 @@ HWTEST_F(DCameraSourceServiceIpcTest, dcamera_source_service_ipc_test_004, TestS */ HWTEST_F(DCameraSourceServiceIpcTest, dcamera_source_service_ipc_test_005, TestSize.Level1) { - DHLOGI("DCameraSourceServiceIpcTest::dcamera_source_service_ipc_test_005"); + DCLOGI("DCameraSourceServiceIpcTest::dcamera_source_service_ipc_test_005"); std::string deviceId = ""; DCameraSourceServiceIpc::GetInstance().Init(); sptr samgr = 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 8a8655a0512070f8068b124c8361081f58e2f5c5..f0331f1ff6278b83d6178ebdff86c18c88cc7165 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 @@ -32,7 +32,7 @@ #include "anonymous_string.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" using namespace testing::ext; diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_stream_data_process_producer_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_stream_data_process_producer_test.cpp index 551758506195430f6e219b527f35fc4f1ea5f38c..e883e6e022c2f0e71fd3b42796944f18c759a85a 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_stream_data_process_producer_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_stream_data_process_producer_test.cpp @@ -23,7 +23,7 @@ #include "dcamera_buffer_handle.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "v1_0/dcamera_types.h" using namespace testing::ext; @@ -70,7 +70,7 @@ void DCameraStreamDataProcessProducerTest::TearDown(void) */ HWTEST_F(DCameraStreamDataProcessProducerTest, dcamera_stream_data_process_producer_test_001, TestSize.Level1) { - DHLOGI("dcamera_stream_data_process_producer_test_001"); + DCLOGI("dcamera_stream_data_process_producer_test_001"); size_t capacity = 1; std::shared_ptr buffer = std::make_shared(capacity); std::shared_ptr streamProcess1 = @@ -104,7 +104,7 @@ HWTEST_F(DCameraStreamDataProcessProducerTest, dcamera_stream_data_process_produ */ HWTEST_F(DCameraStreamDataProcessProducerTest, dcamera_stream_data_process_producer_test_002, TestSize.Level1) { - DHLOGI("dcamera_stream_data_process_producer_test_002"); + DCLOGI("dcamera_stream_data_process_producer_test_002"); size_t capacity = 1; std::shared_ptr buffer = std::make_shared(capacity); std::shared_ptr streamProcess1 = @@ -137,7 +137,7 @@ HWTEST_F(DCameraStreamDataProcessProducerTest, dcamera_stream_data_process_produ */ HWTEST_F(DCameraStreamDataProcessProducerTest, dcamera_stream_data_process_producer_test_003, TestSize.Level1) { - DHLOGI("dcamera_stream_data_process_producer_test_003"); + DCLOGI("dcamera_stream_data_process_producer_test_003"); size_t capacity = 1; std::shared_ptr buffer = std::make_shared(capacity); std::shared_ptr streamProcess1 = @@ -169,7 +169,7 @@ HWTEST_F(DCameraStreamDataProcessProducerTest, dcamera_stream_data_process_produ */ HWTEST_F(DCameraStreamDataProcessProducerTest, dcamera_stream_data_process_producer_test_004, TestSize.Level1) { - DHLOGI("dcamera_stream_data_process_producer_test_004"); + DCLOGI("dcamera_stream_data_process_producer_test_004"); size_t capacity = 1; std::shared_ptr buffer = std::make_shared(capacity); std::shared_ptr streamProcess = @@ -193,7 +193,7 @@ HWTEST_F(DCameraStreamDataProcessProducerTest, dcamera_stream_data_process_produ */ HWTEST_F(DCameraStreamDataProcessProducerTest, dcamera_stream_data_process_producer_test_005, TestSize.Level1) { - DHLOGI("dcamera_stream_data_process_producer_test_005"); + DCLOGI("dcamera_stream_data_process_producer_test_005"); size_t capacity = 1; std::shared_ptr buffer = std::make_shared(capacity); std::shared_ptr streamProcess1 = diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_stream_data_process_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_stream_data_process_test.cpp index 18a962c6d9151458db1190c869f0e033e5146632..4a59e148b728f954c104909f01c354f7ffbae36e 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_stream_data_process_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_stream_data_process_test.cpp @@ -22,7 +22,7 @@ #include "anonymous_string.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "dcamera_pipeline_source.h" #include "dcamera_stream_data_process_pipeline_listener.h" @@ -50,22 +50,22 @@ const int32_t SLEEP_TIME = 200000; } void DCameraStreamDataProcessTest::SetUpTestCase(void) { - DHLOGI("DCameraStreamDataProcessTest::SetUpTestCase"); + DCLOGI("DCameraStreamDataProcessTest::SetUpTestCase"); } void DCameraStreamDataProcessTest::TearDownTestCase(void) { - DHLOGI("DCameraStreamDataProcessTest::TearDownTestCase"); + DCLOGI("DCameraStreamDataProcessTest::TearDownTestCase"); } void DCameraStreamDataProcessTest::SetUp(void) { - DHLOGI("DCameraStreamDataProcessTest::SetUp"); + DCLOGI("DCameraStreamDataProcessTest::SetUp"); } void DCameraStreamDataProcessTest::TearDown(void) { - DHLOGI("DCameraStreamDataProcessTest::TearDown"); + DCLOGI("DCameraStreamDataProcessTest::TearDown"); } /** @@ -76,7 +76,7 @@ void DCameraStreamDataProcessTest::TearDown(void) */ HWTEST_F(DCameraStreamDataProcessTest, dcamera_stream_data_process_test_001, TestSize.Level1) { - DHLOGI("DCameraStreamDataProcessTest::dcamera_stream_data_process_test_001"); + DCLOGI("DCameraStreamDataProcessTest::dcamera_stream_data_process_test_001"); size_t capacity = 1; std::shared_ptr buffer = std::make_shared(capacity); std::shared_ptr streamProcess1 = @@ -100,7 +100,7 @@ HWTEST_F(DCameraStreamDataProcessTest, dcamera_stream_data_process_test_001, Tes */ HWTEST_F(DCameraStreamDataProcessTest, dcamera_stream_data_process_test_002, TestSize.Level1) { - DHLOGI("DCameraStreamDataProcessTest::dcamera_stream_data_process_test_002"); + DCLOGI("DCameraStreamDataProcessTest::dcamera_stream_data_process_test_002"); std::shared_ptr streamProcess = std::make_shared(TEST_DEVICE_ID, TEST_CAMERA_DH_ID_0, DCStreamType::CONTINUOUS_FRAME); std::shared_ptr srcConfig = @@ -123,7 +123,7 @@ HWTEST_F(DCameraStreamDataProcessTest, dcamera_stream_data_process_test_002, Tes */ HWTEST_F(DCameraStreamDataProcessTest, dcamera_stream_data_process_test_003, TestSize.Level1) { - DHLOGI("DCameraStreamDataProcessTest::dcamera_stream_data_process_test_003"); + DCLOGI("DCameraStreamDataProcessTest::dcamera_stream_data_process_test_003"); std::shared_ptr streamProcess = std::make_shared(TEST_DEVICE_ID, TEST_CAMERA_DH_ID_0, DCStreamType::CONTINUOUS_FRAME); size_t capacity = 1; @@ -142,7 +142,7 @@ HWTEST_F(DCameraStreamDataProcessTest, dcamera_stream_data_process_test_003, Tes */ HWTEST_F(DCameraStreamDataProcessTest, dcamera_stream_data_process_test_004, TestSize.Level1) { - DHLOGI("DCameraStreamDataProcessTest::dcamera_stream_data_process_test_004"); + DCLOGI("DCameraStreamDataProcessTest::dcamera_stream_data_process_test_004"); std::shared_ptr streamProcess = std::make_shared(TEST_DEVICE_ID, TEST_CAMERA_DH_ID_0, DCStreamType::CONTINUOUS_FRAME); size_t capacity = 1; @@ -171,7 +171,7 @@ HWTEST_F(DCameraStreamDataProcessTest, dcamera_stream_data_process_test_004, Tes */ HWTEST_F(DCameraStreamDataProcessTest, dcamera_stream_data_process_test_005, TestSize.Level1) { - DHLOGI("DCameraStreamDataProcessTest::dcamera_stream_data_process_test_005"); + DCLOGI("DCameraStreamDataProcessTest::dcamera_stream_data_process_test_005"); std::shared_ptr streamProcess = std::make_shared(TEST_DEVICE_ID, TEST_CAMERA_DH_ID_0, DCStreamType::CONTINUOUS_FRAME); streamProcess->pipeline_ = std::make_shared(); @@ -198,7 +198,7 @@ HWTEST_F(DCameraStreamDataProcessTest, dcamera_stream_data_process_test_005, Tes */ HWTEST_F(DCameraStreamDataProcessTest, dcamera_stream_data_process_test_006, TestSize.Level1) { - DHLOGI("DCameraStreamDataProcessTest::dcamera_stream_data_process_test_006"); + DCLOGI("DCameraStreamDataProcessTest::dcamera_stream_data_process_test_006"); std::shared_ptr streamProcess = std::make_shared(TEST_DEVICE_ID, TEST_CAMERA_DH_ID_0, DCStreamType::CONTINUOUS_FRAME); @@ -217,7 +217,7 @@ HWTEST_F(DCameraStreamDataProcessTest, dcamera_stream_data_process_test_006, Tes */ HWTEST_F(DCameraStreamDataProcessTest, dcamera_stream_data_process_test_007, TestSize.Level1) { - DHLOGI("DCameraStreamDataProcessTest::dcamera_stream_data_process_test_007"); + DCLOGI("DCameraStreamDataProcessTest::dcamera_stream_data_process_test_007"); std::shared_ptr streamProcess1 = std::make_shared(TEST_DEVICE_ID, TEST_CAMERA_DH_ID_0, DCStreamType::CONTINUOUS_FRAME); std::shared_ptr listener1 = diff --git a/services/channel/BUILD.gn b/services/channel/BUILD.gn index 8b49162b4484cb9e13018749317b136f5884be7e..86348e8ad1fd1f53316b8e16d09f0082754c9453 100644 --- a/services/channel/BUILD.gn +++ b/services/channel/BUILD.gn @@ -57,7 +57,7 @@ ohos_shared_library("distributed_camera_channel") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"dcamerachannel\"", + "DC_LOG_TAG=\"dcamerachannel\"", "LOG_DOMAIN=0xD004100", ] diff --git a/services/channel/src/dcamera_channel_sink_impl.cpp b/services/channel/src/dcamera_channel_sink_impl.cpp index 322806438e6fb02312e9a0d5caad4e37a357ec3b..eb267b84890bc069a4bf7847b2312d7e1650415c 100644 --- a/services/channel/src/dcamera_channel_sink_impl.cpp +++ b/services/channel/src/dcamera_channel_sink_impl.cpp @@ -20,7 +20,7 @@ #include "anonymous_string.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -35,14 +35,14 @@ DCameraChannelSinkImpl::~DCameraChannelSinkImpl() int32_t DCameraChannelSinkImpl::OpenSession() { - DHLOGI("DCameraChannelSinkImpl OpenSession name: %s", mySessionName_.c_str()); + DCLOGI("DCameraChannelSinkImpl OpenSession name: %s", mySessionName_.c_str()); if (softbusSession_ == nullptr) { - DHLOGE("DCameraChannelSinkImpl OpenSession %s failed", mySessionName_.c_str()); + DCLOGE("DCameraChannelSinkImpl OpenSession %s failed", mySessionName_.c_str()); return DCAMERA_BAD_OPERATE; } int32_t ret = softbusSession_->OpenSession(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraChannelSinkImpl OpenSession %s ret: %d", mySessionName_.c_str(), ret); + DCLOGE("DCameraChannelSinkImpl OpenSession %s ret: %d", mySessionName_.c_str(), ret); } return ret; @@ -50,14 +50,14 @@ int32_t DCameraChannelSinkImpl::OpenSession() int32_t DCameraChannelSinkImpl::CloseSession() { - DHLOGI("DCameraChannelSinkImpl CloseSession name: %s", mySessionName_.c_str()); + DCLOGI("DCameraChannelSinkImpl CloseSession name: %s", mySessionName_.c_str()); if (softbusSession_ == nullptr) { - DHLOGE("DCameraChannelSinkImpl CloseSession %s failed", mySessionName_.c_str()); + DCLOGE("DCameraChannelSinkImpl CloseSession %s failed", mySessionName_.c_str()); return DCAMERA_BAD_OPERATE; } int32_t ret = softbusSession_->CloseSession(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraChannelSinkImpl CloseSession %s ret: %d", mySessionName_.c_str(), ret); + DCLOGE("DCameraChannelSinkImpl CloseSession %s ret: %d", mySessionName_.c_str(), ret); } return ret; @@ -70,7 +70,7 @@ int32_t DCameraChannelSinkImpl::CreateSession(std::vector& camInde return DCAMERA_BAD_VALUE; } if (softbusSession_ != nullptr) { - DHLOGI("DCameraChannelSinkImpl session has already create %s", sessionFlag.c_str()); + DCLOGI("DCameraChannelSinkImpl session has already create %s", sessionFlag.c_str()); return DCAMERA_OK; } camIndexs_.assign(camIndexs.begin(), camIndexs.end()); @@ -79,12 +79,12 @@ int32_t DCameraChannelSinkImpl::CreateSession(std::vector& camInde mode_ = sessionMode; std::string myDevId; DCameraSoftbusAdapter::GetInstance().GetLocalNetworkId(myDevId); - DHLOGI("DCameraChannelSinkImpl session create name: %s devId: %s", mySessionName_.c_str(), + DCLOGI("DCameraChannelSinkImpl session create name: %s devId: %s", mySessionName_.c_str(), GetAnonyString(myDevId).c_str()); int32_t ret = DCameraSoftbusAdapter::GetInstance().CreateSoftbusSessionServer(mySessionName_, DCAMERA_CHANNLE_ROLE_SINK); if (ret != DCAMERA_OK) { - DHLOGE("DCameraChannelSinkImpl CreateSession %s failed, ret: %d", mySessionName_.c_str(), ret); + DCLOGE("DCameraChannelSinkImpl CreateSession %s failed, ret: %d", mySessionName_.c_str(), ret); return ret; } std::string peerDevId = camIndexs[0].devId_; @@ -97,14 +97,14 @@ int32_t DCameraChannelSinkImpl::CreateSession(std::vector& camInde int32_t DCameraChannelSinkImpl::ReleaseSession() { - DHLOGI("DCameraChannelSinkImpl ReleaseSession name: %s", mySessionName_.c_str()); + DCLOGI("DCameraChannelSinkImpl ReleaseSession name: %s", mySessionName_.c_str()); if (softbusSession_ == nullptr) { return DCAMERA_OK; } DCameraSoftbusAdapter::GetInstance().sinkSessions_.erase(softbusSession_->GetMySessionName()); int32_t ret = DCameraSoftbusAdapter::GetInstance().DestroySoftbusSessionServer(softbusSession_->GetMySessionName()); if (ret != DCAMERA_OK) { - DHLOGE("DCameraChannelSinkImpl ReleaseSession %s failed, ret: %d", mySessionName_.c_str(), ret); + DCLOGE("DCameraChannelSinkImpl ReleaseSession %s failed, ret: %d", mySessionName_.c_str(), ret); } softbusSession_ = nullptr; return ret; @@ -113,12 +113,12 @@ int32_t DCameraChannelSinkImpl::ReleaseSession() int32_t DCameraChannelSinkImpl::SendData(std::shared_ptr& buffer) { if (softbusSession_ == nullptr) { - DHLOGE("DCameraChannelSinkImpl SendData %s failed", mySessionName_.c_str()); + DCLOGE("DCameraChannelSinkImpl SendData %s failed", mySessionName_.c_str()); return DCAMERA_BAD_OPERATE; } int32_t ret = softbusSession_->SendData(mode_, buffer); if (ret != DCAMERA_OK) { - DHLOGE("DCameraChannelSinkImpl SendData %s failed, ret: %d", mySessionName_.c_str(), ret); + DCLOGE("DCameraChannelSinkImpl SendData %s failed, ret: %d", mySessionName_.c_str(), ret); } return ret; } diff --git a/services/channel/src/dcamera_channel_source_impl.cpp b/services/channel/src/dcamera_channel_source_impl.cpp index 31579d271471e34ea7e15e6aa258c40e3bf25692..715ea8c576cd02f70df8eee175949b6667ea877c 100644 --- a/services/channel/src/dcamera_channel_source_impl.cpp +++ b/services/channel/src/dcamera_channel_source_impl.cpp @@ -20,7 +20,7 @@ #include "anonymous_string.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -34,16 +34,16 @@ DCameraChannelSourceImpl::~DCameraChannelSourceImpl() int32_t DCameraChannelSourceImpl::OpenSession() { - DHLOGI("DCameraChannelSourceImpl OpenSession name: %s", mySessionName_.c_str()); + DCLOGI("DCameraChannelSourceImpl OpenSession name: %s", mySessionName_.c_str()); if (softbusSessions_.empty()) { - DHLOGE("DCameraChannelSourceImpl OpenSession %s failed", mySessionName_.c_str()); + DCLOGE("DCameraChannelSourceImpl OpenSession %s failed", mySessionName_.c_str()); return DCAMERA_BAD_OPERATE; } int32_t ret = DCAMERA_OK; for (auto iter = softbusSessions_.begin(); iter != softbusSessions_.end(); iter++) { int32_t retOpen = (*iter)->OpenSession(); if (retOpen != DCAMERA_OK) { - DHLOGE("DCameraChannelSourceImpl OpenSession %s failed, ret: %d", mySessionName_.c_str(), retOpen); + DCLOGE("DCameraChannelSourceImpl OpenSession %s failed, ret: %d", mySessionName_.c_str(), retOpen); ret = DCAMERA_BAD_OPERATE; break; } @@ -58,16 +58,16 @@ int32_t DCameraChannelSourceImpl::OpenSession() int32_t DCameraChannelSourceImpl::CloseSession() { - DHLOGI("DCameraChannelSourceImpl CloseSession name: %s", mySessionName_.c_str()); + DCLOGI("DCameraChannelSourceImpl CloseSession name: %s", mySessionName_.c_str()); if (softbusSessions_.empty()) { - DHLOGE("DCameraChannelSourceImpl CloseSession %s failed", mySessionName_.c_str()); + DCLOGE("DCameraChannelSourceImpl CloseSession %s failed", mySessionName_.c_str()); return DCAMERA_BAD_OPERATE; } int32_t ret = DCAMERA_OK; for (auto iter = softbusSessions_.begin(); iter != softbusSessions_.end(); iter++) { int32_t retOpen = (*iter)->CloseSession(); if (retOpen != DCAMERA_OK) { - DHLOGE("DCameraChannelSourceImpl CloseSession %s failed, ret: %d", mySessionName_.c_str(), retOpen); + DCLOGE("DCameraChannelSourceImpl CloseSession %s failed, ret: %d", mySessionName_.c_str(), retOpen); ret = DCAMERA_BAD_OPERATE; } } @@ -82,7 +82,7 @@ int32_t DCameraChannelSourceImpl::CreateSession(std::vector& camIn return DCAMERA_BAD_VALUE; } if (!softbusSessions_.empty()) { - DHLOGI("DCameraChannelSourceImpl session has already create %s", sessionFlag.c_str()); + DCLOGI("DCameraChannelSourceImpl session has already create %s", sessionFlag.c_str()); return DCAMERA_OK; } camIndexs_.assign(camIndexs.begin(), camIndexs.end()); @@ -91,12 +91,12 @@ int32_t DCameraChannelSourceImpl::CreateSession(std::vector& camIn mode_ = sessionMode; std::string myDevId; DCameraSoftbusAdapter::GetInstance().GetLocalNetworkId(myDevId); - DHLOGI("DCameraChannelSourceImpl session create name: %s devId: %s", mySessionName_.c_str(), + DCLOGI("DCameraChannelSourceImpl session create name: %s devId: %s", mySessionName_.c_str(), GetAnonyString(myDevId).c_str()); int32_t ret = DCameraSoftbusAdapter::GetInstance().CreateSoftbusSessionServer(mySessionName_, DCAMERA_CHANNLE_ROLE_SOURCE); if (ret != DCAMERA_OK) { - DHLOGE("DCameraChannelSourceImpl CreateSession %s failed, ret: %d", mySessionName_.c_str(), ret); + DCLOGE("DCameraChannelSourceImpl CreateSession %s failed, ret: %d", mySessionName_.c_str(), ret); return ret; } for (auto iter = camIndexs.begin(); iter != camIndexs.end(); iter++) { @@ -112,7 +112,7 @@ int32_t DCameraChannelSourceImpl::CreateSession(std::vector& camIn int32_t DCameraChannelSourceImpl::ReleaseSession() { - DHLOGI("DCameraChannelSourceImpl ReleaseSession name: %s", mySessionName_.c_str()); + DCLOGI("DCameraChannelSourceImpl ReleaseSession name: %s", mySessionName_.c_str()); for (auto iter = softbusSessions_.begin(); iter != softbusSessions_.end(); iter++) { std::string sessKey = (*iter)->GetPeerDevId() + (*iter)->GetPeerSessionName(); DCameraSoftbusAdapter::GetInstance().sourceSessions_.erase(sessKey); @@ -120,7 +120,7 @@ int32_t DCameraChannelSourceImpl::ReleaseSession() std::vector>().swap(softbusSessions_); int32_t ret = DCameraSoftbusAdapter::GetInstance().DestroySoftbusSessionServer(mySessionName_); if (ret != DCAMERA_OK) { - DHLOGE("DCameraChannelSourceImpl ReleaseSession %s failed, ret: %d", mySessionName_.c_str(), ret); + DCLOGE("DCameraChannelSourceImpl ReleaseSession %s failed, ret: %d", mySessionName_.c_str(), ret); } return ret; } @@ -128,14 +128,14 @@ int32_t DCameraChannelSourceImpl::ReleaseSession() int32_t DCameraChannelSourceImpl::SendData(std::shared_ptr& buffer) { if (softbusSessions_.empty()) { - DHLOGE("DCameraChannelSourceImpl SendData %s failed", mySessionName_.c_str()); + DCLOGE("DCameraChannelSourceImpl SendData %s failed", mySessionName_.c_str()); return DCAMERA_BAD_OPERATE; } int32_t ret = DCAMERA_OK; for (auto iter = softbusSessions_.begin(); iter != softbusSessions_.end(); iter++) { int32_t retSend = (*iter)->SendData(mode_, buffer); if (retSend != DCAMERA_OK) { - DHLOGE("DCameraChannelSourceImpl SendData %s failed, ret: %d", mySessionName_.c_str(), retSend); + DCLOGE("DCameraChannelSourceImpl SendData %s failed, ret: %d", mySessionName_.c_str(), retSend); ret = DCAMERA_BAD_OPERATE; } } diff --git a/services/channel/src/dcamera_low_latency.cpp b/services/channel/src/dcamera_low_latency.cpp index 8a356556ea76e13913ed8833602e94f73ac84571..d93664b57aa7f6292b7851ad2f5bb972b9def559 100644 --- a/services/channel/src/dcamera_low_latency.cpp +++ b/services/channel/src/dcamera_low_latency.cpp @@ -17,7 +17,7 @@ #include "dcamera_low_latency.h" #include "device_type.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "ipublisher_listener.h" #include "nlohmann/json.hpp" @@ -27,15 +27,15 @@ IMPLEMENT_SINGLE_INSTANCE(DCameraLowLatency); int32_t DCameraLowLatency::EnableLowLatency() { - DHLOGD("Enable low latency start."); + DCLOGD("Enable low latency start."); if (refCount_ > REF_INITIAL) { refCount_++; - DHLOGD("No need to enable low latency, refCount just plus one and now is: %d.", refCount_.load()); + DCLOGD("No need to enable low latency, refCount just plus one and now is: %d.", refCount_.load()); return DCAMERA_OK; } std::shared_ptr dHFwkKit = GetDHFwkKit(); if (dHFwkKit == nullptr) { - DHLOGE("Get dHFwkKit is null when enable low latency."); + DCLOGE("Get dHFwkKit is null when enable low latency."); return DCAMERA_BAD_VALUE; } nlohmann::json enable = { @@ -44,25 +44,25 @@ int32_t DCameraLowLatency::EnableLowLatency() }; dHFwkKit->PublishMessage(DHTopic::TOPIC_LOW_LATENCY, enable.dump()); refCount_++; - DHLOGD("Enable low latency success and now refCount is: %d", refCount_.load()); + DCLOGD("Enable low latency success and now refCount is: %d", refCount_.load()); return DCAMERA_OK; } int32_t DCameraLowLatency::DisableLowLatency() { - DHLOGD("Disable low latency start."); + DCLOGD("Disable low latency start."); if (refCount_ == REF_INITIAL) { - DHLOGD("No need to disable low latency, refCount is zero."); + DCLOGD("No need to disable low latency, refCount is zero."); return DCAMERA_OK; } if (refCount_ > REF_NORMAL) { refCount_--; - DHLOGD("No need to disable low latency, refCount just minus one and now is: %d.", refCount_.load()); + DCLOGD("No need to disable low latency, refCount just minus one and now is: %d.", refCount_.load()); return DCAMERA_OK; } std::shared_ptr dHFwkKit = GetDHFwkKit(); if (dHFwkKit == nullptr) { - DHLOGE("Get dHFwkKit is null when disable low latency."); + DCLOGE("Get dHFwkKit is null when disable low latency."); return DCAMERA_BAD_VALUE; } nlohmann::json disable = { @@ -71,7 +71,7 @@ int32_t DCameraLowLatency::DisableLowLatency() }; dHFwkKit->PublishMessage(DHTopic::TOPIC_LOW_LATENCY, disable.dump()); refCount_--; - DHLOGD("Disable low latency success."); + DCLOGD("Disable low latency success."); return DCAMERA_OK; } diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index 5108d4c051fd70200f1a1c3be657af2089992521..0003de803dffddde2e3e9758fa3b8e7807140d9e 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -19,7 +19,7 @@ #include "dcamera_softbus_adapter.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include #include "softbus_bus_center.h" #include "softbus_common.h" @@ -119,20 +119,20 @@ int32_t DCameraSoftbusAdapter::CreateSoftbusSessionServer(std::string sessionNam std::lock_guard autoLock(optLock_); if (sessionTotal_.find(sessionName) != sessionTotal_.end()) { sessionTotal_[sessionName]++; - DHLOGI("DCameraSoftbusAdapter sessionName already exist %s totalnum: %d", sessionName.c_str(), + DCLOGI("DCameraSoftbusAdapter sessionName already exist %s totalnum: %d", sessionName.c_str(), sessionTotal_[sessionName]); return DCAMERA_OK; } int32_t ret = CreateSessionServer(PKG_NAME.c_str(), sessionName.c_str(), &sessListeners_[role]); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter CreateSessionServer failed, ret: %d", ret); + DCLOGE("DCameraSoftbusAdapter CreateSessionServer failed, ret: %d", ret); ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_CREATE_SESSIONSVR_ERROR, CreateMsg("create session server failed, sessionName: %s", sessionName.c_str())); return ret; } sessionTotal_[sessionName]++; - DHLOGI("DCameraSoftbusAdapter sessionName create %s totalnum: %d", sessionName.c_str(), + DCLOGI("DCameraSoftbusAdapter sessionName create %s totalnum: %d", sessionName.c_str(), sessionTotal_[sessionName]); return DCAMERA_OK; } @@ -141,12 +141,12 @@ int32_t DCameraSoftbusAdapter::DestroySoftbusSessionServer(std::string sessionNa { std::lock_guard autoLock(optLock_); if (sessionTotal_.find(sessionName) == sessionTotal_.end()) { - DHLOGI("DCameraSoftbusAdapter sessionName already destroy %s", sessionName.c_str()); + DCLOGI("DCameraSoftbusAdapter sessionName already destroy %s", sessionName.c_str()); return DCAMERA_OK; } sessionTotal_[sessionName]--; - DHLOGI("DCameraSoftbusAdapter sessionName destroy %s totalnum: %d", sessionName.c_str(), + DCLOGI("DCameraSoftbusAdapter sessionName destroy %s totalnum: %d", sessionName.c_str(), sessionTotal_[sessionName]); uint32_t total_ = sessionTotal_[sessionName]; if (total_ == 0) { @@ -162,12 +162,12 @@ int32_t DCameraSoftbusAdapter::OpenSoftbusSession(std::string mySessName, std::s SessionAttribute attr = { 0 }; int32_t ret = ConstructSessionAttribute(sessionMode, attr); if (ret != DCAMERA_OK) { - DHLOGE("ConstructSessionAttribute failed, ret is: %d", ret); + DCLOGE("ConstructSessionAttribute failed, ret is: %d", ret); return DCAMERA_BAD_VALUE; } int32_t sessionId = OpenSession(mySessName.c_str(), peerSessName.c_str(), peerDevId.c_str(), "0", &attr); if (sessionId < 0) { - DHLOGE("DCameraSoftbusAdapter OpenSoftbusSession failed %d", sessionId); + DCLOGE("DCameraSoftbusAdapter OpenSoftbusSession failed %d", sessionId); ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_OPEN_SESSION_ERROR, CreateMsg("open softbus session failed, mySessName: %s, peerSessName: %s, peerDevId: %s", mySessName.c_str(), peerSessName.c_str(), peerDevId.c_str())); @@ -178,13 +178,13 @@ int32_t DCameraSoftbusAdapter::OpenSoftbusSession(std::string mySessName, std::s int32_t DCameraSoftbusAdapter::CloseSoftbusSession(int32_t sessionId) { - DHLOGI("close softbus sessionId: %d", sessionId); + DCLOGI("close softbus sessionId: %d", sessionId); CloseSession(sessionId); { std::lock_guard autoLock(idMapLock_); sessionIdMap_.erase(sessionId); } - DHLOGI("close softbus sessionId: %d end", sessionId); + DCLOGI("close softbus sessionId: %d end", sessionId); return DCAMERA_OK; } @@ -198,23 +198,23 @@ int32_t DCameraSoftbusAdapter::SendSofbusStream(int32_t sessionId, std::shared_p StreamData streamData = { reinterpret_cast(buffer->Data()), buffer->Size() }; int64_t timeStamp; if (!buffer->FindInt64(TIME_STAMP_US, timeStamp)) { - DHLOGD("SendSofbusStream find %s failed.", TIME_STAMP_US.c_str()); + DCLOGD("SendSofbusStream find %s failed.", TIME_STAMP_US.c_str()); } int32_t frameType; if (!buffer->FindInt32(FRAME_TYPE, frameType)) { - DHLOGD("SendSofbusStream find %s failed.", FRAME_TYPE.c_str()); + DCLOGD("SendSofbusStream find %s failed.", FRAME_TYPE.c_str()); } int32_t index; if (!buffer->FindInt32(INDEX, index)) { - DHLOGD("SendSofbusStream find %s failed.", INDEX.c_str()); + DCLOGD("SendSofbusStream find %s failed.", INDEX.c_str()); } int64_t startEncodeT; if (!buffer->FindInt64(START_ENCODE_TIME_US, startEncodeT)) { - DHLOGD("SendSofbusStream find %s failed.", START_ENCODE_TIME_US.c_str()); + DCLOGD("SendSofbusStream find %s failed.", START_ENCODE_TIME_US.c_str()); } int64_t finishEncodeT; if (!buffer->FindInt64(FINISH_ENCODE_TIME_US, finishEncodeT)) { - DHLOGD("SendSofbusStream find %s failed.", FINISH_ENCODE_TIME_US.c_str()); + DCLOGD("SendSofbusStream find %s failed.", FINISH_ENCODE_TIME_US.c_str()); } std::string jsonStr = ""; DCameraSinkFrameInfo sinkFrameInfo; @@ -229,7 +229,7 @@ int32_t DCameraSoftbusAdapter::SendSofbusStream(int32_t sessionId, std::shared_p StreamFrameInfo param = { 0 }; int32_t ret = SendStream(sessionId, &streamData, &ext, ¶m); if (ret != SOFTBUS_OK) { - DHLOGD("SendSofbusStream failed, ret is %d", ret); + DCLOGD("SendSofbusStream failed, ret is %d", ret); return DCAMERA_BAD_VALUE; } return DCAMERA_OK; @@ -238,11 +238,11 @@ int32_t DCameraSoftbusAdapter::SendSofbusStream(int32_t sessionId, std::shared_p int32_t DCameraSoftbusAdapter::DCameraSoftbusGetSessionById(int32_t sessionId, std::shared_ptr& session) { - DHLOGI("get softbus session by sessionId: %d", sessionId); + DCLOGI("get softbus session by sessionId: %d", sessionId); std::lock_guard autoLock(idMapLock_); auto iter = sessionIdMap_.find(sessionId); if (iter == sessionIdMap_.end()) { - DHLOGE("get softbus session by id not find session %d", sessionId); + DCLOGE("get softbus session by id not find session %d", sessionId); return DCAMERA_NOT_FOUND; } session = iter->second; @@ -256,21 +256,21 @@ int32_t DCameraSoftbusAdapter::DCameraSoftbusSourceGetSession(int32_t sessionId, char peerDevId[NETWORK_ID_BUF_LEN] = ""; int32_t ret = GetPeerSessionName(sessionId, peerSessionName, sizeof(peerSessionName)); if (ret != DCAMERA_OK) { - DHLOGI("DCameraSoftbusAdapter DCameraSoftbusSourceGetSession sessionId: %d GetPeerSessionName failed: %d", + DCLOGI("DCameraSoftbusAdapter DCameraSoftbusSourceGetSession sessionId: %d GetPeerSessionName failed: %d", sessionId, ret); return ret; } ret = GetPeerDeviceId(sessionId, peerDevId, sizeof(peerDevId)); if (ret != DCAMERA_OK) { - DHLOGI("DCameraSoftbusAdapter DCameraSoftbusSourceGetSession sessionId: %d GetPeerDeviceId failed: %d", + DCLOGI("DCameraSoftbusAdapter DCameraSoftbusSourceGetSession sessionId: %d GetPeerDeviceId failed: %d", sessionId, ret); return ret; } auto iter = sourceSessions_.find(std::string(peerDevId) + std::string(peerSessionName)); if (iter == sourceSessions_.end()) { - DHLOGE("DCameraSoftbusAdapter DCameraSoftbusSourceGetSession not find session %d", sessionId); + DCLOGE("DCameraSoftbusAdapter DCameraSoftbusSourceGetSession not find session %d", sessionId); return DCAMERA_NOT_FOUND; } session = iter->second; @@ -279,32 +279,32 @@ int32_t DCameraSoftbusAdapter::DCameraSoftbusSourceGetSession(int32_t sessionId, int32_t DCameraSoftbusAdapter::OnSourceSessionOpened(int32_t sessionId, int32_t result) { - DHLOGI("DCameraSoftbusAdapter OnSourceSessionOpened sessionId: %d, result: %d", sessionId, result); + DCLOGI("DCameraSoftbusAdapter OnSourceSessionOpened sessionId: %d, result: %d", sessionId, result); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusSourceGetSession(sessionId, session); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter OnSourceSessionOpened not find session %d", sessionId); + DCLOGE("DCameraSoftbusAdapter OnSourceSessionOpened not find session %d", sessionId); return DCAMERA_NOT_FOUND; } ret = session->OnSessionOpend(sessionId, result); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter OnSourceSessionOpened failed %d sessionId: %d", ret, sessionId); + DCLOGE("DCameraSoftbusAdapter OnSourceSessionOpened failed %d sessionId: %d", ret, sessionId); } else { std::lock_guard autoLock(idMapLock_); sessionIdMap_.emplace(sessionId, session); } - DHLOGI("DCameraSoftbusAdapter OnSourceSessionOpened sessionId: %d, result: %d end", sessionId, result); + DCLOGI("DCameraSoftbusAdapter OnSourceSessionOpened sessionId: %d, result: %d end", sessionId, result); return ret; } void DCameraSoftbusAdapter::OnSourceSessionClosed(int32_t sessionId) { - DHLOGI("DCameraSoftbusAdapter OnSourceSessionClosed sessionId: %d", sessionId); + DCLOGI("DCameraSoftbusAdapter OnSourceSessionClosed sessionId: %d", sessionId); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusGetSessionById(sessionId, session); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter OnSourceSessionClosed not find session %d", sessionId); + DCLOGE("DCameraSoftbusAdapter OnSourceSessionClosed not find session %d", sessionId); return; } { @@ -312,27 +312,27 @@ void DCameraSoftbusAdapter::OnSourceSessionClosed(int32_t sessionId) sessionIdMap_.erase(sessionId); } session->OnSessionClose(sessionId); - DHLOGI("DCameraSoftbusAdapter OnSourceSessionClosed sessionId: %d end", sessionId); + DCLOGI("DCameraSoftbusAdapter OnSourceSessionClosed sessionId: %d end", sessionId); return; } void DCameraSoftbusAdapter::OnSourceBytesReceived(int32_t sessionId, const void *data, uint32_t dataLen) { if (dataLen == 0 || dataLen > DCAMERA_MAX_RECV_DATA_LEN || data == nullptr) { - DHLOGE("DCameraSoftbusAdapter OnSourceBytesReceived dataLen: %d, sessionId: %d", dataLen, sessionId); + DCLOGE("DCameraSoftbusAdapter OnSourceBytesReceived dataLen: %d, sessionId: %d", dataLen, sessionId); return; } std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusSourceGetSession(sessionId, session); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter OnSourceBytesReceived not find session %d", sessionId); + DCLOGE("DCameraSoftbusAdapter OnSourceBytesReceived not find session %d", sessionId); return; } std::shared_ptr buffer = std::make_shared(dataLen); ret = memcpy_s(buffer->Data(), buffer->Capacity(), data, dataLen); if (ret != EOK) { - DHLOGE("DCameraSoftbusAdapter OnSourceBytesReceived memcpy_s failed ret: %d", ret); + DCLOGE("DCameraSoftbusAdapter OnSourceBytesReceived memcpy_s failed ret: %d", ret); return; } session->OnDataReceived(buffer); @@ -352,18 +352,18 @@ void DCameraSoftbusAdapter::OnSourceStreamReceived(int32_t sessionId, const Stre { int64_t recvT = GetNowTimeStampUs(); if (data == nullptr) { - DHLOGE("DCameraSoftbusAdapter::OnSourceStreamReceived, data is null, sessionId: %d.", sessionId); + DCLOGE("DCameraSoftbusAdapter::OnSourceStreamReceived, data is null, sessionId: %d.", sessionId); return; } int32_t dataLen = data->bufLen; if (dataLen <= 0 || dataLen > static_cast(DCAMERA_MAX_RECV_DATA_LEN)) { - DHLOGE("DCameraSoftbusAdapter OnSourceStreamReceived dataLen: %d, sessionId: %d", dataLen, sessionId); + DCLOGE("DCameraSoftbusAdapter OnSourceStreamReceived dataLen: %d, sessionId: %d", dataLen, sessionId); return; } std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusSourceGetSession(sessionId, session); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter OnSourceStreamReceived not find session %d", sessionId); + DCLOGE("DCameraSoftbusAdapter OnSourceStreamReceived not find session %d", sessionId); return; } @@ -371,12 +371,12 @@ void DCameraSoftbusAdapter::OnSourceStreamReceived(int32_t sessionId, const Stre buffer->SetInt64(RECV_TIME_US, recvT); ret = memcpy_s(buffer->Data(), buffer->Capacity(), reinterpret_cast(data->buf), data->bufLen); if (ret != EOK) { - DHLOGE("DCameraSoftbusAdapter OnSourceStreamReceived memcpy_s failed ret: %d", ret); + DCLOGE("DCameraSoftbusAdapter OnSourceStreamReceived memcpy_s failed ret: %d", ret); return; } ret = HandleSourceStreamExt(buffer, ext); if (ret != DCAMERA_OK) { - DHLOGE("Handle source stream ext failed, ret is: %d", ret); + DCLOGE("Handle source stream ext failed, ret is: %d", ret); } session->OnDataReceived(buffer); } @@ -384,12 +384,12 @@ void DCameraSoftbusAdapter::OnSourceStreamReceived(int32_t sessionId, const Stre int32_t DCameraSoftbusAdapter::HandleSourceStreamExt(std::shared_ptr& buffer, const StreamData *ext) { if (ext == nullptr) { - DHLOGE("Source stream ext is null."); + DCLOGE("Source stream ext is null."); return DCAMERA_BAD_VALUE; } int32_t extLen = ext->bufLen; if (extLen <= 0 || extLen > DCAMERA_MAX_RECV_EXT_LEN) { - DHLOGD("ExtLen is: %d.", extLen); + DCLOGD("ExtLen is: %d.", extLen); return DCAMERA_BAD_VALUE; } @@ -397,12 +397,12 @@ int32_t DCameraSoftbusAdapter::HandleSourceStreamExt(std::shared_ptr DCameraSinkFrameInfo sinkFrameInfo; int32_t ret = sinkFrameInfo.Unmarshal(jsonStr); if (ret != DCAMERA_OK) { - DHLOGE("Unmarshal sinkFrameInfo failed."); + DCLOGE("Unmarshal sinkFrameInfo failed."); return DCAMERA_BAD_VALUE; } int64_t recvT; if (!buffer->FindInt64(RECV_TIME_US, recvT)) { - DHLOGD("HandleSourceStreamExt find %s failed.", RECV_TIME_US.c_str()); + DCLOGD("HandleSourceStreamExt find %s failed.", RECV_TIME_US.c_str()); } DCameraFrameInfo frameInfo; frameInfo.type = sinkFrameInfo.type_; @@ -423,14 +423,14 @@ int32_t DCameraSoftbusAdapter::DCameraSoftbusSinkGetSession(int32_t sessionId, char mySessionName[DCAMERA_SESSION_NAME_MAX_LEN] = ""; int ret = GetMySessionName(sessionId, mySessionName, sizeof(mySessionName)); if (ret != DCAMERA_OK) { - DHLOGI("DCameraSoftbusAdapter DCameraSoftbusSinkGetSession sessionId: %d GetPeerSessionName failed: %d", + DCLOGI("DCameraSoftbusAdapter DCameraSoftbusSinkGetSession sessionId: %d GetPeerSessionName failed: %d", sessionId, ret); return ret; } auto iter = sinkSessions_.find(std::string(mySessionName)); if (iter == sinkSessions_.end()) { - DHLOGE("DCameraSoftbusAdapter DCameraSoftbusSinkGetSession not find session %d", sessionId); + DCLOGE("DCameraSoftbusAdapter DCameraSoftbusSinkGetSession not find session %d", sessionId); return DCAMERA_NOT_FOUND; } session = iter->second; @@ -439,32 +439,32 @@ int32_t DCameraSoftbusAdapter::DCameraSoftbusSinkGetSession(int32_t sessionId, int32_t DCameraSoftbusAdapter::OnSinkSessionOpened(int32_t sessionId, int32_t result) { - DHLOGI("DCameraSoftbusAdapter OnSinkSessionOpened sessionId: %d, result: %d", sessionId, result); + DCLOGI("DCameraSoftbusAdapter OnSinkSessionOpened sessionId: %d, result: %d", sessionId, result); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusSinkGetSession(sessionId, session); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter OnSinkSessionOpened not find session %d", sessionId); + DCLOGE("DCameraSoftbusAdapter OnSinkSessionOpened not find session %d", sessionId); return DCAMERA_NOT_FOUND; } ret = session->OnSessionOpend(sessionId, result); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter OnSinkSessionOpened not find session %d", sessionId); + DCLOGE("DCameraSoftbusAdapter OnSinkSessionOpened not find session %d", sessionId); } else { std::lock_guard autoLock(idMapLock_); sessionIdMap_.emplace(sessionId, session); } - DHLOGI("DCameraSoftbusAdapter OnSinkSessionOpened sessionId: %d, result: %d end", sessionId, result); + DCLOGI("DCameraSoftbusAdapter OnSinkSessionOpened sessionId: %d, result: %d end", sessionId, result); return ret; } void DCameraSoftbusAdapter::OnSinkSessionClosed(int32_t sessionId) { - DHLOGI("DCameraSoftbusAdapter OnSinkSessionClosed sessionId: %d", sessionId); + DCLOGI("DCameraSoftbusAdapter OnSinkSessionClosed sessionId: %d", sessionId); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusGetSessionById(sessionId, session); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter OnSinkSessionClosed not find session %d", sessionId); + DCLOGE("DCameraSoftbusAdapter OnSinkSessionClosed not find session %d", sessionId); return; } { @@ -478,20 +478,20 @@ void DCameraSoftbusAdapter::OnSinkSessionClosed(int32_t sessionId) void DCameraSoftbusAdapter::OnSinkBytesReceived(int32_t sessionId, const void *data, uint32_t dataLen) { if (dataLen == 0 || dataLen > DCAMERA_MAX_RECV_DATA_LEN || data == nullptr) { - DHLOGE("DCameraSoftbusAdapter OnSinkBytesReceived dataLen: %d, sessionId: %d", dataLen, sessionId); + DCLOGE("DCameraSoftbusAdapter OnSinkBytesReceived dataLen: %d, sessionId: %d", dataLen, sessionId); return; } std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusSinkGetSession(sessionId, session); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter OnSinkBytesReceived not find session %d", sessionId); + DCLOGE("DCameraSoftbusAdapter OnSinkBytesReceived not find session %d", sessionId); return; } std::shared_ptr buffer = std::make_shared(dataLen); ret = memcpy_s(buffer->Data(), buffer->Capacity(), data, dataLen); if (ret != EOK) { - DHLOGE("DCameraSoftbusAdapter OnSinkBytesReceived memcpy_s failed ret: %d", ret); + DCLOGE("DCameraSoftbusAdapter OnSinkBytesReceived memcpy_s failed ret: %d", ret); return; } session->OnDataReceived(buffer); @@ -507,25 +507,25 @@ void DCameraSoftbusAdapter::OnSinkStreamReceived(int32_t sessionId, const Stream const StreamFrameInfo *param) { if (data == nullptr) { - DHLOGE("DCameraSoftbusAdapter::OnSinkStreamReceived, data is null, sessionId: %d.", sessionId); + DCLOGE("DCameraSoftbusAdapter::OnSinkStreamReceived, data is null, sessionId: %d.", sessionId); return; } int32_t dataLen = data->bufLen; if (dataLen <= 0 || dataLen > static_cast(DCAMERA_MAX_RECV_DATA_LEN)) { - DHLOGE("DCameraSoftbusAdapter OnSinkStreamReceived dataLen: %d sessionId: %d", dataLen, sessionId); + DCLOGE("DCameraSoftbusAdapter OnSinkStreamReceived dataLen: %d sessionId: %d", dataLen, sessionId); return; } std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusSinkGetSession(sessionId, session); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter OnSinkStreamReceived not find session %d", sessionId); + DCLOGE("DCameraSoftbusAdapter OnSinkStreamReceived not find session %d", sessionId); return; } std::shared_ptr buffer = std::make_shared(data->bufLen); ret = memcpy_s(buffer->Data(), buffer->Capacity(), reinterpret_cast(data->buf), data->bufLen); if (ret != EOK) { - DHLOGE("DCameraSoftbusAdapter OnSinkStreamReceived memcpy_s failed ret: %d", ret); + DCLOGE("DCameraSoftbusAdapter OnSinkStreamReceived memcpy_s failed ret: %d", ret); return; } session->OnDataReceived(buffer); @@ -537,7 +537,7 @@ int32_t DCameraSoftbusAdapter::GetLocalNetworkId(std::string& myDevId) NodeBasicInfo basicInfo = { { 0 } }; int32_t ret = GetLocalNodeDeviceInfo(PKG_NAME.c_str(), &basicInfo); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter GetLocalNodeDeviceInfo failed ret: %d", ret); + DCLOGE("DCameraSoftbusAdapter GetLocalNodeDeviceInfo failed ret: %d", ret); return ret; } @@ -560,7 +560,7 @@ int32_t DCameraSoftbusAdapter::ConstructSessionAttribute(int32_t sessionMode, Se streamType = RAW_STREAM; break; default: - DHLOGE("Bad sessionMode %d", sessionMode); + DCLOGE("Bad sessionMode %d", sessionMode); return DCAMERA_BAD_VALUE; } attr.dataType = dataType; @@ -579,7 +579,7 @@ int32_t DCameraSoftbusAdapter::ConstructSessionAttribute(int32_t sessionMode, Se int32_t ret = memcpy_s(attr.linkType, DCAMERA_LINK_TYPE_MAX * sizeof(LinkType), linkTypeList, DCAMERA_LINK_TYPE_MAX * sizeof(LinkType)); if (ret != EOK) { - DHLOGE("LinkType memcpy_s failed %d", ret); + DCLOGE("LinkType memcpy_s failed %d", ret); return DCAMERA_BAD_VALUE; } attr.attr.streamAttr.streamType = streamType; diff --git a/services/channel/src/dcamera_softbus_latency.cpp b/services/channel/src/dcamera_softbus_latency.cpp index 81d11ba6d7b0ff322e0f1c8fefc8bfb43f7745ad..7c85483831dd4815b0dc03ca8b166afcc0f08f82 100644 --- a/services/channel/src/dcamera_softbus_latency.cpp +++ b/services/channel/src/dcamera_softbus_latency.cpp @@ -17,7 +17,7 @@ #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "dcamera_softbus_adapter.h" #include "softbus_bus_center.h" #include "softbus_common.h" @@ -31,19 +31,19 @@ constexpr static int32_t MICROSECONDS = 1000; static void OnTimeSyncResult(const TimeSyncResultInfo *info, int32_t retCode) { int32_t microsecond = info->result.millisecond * MICROSECONDS + info->result.microsecond; - DHLOGD("DCameraSoftbusLatency OnTimeSyncResult retcode %d, millisecond: %d, microsecond %d microsecond_ %d", + DCLOGD("DCameraSoftbusLatency OnTimeSyncResult retcode %d, millisecond: %d, microsecond %d microsecond_ %d", retCode, info->result.millisecond, info->result.microsecond, microsecond); DCameraSoftbusLatency::GetInstance().SetTimeSyncInfo(microsecond, info->target.targetNetworkId); } int32_t DCameraSoftbusLatency::StartSoftbusTimeSync(const std::string& devId) { - DHLOGI("StartSoftbusTimeSync latency start."); + DCLOGI("StartSoftbusTimeSync latency start."); { std::lock_guard lock(micLock_); if (refCount_[devId] > REF_INITIAL) { refCount_[devId]++; - DHLOGD("No need to start time offset, refCount just plus one and now is: %d.", refCount_[devId]); + DCLOGD("No need to start time offset, refCount just plus one and now is: %d.", refCount_[devId]); return DCAMERA_OK; } } @@ -52,35 +52,35 @@ int32_t DCameraSoftbusLatency::StartSoftbusTimeSync(const std::string& devId) int32_t ret = StartTimeSync(DCAMERA_PKG_NAME.c_str(), devId.c_str(), LOW_ACCURACY, NORMAL_PERIOD, &timeSyncCb); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusLatency:: StartSoftbusTimeSync failed networkId %s", devId.c_str()); + DCLOGE("DCameraSoftbusLatency:: StartSoftbusTimeSync failed networkId %s", devId.c_str()); } { std::lock_guard lock(micLock_); refCount_[devId]++; offsets_.emplace(devId, 0); } - DHLOGI("DCameraSoftbusLatency:: StartSoftbusTimeSync success "); + DCLOGI("DCameraSoftbusLatency:: StartSoftbusTimeSync success "); return DCAMERA_OK; } int32_t DCameraSoftbusLatency::StopSoftbusTimeSync(const std::string& devId) { - DHLOGI("DCameraSoftbusLatency::StopSoftbusTimeSync start."); + DCLOGI("DCameraSoftbusLatency::StopSoftbusTimeSync start."); { std::lock_guard lock(micLock_); if (refCount_[devId] == REF_INITIAL) { - DHLOGD("No need to stop time offset, refCount is zero."); + DCLOGD("No need to stop time offset, refCount is zero."); return DCAMERA_OK; } if (refCount_[devId] > REF_NORMAL) { refCount_[devId]--; - DHLOGD("No need to stop time offset, refCount just minus one and now is: %d.", refCount_[devId]); + DCLOGD("No need to stop time offset, refCount just minus one and now is: %d.", refCount_[devId]); return DCAMERA_OK; } } int32_t ret = StopTimeSync(DCAMERA_PKG_NAME.c_str(), devId.c_str()); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusLatency:: StopSoftbusTimeSync failed ret:%d", ret); + DCLOGE("DCameraSoftbusLatency:: StopSoftbusTimeSync failed ret:%d", ret); } { std::lock_guard lock(micLock_); diff --git a/services/channel/src/dcamera_softbus_session.cpp b/services/channel/src/dcamera_softbus_session.cpp index 9e8f8fd54b5a3c29597b3e3ce5d1b6ed585eb843..ea43c30aa9e2e69152fe5b2e33baadac86208460 100644 --- a/services/channel/src/dcamera_softbus_session.cpp +++ b/services/channel/src/dcamera_softbus_session.cpp @@ -22,7 +22,7 @@ #include "dcamera_utils_tools.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { @@ -52,7 +52,7 @@ DCameraSoftbusSession::~DCameraSoftbusSession() if (sessionId_ != -1) { int32_t ret = DCameraSoftbusAdapter::GetInstance().CloseSoftbusSession(sessionId_); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusSession delete failed, ret: %d, sessId: %d peerDevId: %s peerSessionName: %s", ret, + DCLOGE("DCameraSoftbusSession delete failed, ret: %d, sessId: %d peerDevId: %s peerSessionName: %s", ret, sessionId_, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); } } @@ -62,12 +62,12 @@ DCameraSoftbusSession::~DCameraSoftbusSession() int32_t DCameraSoftbusSession::OpenSession() { - DHLOGI("DCameraSoftbusSession OpenSession peerDevId: %s peerSessionName: %s", + DCLOGI("DCameraSoftbusSession OpenSession peerDevId: %s peerSessionName: %s", GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); int32_t ret = DCameraSoftbusAdapter::GetInstance().OpenSoftbusSession(mySessionName_, peerSessionName_, mode_, peerDevId_); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusSession OpenSession failed, ret: %d, peerDevId: %s peerSessionName: %s", ret, + DCLOGE("DCameraSoftbusSession OpenSession failed, ret: %d, peerDevId: %s peerSessionName: %s", ret, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); return ret; } @@ -78,16 +78,16 @@ int32_t DCameraSoftbusSession::OpenSession() int32_t DCameraSoftbusSession::CloseSession() { - DHLOGI("DCameraSoftbusSession CloseSession sessionId: %d peerDevId: %s peerSessionName: %s", sessionId_, + DCLOGI("DCameraSoftbusSession CloseSession sessionId: %d peerDevId: %s peerSessionName: %s", sessionId_, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); if (sessionId_ == -1) { - DHLOGI("DCameraSoftbusSession CloseSession has already close peerDevId: %s peerSessionName: %s", + DCLOGI("DCameraSoftbusSession CloseSession has already close peerDevId: %s peerSessionName: %s", GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); return DCAMERA_OK; } int32_t ret = DCameraSoftbusAdapter::GetInstance().CloseSoftbusSession(sessionId_); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusSession CloseSession failed, ret: %d, peerDevId: %s peerSessionName: %s", ret, + DCLOGE("DCameraSoftbusSession CloseSession failed, ret: %d, peerDevId: %s peerSessionName: %s", ret, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); return ret; } @@ -99,10 +99,10 @@ int32_t DCameraSoftbusSession::CloseSession() int32_t DCameraSoftbusSession::OnSessionOpend(int32_t sessionId, int32_t result) { - DHLOGI("DCameraSoftbusSession OnSessionOpend sessionId: %d result: %d peerDevId: %s peerSessionName: %s", + DCLOGI("DCameraSoftbusSession OnSessionOpend sessionId: %d result: %d peerDevId: %s peerSessionName: %s", sessionId, result, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); if (result != DCAMERA_OK) { - DHLOGE("DCameraSoftbusSession OnSessionOpend sessionId: %d result: %d peerDevId: %s peerSessionName: %s", + DCLOGE("DCameraSoftbusSession OnSessionOpend sessionId: %d result: %d peerDevId: %s peerSessionName: %s", sessionId_, result, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); listener_->OnSessionState(DCAMERA_CHANNEL_STATE_DISCONNECTED); listener_->OnSessionError(DCAMERA_MESSAGE, DCAMERA_EVENT_OPEN_CHANNEL_ERROR, @@ -118,7 +118,7 @@ int32_t DCameraSoftbusSession::OnSessionOpend(int32_t sessionId, int32_t result) int32_t DCameraSoftbusSession::OnSessionClose(int32_t sessionId) { - DHLOGI("DCameraSoftbusSession OnSessionClose sessionId: %d peerDevId: %s peerSessionName: %s", sessionId, + DCLOGI("DCameraSoftbusSession OnSessionClose sessionId: %d peerDevId: %s peerSessionName: %s", sessionId, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); sessionId_ = -1; state_ = DCAMERA_SOFTBUS_STATE_CLOSED; @@ -150,7 +150,7 @@ void DCameraSoftbusSession::DealRecvData(std::shared_ptr& buffer) void DCameraSoftbusSession::PackRecvData(std::shared_ptr& buffer) { if (buffer->Size() < BINARY_HEADER_FRAG_LEN) { - DHLOGE("DCameraSoftbusSession PackRecvData failed, size: %d, sess: %s peerSess: %s", + DCLOGE("DCameraSoftbusSession PackRecvData failed, size: %d, sess: %s peerSess: %s", buffer->Size(), mySessionName_.c_str(), peerSessionName_.c_str()); return; } @@ -159,25 +159,25 @@ void DCameraSoftbusSession::PackRecvData(std::shared_ptr& buffer) GetFragDataLen(ptrPacket, headerPara); if (buffer->Size() != (headerPara.dataLen + BINARY_HEADER_FRAG_LEN) || headerPara.dataLen > headerPara.totalLen || headerPara.dataLen > BINARY_DATA_MAX_LEN || headerPara.totalLen > BINARY_DATA_MAX_TOTAL_LEN) { - DHLOGE("DCameraSoftbusSession PackRecvData failed, size: %d, dataLen: %d, totalLen: %d sess: %s peerSess: %s", + DCLOGE("DCameraSoftbusSession PackRecvData failed, size: %d, dataLen: %d, totalLen: %d sess: %s peerSess: %s", buffer->Size(), headerPara.dataLen, headerPara.totalLen, mySessionName_.c_str(), peerSessionName_.c_str()); return; } - DHLOGD("DCameraSoftbusSession PackRecvData Assemble, size: %d, dataLen: %d, totalLen: %d, nowTime: %lld start", + DCLOGD("DCameraSoftbusSession PackRecvData Assemble, size: %d, dataLen: %d, totalLen: %d, nowTime: %lld start", buffer->Size(), headerPara.dataLen, headerPara.totalLen, GetNowTimeStampUs()); if (headerPara.fragFlag == FRAG_START_END) { AssembleNoFrag(buffer, headerPara); } else { AssembleFrag(buffer, headerPara); } - DHLOGD("DCameraSoftbusSession PackRecvData Assemble, size: %d, dataLen: %d, totalLen: %d, nowTime: %lld end", + DCLOGD("DCameraSoftbusSession PackRecvData Assemble, size: %d, dataLen: %d, totalLen: %d, nowTime: %lld end", buffer->Size(), headerPara.dataLen, headerPara.totalLen, GetNowTimeStampUs()); } void DCameraSoftbusSession::AssembleNoFrag(std::shared_ptr& buffer, SessionDataHeader& headerPara) { if (headerPara.dataLen != headerPara.totalLen) { - DHLOGE("DCameraSoftbusSession PackRecvData failed, dataLen: %d, totalLen: %d, sess: %s peerSess: %s", + DCLOGE("DCameraSoftbusSession PackRecvData failed, dataLen: %d, totalLen: %d, sess: %s peerSess: %s", headerPara.dataLen, headerPara.totalLen, mySessionName_.c_str(), peerSessionName_.c_str()); return; } @@ -185,7 +185,7 @@ void DCameraSoftbusSession::AssembleNoFrag(std::shared_ptr& buffer, int32_t ret = memcpy_s(postData->Data(), postData->Size(), buffer->Data() + BINARY_HEADER_FRAG_LEN, buffer->Size() - BINARY_HEADER_FRAG_LEN); if (ret != EOK) { - DHLOGE("DCameraSoftbusSession PackRecvData failed, ret: %d, sess: %s peerSess: %s", + DCLOGE("DCameraSoftbusSession PackRecvData failed, ret: %d, sess: %s peerSess: %s", ret, mySessionName_.c_str(), peerSessionName_.c_str()); return; } @@ -204,7 +204,7 @@ void DCameraSoftbusSession::AssembleFrag(std::shared_ptr& buffer, Se int32_t ret = memcpy_s(packBuffer_->Data(), packBuffer_->Size(), buffer->Data() + BINARY_HEADER_FRAG_LEN, buffer->Size() - BINARY_HEADER_FRAG_LEN); if (ret != EOK) { - DHLOGE("DCameraSoftbusSession AssembleFrag failed, ret: %d, sess: %s peerSess: %s", + DCLOGE("DCameraSoftbusSession AssembleFrag failed, ret: %d, sess: %s peerSess: %s", ret, mySessionName_.c_str(), peerSessionName_.c_str()); ResetAssembleFrag(); return; @@ -223,7 +223,7 @@ void DCameraSoftbusSession::AssembleFrag(std::shared_ptr& buffer, Se ret = memcpy_s(packBuffer_->Data() + offset_, packBuffer_->Size() - offset_, buffer->Data() + BINARY_HEADER_FRAG_LEN, buffer->Size() - BINARY_HEADER_FRAG_LEN); if (ret != EOK) { - DHLOGE("DCameraSoftbusSession AssembleFrag failed, memcpy_s ret: %d, sess: %s peerSess: %s", + DCLOGE("DCameraSoftbusSession AssembleFrag failed, memcpy_s ret: %d, sess: %s peerSess: %s", ret, mySessionName_.c_str(), peerSessionName_.c_str()); ResetAssembleFrag(); return; @@ -240,25 +240,25 @@ void DCameraSoftbusSession::AssembleFrag(std::shared_ptr& buffer, Se int32_t DCameraSoftbusSession::CheckUnPackBuffer(SessionDataHeader& headerPara) { if (!isWaiting_) { - DHLOGE("DCameraSoftbusSession AssembleFrag failed, not start one, sess: %s peerSess: %s", + DCLOGE("DCameraSoftbusSession AssembleFrag failed, not start one, sess: %s peerSess: %s", mySessionName_.c_str(), peerSessionName_.c_str()); return DCAMERA_BAD_VALUE; } if (nowSeq_ != headerPara.seqNum) { - DHLOGE("DCameraSoftbusSession AssembleFrag seq error nowSeq: %d actualSeq: %d, sess: %s peerSess: %s", + DCLOGE("DCameraSoftbusSession AssembleFrag seq error nowSeq: %d actualSeq: %d, sess: %s peerSess: %s", nowSeq_, headerPara.seqNum, mySessionName_.c_str(), peerSessionName_.c_str()); return DCAMERA_BAD_VALUE; } if (nowSubSeq_ + 1 != headerPara.subSeq) { - DHLOGE("DCameraSoftbusSession AssembleFrag subSeq error nowSeq: %d actualSeq: %d, sess: %s peerSess: %s", + DCLOGE("DCameraSoftbusSession AssembleFrag subSeq error nowSeq: %d actualSeq: %d, sess: %s peerSess: %s", nowSubSeq_, headerPara.subSeq, mySessionName_.c_str(), peerSessionName_.c_str()); return DCAMERA_BAD_VALUE; } if (totalLen_ < headerPara.dataLen + offset_) { - DHLOGE("DCameraSoftbusSession AssembleFrag len error cap: %d size: %d, dataLen: %d sess: %s peerSess: %s", + DCLOGE("DCameraSoftbusSession AssembleFrag len error cap: %d size: %d, dataLen: %d sess: %s peerSess: %s", totalLen_, offset_, headerPara.dataLen, mySessionName_.c_str(), peerSessionName_.c_str()); return DCAMERA_BAD_VALUE; @@ -333,7 +333,7 @@ int32_t DCameraSoftbusSession::UnPackSendData(std::shared_ptr& buffe int32_t ret = memcpy_s(unpackData->Data() + BINARY_HEADER_FRAG_LEN, unpackData->Size() - BINARY_HEADER_FRAG_LEN, buffer->Data(), buffer->Size()); if (ret != EOK) { - DHLOGE("DCameraSoftbusSession UnPackSendData START_END memcpy_s failed, ret: %d, sess: %s peerSess: %s", + DCLOGE("DCameraSoftbusSession UnPackSendData START_END memcpy_s failed, ret: %d, sess: %s peerSess: %s", ret, mySessionName_.c_str(), peerSessionName_.c_str()); return ret; } @@ -343,7 +343,7 @@ int32_t DCameraSoftbusSession::UnPackSendData(std::shared_ptr& buffe uint32_t offset = 0; while (totalLen > offset) { SetHeadParaDataLen(headPara, totalLen, offset); - DHLOGD("DCameraSoftbusSession UnPackSendData, size: %d, dataLen: %d, totalLen: %d, nowTime: %lld start:", + DCLOGD("DCameraSoftbusSession UnPackSendData, size: %d, dataLen: %d, totalLen: %d, nowTime: %lld start:", buffer->Size(), headPara.dataLen, headPara.totalLen, GetNowTimeStampUs()); std::shared_ptr unpackData = std::make_shared(headPara.dataLen + BINARY_HEADER_FRAG_LEN); @@ -351,17 +351,17 @@ int32_t DCameraSoftbusSession::UnPackSendData(std::shared_ptr& buffe int ret = memcpy_s(unpackData->Data() + BINARY_HEADER_FRAG_LEN, unpackData->Size() - BINARY_HEADER_FRAG_LEN, buffer->Data() + offset, headPara.dataLen); if (ret != EOK) { - DHLOGE("DCameraSoftbusSession UnPackSendData memcpy_s failed, ret: %d, sess: %s peerSess: %s", + DCLOGE("DCameraSoftbusSession UnPackSendData memcpy_s failed, ret: %d, sess: %s peerSess: %s", ret, mySessionName_.c_str(), peerSessionName_.c_str()); return ret; } ret = (this->*memberFunc)(unpackData); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusSession sendData failed, ret: %d, sess: %s peerSess: %s", + DCLOGE("DCameraSoftbusSession sendData failed, ret: %d, sess: %s peerSess: %s", ret, mySessionName_.c_str(), peerSessionName_.c_str()); return ret; } - DHLOGD("DCameraSoftbusSession UnPackSendData, size: %d, dataLen: %d, totalLen: %d, nowTime: %lld end:", + DCLOGD("DCameraSoftbusSession UnPackSendData, size: %d, dataLen: %d, totalLen: %d, nowTime: %lld end:", buffer->Size(), headPara.dataLen, headPara.totalLen, GetNowTimeStampUs()); headPara.subSeq++; headPara.fragFlag = FRAG_MID; @@ -386,7 +386,7 @@ void DCameraSoftbusSession::MakeFragDataHeader(const SessionDataHeader& headPara uint32_t headerLen = sizeof(uint8_t) * HEADER_UINT8_NUM + sizeof(uint16_t) * HEADER_UINT16_NUM + sizeof(uint32_t) * HEADER_UINT32_NUM; if (headerLen > len) { - DHLOGE("MakeFragDataHeader %d over len %d", headerLen, len); + DCLOGE("MakeFragDataHeader %d over len %d", headerLen, len); return; } uint32_t i = 0; @@ -416,14 +416,14 @@ void DCameraSoftbusSession::MakeFragDataHeader(const SessionDataHeader& headPara int32_t DCameraSoftbusSession::SendBytes(std::shared_ptr& buffer) { if (state_ != DCAMERA_SOFTBUS_STATE_OPENED) { - DHLOGE("DCameraSoftbusSession SendBytes session state %d is not opened sessionId: %d peerDev: %s peerName: %s", + DCLOGE("DCameraSoftbusSession SendBytes session state %d is not opened sessionId: %d peerDev: %s peerName: %s", state_, sessionId_, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); return DCAMERA_WRONG_STATE; } int32_t ret = DCameraSoftbusAdapter::GetInstance().SendSofbusBytes(sessionId_, buffer); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusSession SendBytes sessionId: %d failed: %d peerDevId: %s peerSessionName: %s", sessionId_, + DCLOGE("DCameraSoftbusSession SendBytes sessionId: %d failed: %d peerDevId: %s peerSessionName: %s", sessionId_, ret, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); } return ret; @@ -432,14 +432,14 @@ int32_t DCameraSoftbusSession::SendBytes(std::shared_ptr& buffer) int32_t DCameraSoftbusSession::SendStream(std::shared_ptr& buffer) { if (state_ != DCAMERA_SOFTBUS_STATE_OPENED) { - DHLOGE("DCameraSoftbusSession SendStream session state %d is not opened sessionId: %d peerDev: %s peerName: %s", + DCLOGE("DCameraSoftbusSession SendStream session state %d is not opened sessionId: %d peerDev: %s peerName: %s", state_, sessionId_, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); return DCAMERA_WRONG_STATE; } int32_t ret = DCameraSoftbusAdapter::GetInstance().SendSofbusStream(sessionId_, buffer); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusSession SendStream sessionId: %d failed: %d peerDevId: %s peerSessionName: %s", + DCLOGE("DCameraSoftbusSession SendStream sessionId: %d failed: %d peerDevId: %s peerSessionName: %s", sessionId_, ret, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); } return ret; diff --git a/services/channel/test/unittest/common/channel/BUILD.gn b/services/channel/test/unittest/common/channel/BUILD.gn index b5d17d89b6339cc75eb26b8360b35080425ccd28..cf672e7b39295f5a279d2a3f0c7cad70a018aa5e 100644 --- a/services/channel/test/unittest/common/channel/BUILD.gn +++ b/services/channel/test/unittest/common/channel/BUILD.gn @@ -94,7 +94,7 @@ ohos_unittest("DCameraChannelTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DCameraChannelTest\"", + "DC_LOG_TAG=\"DCameraChannelTest\"", "LOG_DOMAIN=0xD004100", ] } diff --git a/services/channel/test/unittest/common/channel/dcamera_channel_source_impl_test.cpp b/services/channel/test/unittest/common/channel/dcamera_channel_source_impl_test.cpp index 4b45dfa97a7f9e89c7a25ca7907665fdcda2eebe..05d5979eb9dd41fa8f4d65a0fb9018ebe9a83d34 100644 --- a/services/channel/test/unittest/common/channel/dcamera_channel_source_impl_test.cpp +++ b/services/channel/test/unittest/common/channel/dcamera_channel_source_impl_test.cpp @@ -22,7 +22,7 @@ #include "dcamera_source_input_channel_listener.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "data_buffer.h" #include "icamera_channel.h" #include "session_bus_center.h" diff --git a/services/data_process/BUILD.gn b/services/data_process/BUILD.gn index f3d1484725936ce6e67e97524752510de91b2eac..10f24634da5a144daa0c366c2893463409ce6e38 100644 --- a/services/data_process/BUILD.gn +++ b/services/data_process/BUILD.gn @@ -28,8 +28,10 @@ ohos_shared_library("distributed_camera_data_process") { } stack_protector_ret = true include_dirs = [ + "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/eventbus", + "${fwk_utils_path}/include/log", "${graphicstandard_path}/frameworks/surface/include", "${services_path}/cameraservice/base/include", ] @@ -94,12 +96,13 @@ ohos_shared_library("distributed_camera_data_process") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"dcameradataproc\"", + "DC_LOG_TAG=\"dcameradataproc\"", "LOG_DOMAIN=0xD004100", ] external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_display:libdisplay_composer_proxy_1.0", "eventhandler:libeventhandler", "graphic_2d:surface", diff --git a/services/data_process/include/pipeline/dcamera_pipeline_sink.h b/services/data_process/include/pipeline/dcamera_pipeline_sink.h index f4807702cc2d1e14a58370e67736f70912be4a15..d9bbbc051870482e266bc5749b6869eae52b8a3b 100644 --- a/services/data_process/include/pipeline/dcamera_pipeline_sink.h +++ b/services/data_process/include/pipeline/dcamera_pipeline_sink.h @@ -19,10 +19,10 @@ #include #include -#include "event.h" -#include "event_bus.h" -#include "event_sender.h" -#include "eventbus_handler.h" +//#include "event.h" +//#include "event_bus.h" +//#include "event_sender.h" +//#include "eventbus_handler.h" #include "data_buffer.h" #include "image_common_type.h" diff --git a/services/data_process/include/pipeline/dcamera_pipeline_source.h b/services/data_process/include/pipeline/dcamera_pipeline_source.h index 5cd74bbd48a66ca122ff5e72eead1d159b4bd42e..29db0490739ab4040bb2bc85c7152848e6313bc4 100644 --- a/services/data_process/include/pipeline/dcamera_pipeline_source.h +++ b/services/data_process/include/pipeline/dcamera_pipeline_source.h @@ -19,10 +19,10 @@ #include #include -#include "event.h" +//#include "event.h" #include "event_bus.h" -#include "event_sender.h" -#include "eventbus_handler.h" +// #include "event_sender.h" +// #include "eventbus_handler.h" #include "data_buffer.h" #include "image_common_type.h" diff --git a/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_data_process.h b/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_data_process.h index ee914fbadd46f5b862ea80cb554ab6f52980733c..94db2f5ddc60a33db5ad4795d79a1316b09f8359 100644 --- a/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_data_process.h +++ b/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_data_process.h @@ -26,11 +26,11 @@ #include "avcodec_common.h" #include "avcodec_video_decoder.h" #include "avsharedmemory.h" -#include "event.h" +// #include "event.h" #include "event_bus.h" -#include "event_sender.h" -#include "event_registration.h" -#include "eventbus_handler.h" +// #include "event_sender.h" +// #include "event_registration.h" +// #include "eventbus_handler.h" #include "format.h" #include "ibuffer_consumer_listener.h" #include "iconsumer_surface.h" diff --git a/services/data_process/include/utils/property_carrier.h b/services/data_process/include/utils/property_carrier.h index 046655887ed6f3dd189b4f5c14fbfd120663f960..77cdd485ef27284cc9abcbdb1cc0d8727f3c1c43 100644 --- a/services/data_process/include/utils/property_carrier.h +++ b/services/data_process/include/utils/property_carrier.h @@ -16,7 +16,7 @@ #ifndef OHOS_PROPERTY_CARRIER_H #define OHOS_PROPERTY_CARRIER_H -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "distributed_camera_errno.h" #include "surface.h" diff --git a/services/data_process/src/pipeline/abstract_data_process.cpp b/services/data_process/src/pipeline/abstract_data_process.cpp index 0ee2e7ccf257a562c98a148130209496f5144d2f..7b9fdccadcce0ef2b2b48d4911a1683ec88a109c 100644 --- a/services/data_process/src/pipeline/abstract_data_process.cpp +++ b/services/data_process/src/pipeline/abstract_data_process.cpp @@ -15,14 +15,14 @@ #include "abstract_data_process.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { int32_t AbstractDataProcess::SetNextNode(std::shared_ptr& nextDataProcess) { if (nextDataProcess == nullptr) { - DHLOGE("Next data process is invalid."); + DCLOGE("Next data process is invalid."); return DCAMERA_BAD_VALUE; } nextDataProcess_ = nextDataProcess; diff --git a/services/data_process/src/pipeline/dcamera_pipeline_sink.cpp b/services/data_process/src/pipeline/dcamera_pipeline_sink.cpp index 9f28d41725b704e05662244ea0fa86b43df05991..e53c90c75e66b445c7cdea88dd47fb8d0f5a35c2 100644 --- a/services/data_process/src/pipeline/dcamera_pipeline_sink.cpp +++ b/services/data_process/src/pipeline/dcamera_pipeline_sink.cpp @@ -16,7 +16,7 @@ #include "dcamera_pipeline_sink.h" #include "dcamera_hitrace_adapter.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "encode_data_process.h" @@ -27,7 +27,7 @@ const std::string DCameraPipelineSink::PIPELINE_OWNER = "Sink"; DCameraPipelineSink::~DCameraPipelineSink() { if (isProcess_) { - DHLOGD("~DCameraPipelineSink : Destroy sink data process pipeline."); + DCLOGD("~DCameraPipelineSink : Destroy sink data process pipeline."); DestroyDataProcessPipeline(); } } @@ -37,24 +37,24 @@ int32_t DCameraPipelineSink::CreateDataProcessPipeline(PipelineType piplineType, const std::shared_ptr& listener) { DCAMERA_SYNC_TRACE(DCAMERA_SINK_CREATE_PIPELINE); - DHLOGD("Create sink data process pipeline."); + DCLOGD("Create sink data process pipeline."); switch (piplineType) { case PipelineType::VIDEO: if (!(IsInRange(sourceConfig) && IsInRange(targetConfig))) { - DHLOGE("Source config or target config of sink pipeline are invalid."); + DCLOGE("Source config or target config of sink pipeline are invalid."); return DCAMERA_BAD_VALUE; } break; default: - DHLOGE("JPEG or other pipeline type are not supported in sink pipeline."); + DCLOGE("JPEG or other pipeline type are not supported in sink pipeline."); return DCAMERA_NOT_FOUND; } if (listener == nullptr) { - DHLOGE("The process listener of sink pipeline is empty."); + DCLOGE("The process listener of sink pipeline is empty."); return DCAMERA_BAD_VALUE; } if (pipelineHead_ != nullptr) { - DHLOGD("The sink pipeline already exists."); + DCLOGD("The sink pipeline already exists."); return DCAMERA_OK; } @@ -79,15 +79,15 @@ bool DCameraPipelineSink::IsInRange(const VideoConfigParams& curConfig) int32_t DCameraPipelineSink::InitDCameraPipNodes(const VideoConfigParams& sourceConfig, const VideoConfigParams& targetConfig) { - DHLOGD("Init sink DCamera pipeline Nodes."); + DCLOGD("Init sink DCamera pipeline Nodes."); if (piplineType_ == PipelineType::PHOTO_JPEG) { - DHLOGE("JPEG data process is not supported."); + DCLOGE("JPEG data process is not supported."); return DCAMERA_NOT_FOUND; } pipNodeRanks_.push_back(std::make_shared(shared_from_this())); if (pipNodeRanks_.size() == 0) { - DHLOGD("Creating an empty sink pipeline."); + DCLOGD("Creating an empty sink pipeline."); pipelineHead_ = nullptr; return DCAMERA_BAD_VALUE; } @@ -99,7 +99,7 @@ int32_t DCameraPipelineSink::InitDCameraPipNodes(const VideoConfigParams& source VideoConfigParams curNodeProcessedCfg; int32_t err = pipNodeRanks_[i]->InitNode(curNodeSourceCfg, targetConfig, curNodeProcessedCfg); if (err != DCAMERA_OK) { - DHLOGE("Init sink DCamera pipeline Node [%d] failed.", i); + DCLOGE("Init sink DCamera pipeline Node [%d] failed.", i); return DCAMERA_INIT_ERR; } curNodeSourceCfg = curNodeProcessedCfg; @@ -110,38 +110,38 @@ int32_t DCameraPipelineSink::InitDCameraPipNodes(const VideoConfigParams& source err = pipNodeRanks_[i - 1]->SetNextNode(pipNodeRanks_[i]); if (err != DCAMERA_OK) { - DHLOGE("Set the next node of Node [%d] failed in sink pipeline.", i - 1); + DCLOGE("Set the next node of Node [%d] failed in sink pipeline.", i - 1); return DCAMERA_INIT_ERR; } } - DHLOGD("All nodes have been linked in sink pipeline."); + DCLOGD("All nodes have been linked in sink pipeline."); pipelineHead_ = pipNodeRanks_[0]; return DCAMERA_OK; } int32_t DCameraPipelineSink::ProcessData(std::vector>& dataBuffers) { - DHLOGD("Process data buffers in sink pipeline."); + DCLOGD("Process data buffers in sink pipeline."); if (piplineType_ == PipelineType::PHOTO_JPEG) { - DHLOGE("JPEG data process is not supported in sink pipeline."); + DCLOGE("JPEG data process is not supported in sink pipeline."); return DCAMERA_NOT_FOUND; } if (pipelineHead_ == nullptr) { - DHLOGE("The current sink pipeline node is empty. Processing failed."); + DCLOGE("The current sink pipeline node is empty. Processing failed."); return DCAMERA_INIT_ERR; } if (dataBuffers.empty()) { - DHLOGE("Sink Pipeline Input Data buffers is null."); + DCLOGE("Sink Pipeline Input Data buffers is null."); return DCAMERA_BAD_VALUE; } if (!isProcess_) { - DHLOGE("Sink pipeline node occurred error or start destroy."); + DCLOGE("Sink pipeline node occurred error or start destroy."); return DCAMERA_DISABLE_PROCESS; } int32_t err = pipelineHead_->ProcessData(dataBuffers); if (err != DCAMERA_OK) { - DHLOGE("Sink plpeline process data buffers fail."); + DCLOGE("Sink plpeline process data buffers fail."); } return err; } @@ -149,7 +149,7 @@ int32_t DCameraPipelineSink::ProcessData(std::vector void DCameraPipelineSink::DestroyDataProcessPipeline() { DCAMERA_SYNC_TRACE(DCAMERA_SINK_DESTORY_PIPELINE); - DHLOGD("Destroy sink data process pipeline start."); + DCLOGD("Destroy sink data process pipeline start."); isProcess_ = false; if (pipelineHead_ != nullptr) { pipelineHead_->ReleaseProcessNode(); @@ -159,15 +159,15 @@ void DCameraPipelineSink::DestroyDataProcessPipeline() pipNodeRanks_.clear(); piplineType_ = PipelineType::VIDEO; processListener_ = nullptr; - DHLOGD("Destroy sink data process pipeline end."); + DCLOGD("Destroy sink data process pipeline end."); } void DCameraPipelineSink::OnError(DataProcessErrorType errorType) { - DHLOGE("A runtime error occurred in sink pipeline."); + DCLOGE("A runtime error occurred in sink pipeline."); isProcess_ = false; if (processListener_ == nullptr) { - DHLOGE("The process listener of sink pipeline is empty."); + DCLOGE("The process listener of sink pipeline is empty."); return; } processListener_->OnError(errorType); @@ -175,9 +175,9 @@ void DCameraPipelineSink::OnError(DataProcessErrorType errorType) void DCameraPipelineSink::OnProcessedVideoBuffer(const std::shared_ptr& videoResult) { - DHLOGD("Sink pipeline output the processed video buffer."); + DCLOGD("Sink pipeline output the processed video buffer."); if (processListener_ == nullptr) { - DHLOGE("The process listener of sink pipeline is empty."); + DCLOGE("The process listener of sink pipeline is empty."); return; } processListener_->OnProcessedVideoBuffer(videoResult); @@ -186,14 +186,14 @@ void DCameraPipelineSink::OnProcessedVideoBuffer(const std::shared_ptr cur = pipelineHead_; while (cur) { int32_t ret = cur->GetProperty(propertyName, propertyCarrier); if (ret != DCAMERA_OK) { - DHLOGD("DCameraPipelineSink::GetProperty: get dataProcess property fail."); + DCLOGD("DCameraPipelineSink::GetProperty: get dataProcess property fail."); return DCAMERA_BAD_VALUE; } cur = cur->nextDataProcess_; diff --git a/services/data_process/src/pipeline/dcamera_pipeline_source.cpp b/services/data_process/src/pipeline/dcamera_pipeline_source.cpp index a67480dac13201842aa3e6bcfeb37d7215badb64..2d4daf518e97687ae639debe74b37ae8bf39f693 100644 --- a/services/data_process/src/pipeline/dcamera_pipeline_source.cpp +++ b/services/data_process/src/pipeline/dcamera_pipeline_source.cpp @@ -16,7 +16,7 @@ #include "dcamera_pipeline_source.h" #include "dcamera_hitrace_adapter.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "decode_data_process.h" #include "fps_controller_process.h" @@ -29,7 +29,7 @@ const std::string DCameraPipelineSource::PIPELINE_OWNER = "Source"; DCameraPipelineSource::~DCameraPipelineSource() { if (isProcess_) { - DHLOGD("~DCameraPipelineSource : Destroy source data process pipeline."); + DCLOGD("~DCameraPipelineSource : Destroy source data process pipeline."); DestroyDataProcessPipeline(); } } @@ -39,25 +39,25 @@ int32_t DCameraPipelineSource::CreateDataProcessPipeline(PipelineType piplineTyp const std::shared_ptr& listener) { DCAMERA_SYNC_TRACE(DCAMERA_SOURCE_CREATE_PIPELINE); - DHLOGD("Create source data process pipeline."); + DCLOGD("Create source data process pipeline."); switch (piplineType) { case PipelineType::VIDEO: if (!(IsInRange(sourceConfig) && IsInRange(targetConfig))) { - DHLOGE("Source config or target config of source pipeline are invalid."); + DCLOGE("Source config or target config of source pipeline are invalid."); return DCAMERA_BAD_VALUE; } break; default: - DHLOGE("JPEG or other pipeline type are not supported in source pipeline."); + DCLOGE("JPEG or other pipeline type are not supported in source pipeline."); return DCAMERA_NOT_FOUND; } if (listener == nullptr) { - DHLOGE("The process listener of source pipeline is empty."); + DCLOGE("The process listener of source pipeline is empty."); return DCAMERA_BAD_VALUE; } if (pipelineHead_ != nullptr) { - DHLOGD("The source pipeline already exists."); + DCLOGD("The source pipeline already exists."); return DCAMERA_OK; } @@ -82,7 +82,7 @@ bool DCameraPipelineSource::IsInRange(const VideoConfigParams& curConfig) void DCameraPipelineSource::InitDCameraPipEvent() { - DHLOGD("Init source DCamera pipeline event to asynchronously process data."); + DCLOGD("Init source DCamera pipeline event to asynchronously process data."); eventBusSource_ = std::make_shared("PipelineSrcHandler"); DCameraPipelineEvent pipelineEvent(*this, std::make_shared()); eventBusSource_->AddHandler(pipelineEvent.GetType(), *this); @@ -91,20 +91,20 @@ void DCameraPipelineSource::InitDCameraPipEvent() int32_t DCameraPipelineSource::InitDCameraPipNodes(const VideoConfigParams& sourceConfig, const VideoConfigParams& targetConfig) { - DHLOGD("Init source DCamera pipeline Nodes."); + DCLOGD("Init source DCamera pipeline Nodes."); if (piplineType_ == PipelineType::PHOTO_JPEG) { - DHLOGE("JPEG data process is not supported."); + DCLOGE("JPEG data process is not supported."); return DCAMERA_NOT_FOUND; } if (eventBusSource_ == nullptr) { - DHLOGE("eventBusSource is nullptr."); + DCLOGE("eventBusSource is nullptr."); return DCAMERA_BAD_VALUE; } pipNodeRanks_.push_back(std::make_shared(eventBusSource_, shared_from_this())); pipNodeRanks_.push_back(std::make_shared(shared_from_this())); if (pipNodeRanks_.size() == 0) { - DHLOGD("Creating an empty source pipeline."); + DCLOGD("Creating an empty source pipeline."); pipelineHead_ = nullptr; return DCAMERA_BAD_VALUE; } @@ -112,14 +112,14 @@ int32_t DCameraPipelineSource::InitDCameraPipNodes(const VideoConfigParams& sour VideoConfigParams curNodeSourceCfg = sourceConfig; for (size_t i = 0; i < pipNodeRanks_.size(); i++) { pipNodeRanks_[i]->SetNodeRank(i); - DHLOGI("DCameraPipelineSource::InitDCameraPipNodes Node %d Source Config: width %d height %d " + + DCLOGI("DCameraPipelineSource::InitDCameraPipNodes Node %d Source Config: width %d height %d " + "format %d codecType %d frameRate %d", i, curNodeSourceCfg.GetWidth(), curNodeSourceCfg.GetHeight(), curNodeSourceCfg.GetVideoformat(), curNodeSourceCfg.GetVideoCodecType(), curNodeSourceCfg.GetFrameRate()); VideoConfigParams curNodeProcessedCfg; int32_t err = pipNodeRanks_[i]->InitNode(curNodeSourceCfg, targetConfig, curNodeProcessedCfg); if (err != DCAMERA_OK) { - DHLOGE("Init source DCamera pipeline Node [%d] failed.", i); + DCLOGE("Init source DCamera pipeline Node [%d] failed.", i); return DCAMERA_INIT_ERR; } curNodeSourceCfg = curNodeProcessedCfg; @@ -130,11 +130,11 @@ int32_t DCameraPipelineSource::InitDCameraPipNodes(const VideoConfigParams& sour err = pipNodeRanks_[i - 1]->SetNextNode(pipNodeRanks_[i]); if (err != DCAMERA_OK) { - DHLOGE("Set the next node of Node [%d] failed in source pipeline.", i - 1); + DCLOGE("Set the next node of Node [%d] failed in source pipeline.", i - 1); return DCAMERA_INIT_ERR; } } - DHLOGD("All nodes have been linked in source pipeline, Target Config: " + + DCLOGD("All nodes have been linked in source pipeline, Target Config: " + "width %d height %d format %d codecType %d frameRate %d", targetConfig.GetWidth(), targetConfig.GetHeight(), targetConfig.GetVideoformat(), targetConfig.GetVideoCodecType(), targetConfig.GetFrameRate()); pipelineHead_ = pipNodeRanks_[0]; @@ -143,30 +143,30 @@ int32_t DCameraPipelineSource::InitDCameraPipNodes(const VideoConfigParams& sour int32_t DCameraPipelineSource::ProcessData(std::vector>& dataBuffers) { - DHLOGD("Process data buffers in source pipeline."); + DCLOGD("Process data buffers in source pipeline."); if (piplineType_ == PipelineType::PHOTO_JPEG) { - DHLOGE("JPEG data process is not supported in source pipeline."); + DCLOGE("JPEG data process is not supported in source pipeline."); return DCAMERA_NOT_FOUND; } if (pipelineHead_ == nullptr) { - DHLOGE("The current source pipeline node is empty. Processing failed."); + DCLOGE("The current source pipeline node is empty. Processing failed."); return DCAMERA_INIT_ERR; } if (dataBuffers.empty()) { - DHLOGE("Source Pipeline Input data buffers is empty."); + DCLOGE("Source Pipeline Input data buffers is empty."); return DCAMERA_BAD_VALUE; } if (!isProcess_) { - DHLOGE("Source Pipeline node occurred error or start destroy."); + DCLOGE("Source Pipeline node occurred error or start destroy."); return DCAMERA_DISABLE_PROCESS; } - DHLOGD("Send asynchronous event to process data in source pipeline."); + DCLOGD("Send asynchronous event to process data in source pipeline."); std::shared_ptr pipConfigSource = std::make_shared(piplineType_, PIPELINE_OWNER, dataBuffers); DCameraPipelineEvent dCamPipelineEvent(*this, pipConfigSource); if (eventBusSource_ == nullptr) { - DHLOGE("eventBusSource_ is nullptr."); + DCLOGE("eventBusSource_ is nullptr."); return DCAMERA_BAD_VALUE; } eventBusSource_->PostEvent(dCamPipelineEvent, POSTMODE::POST_ASYNC); @@ -176,7 +176,7 @@ int32_t DCameraPipelineSource::ProcessData(std::vectorReleaseProcessNode(); @@ -186,16 +186,16 @@ void DCameraPipelineSource::DestroyDataProcessPipeline() processListener_ = nullptr; pipNodeRanks_.clear(); piplineType_ = PipelineType::VIDEO; - DHLOGD("Destroy source data process pipeline end."); + DCLOGD("Destroy source data process pipeline end."); } void DCameraPipelineSource::OnEvent(DCameraPipelineEvent& ev) { - DHLOGD("Receive asynchronous event then start process data in source pipeline."); + DCLOGD("Receive asynchronous event then start process data in source pipeline."); std::shared_ptr pipelineConfig = ev.GetPipelineConfig(); std::vector> inputBuffers = pipelineConfig->GetDataBuffers(); if (inputBuffers.empty()) { - DHLOGE("Receiving process data buffers is empty in source pipeline."); + DCLOGE("Receiving process data buffers is empty in source pipeline."); OnError(ERROR_PIPELINE_EVENTBUS); return; } @@ -204,10 +204,10 @@ void DCameraPipelineSource::OnEvent(DCameraPipelineEvent& ev) void DCameraPipelineSource::OnError(DataProcessErrorType errorType) { - DHLOGE("A runtime error occurred in the source pipeline."); + DCLOGE("A runtime error occurred in the source pipeline."); isProcess_ = false; if (processListener_ == nullptr) { - DHLOGE("The process listener of source pipeline is empty."); + DCLOGE("The process listener of source pipeline is empty."); return; } processListener_->OnError(errorType); @@ -215,9 +215,9 @@ void DCameraPipelineSource::OnError(DataProcessErrorType errorType) void DCameraPipelineSource::OnProcessedVideoBuffer(const std::shared_ptr& videoResult) { - DHLOGD("Source pipeline output the processed video buffer."); + DCLOGD("Source pipeline output the processed video buffer."); if (processListener_ == nullptr) { - DHLOGE("The process listener of source pipeline is empty."); + DCLOGE("The process listener of source pipeline is empty."); return; } processListener_->OnProcessedVideoBuffer(videoResult); 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 4c748db8ac9d5194752c3bb1e17d4a62682eb702..6f3d7814ddbaffc1bfe22fb6287c871351eff118 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 @@ -17,14 +17,14 @@ #include "dcamera_utils_tools.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { FpsControllerProcess::~FpsControllerProcess() { if (isFpsControllerProcess_) { - DHLOGD("~DecodeDataProcess : ReleaseProcessNode."); + DCLOGD("~DecodeDataProcess : ReleaseProcessNode."); ReleaseProcessNode(); } } @@ -33,7 +33,7 @@ int32_t FpsControllerProcess::InitNode(const VideoConfigParams& sourceConfig, co VideoConfigParams& processedConfig) { if (targetConfig.GetFrameRate() > MAX_TARGET_FRAME_RATE) { - DHLOGE("The target framerate : %d is greater than the max framerate : %d.", + DCLOGE("The target framerate : %d is greater than the max framerate : %d.", targetConfig.GetFrameRate(), MAX_TARGET_FRAME_RATE); return DCAMERA_BAD_TYPE; } @@ -49,7 +49,7 @@ int32_t FpsControllerProcess::InitNode(const VideoConfigParams& sourceConfig, co void FpsControllerProcess::ReleaseProcessNode() { - DHLOGD("Start release [%d] node : FPS controller.", nodeRank_); + DCLOGD("Start release [%d] node : FPS controller.", nodeRank_); isFpsControllerProcess_ = false; isFirstFrame_ = false; targetFrameRate_ = 0; @@ -68,22 +68,22 @@ void FpsControllerProcess::ReleaseProcessNode() nextDataProcess_->ReleaseProcessNode(); nextDataProcess_ = nullptr; } - DHLOGD("Release [%d] node : FPS controller end.", nodeRank_); + DCLOGD("Release [%d] node : FPS controller end.", nodeRank_); } int32_t FpsControllerProcess::ProcessData(std::vector>& inputBuffers) { if (inputBuffers.empty()) { - DHLOGE("Data buffers is null."); + DCLOGE("Data buffers is null."); return DCAMERA_BAD_TYPE; } if (!isFpsControllerProcess_) { - DHLOGE("Decoder node occurred error."); + DCLOGE("Decoder node occurred error."); return DCAMERA_DISABLE_PROCESS; } int64_t timeStampUs = 0; if (!inputBuffers[0]->FindInt64("timeUs", timeStampUs)) { - DHLOGE("Find decoder output timestamp failed."); + DCLOGE("Find decoder output timestamp failed."); return DCAMERA_BAD_TYPE; } @@ -93,31 +93,31 @@ int32_t FpsControllerProcess::ProcessData(std::vector FRMAE_MAX_INTERVAL_TIME_WINDOW_MS) { - DHLOGD("frame control, nowMs: %lld mIncomingFrameT[0]: %lld intervalNewAndFirst: %lld", + DCLOGD("frame control, nowMs: %lld mIncomingFrameT[0]: %lld intervalNewAndFirst: %lld", (long long)nowMs, (long long)incomingFrameTimesMs_[0], (long long)intervalNewAndFirst); for (int i = 0; i < INCOME_FRAME_TIME_HISTORY_WINDOWS_SIZE; i++) { incomingFrameTimesMs_[i] = 0; } } else { - DHLOGD("frame control shift, nowMs: %lld mIncomingFrameT[0]: %lld intervalNewAndFirst: %lld", + DCLOGD("frame control shift, nowMs: %lld mIncomingFrameT[0]: %lld intervalNewAndFirst: %lld", (long long)nowMs, (long long)incomingFrameTimesMs_[0], (long long)intervalNewAndFirst); const int32_t windowLeftNum = 2; for (int i = (INCOME_FRAME_TIME_HISTORY_WINDOWS_SIZE - windowLeftNum); i >= 0; --i) { @@ -202,9 +202,9 @@ void FpsControllerProcess::UpdateIncomingFrameTimes(int64_t nowMs) float FpsControllerProcess::CalculateFrameRate(int64_t nowMs) { - DHLOGD("Frame control, calculate frame rate."); + DCLOGD("Frame control, calculate frame rate."); if (targetFrameRate_ <= 0) { - DHLOGE("Frame control, targetFrameRate_ : %d", targetFrameRate_); + DCLOGE("Frame control, targetFrameRate_ : %d", targetFrameRate_); return 0.0; } @@ -238,30 +238,30 @@ float FpsControllerProcess::CalculateFrameRate(int64_t nowMs) bool FpsControllerProcess::IsDropFrame(float incomingFps) { - DHLOGD("Frame control, IsDropFrame"); + DCLOGD("Frame control, IsDropFrame"); if (targetFrameRate_ == 0) { - DHLOGD("target fps is 0, drop all frame."); + DCLOGD("target fps is 0, drop all frame."); return true; } if (incomingFps <= 0) { - DHLOGD("incoming fps not more than 0, not drop"); + DCLOGD("incoming fps not more than 0, not drop"); return false; } const int32_t incomingFrmRate = static_cast(incomingFps); if (incomingFrmRate > targetFrameRate_) { - DHLOGD("incoming fps not more than targetFrameRate_, not drop"); + DCLOGD("incoming fps not more than targetFrameRate_, not drop"); return false; } bool isDrop = ReduceFrameRateByUniformStrategy(incomingFrmRate); - DHLOGD("drop frame result: %s", isDrop ? "drop" : "no drop"); + DCLOGD("drop frame result: %s", isDrop ? "drop" : "no drop"); return isDrop; } bool FpsControllerProcess::ReduceFrameRateByUniformStrategy(int32_t incomingFrmRate) { - DHLOGD("Frame control, reduce frame rate by uniform rate strategy"); + DCLOGD("Frame control, reduce frame rate by uniform rate strategy"); if (incomingFrmRate > targetFrameRate_) { - DHLOGD("incoming fps not more than targetFrameRate_, not drop"); + DCLOGD("incoming fps not more than targetFrameRate_, not drop"); return false; } @@ -314,22 +314,22 @@ bool FpsControllerProcess::ReduceFrameRateByUniformStrategy(int32_t incomingFrmR int32_t FpsControllerProcess::FpsControllerDone(std::vector>& outputBuffers) { if (outputBuffers.empty()) { - DHLOGE("The received data buffers is empty."); + DCLOGE("The received data buffers is empty."); return DCAMERA_BAD_VALUE; } if (nextDataProcess_ != nullptr) { - DHLOGD("Send to the next node of the FpsController for processing."); + DCLOGD("Send to the next node of the FpsController for processing."); int32_t err = nextDataProcess_->ProcessData(outputBuffers); if (err != DCAMERA_OK) { - DHLOGE("Someone node after the FpsController processes failed."); + DCLOGE("Someone node after the FpsController processes failed."); } return err; } - DHLOGD("The current node is the last node, and Output the processed video buffer"); + DCLOGD("The current node is the last node, and Output the processed video buffer"); std::shared_ptr targetPipelineSource = callbackPipelineSource_.lock(); if (targetPipelineSource == nullptr) { - DHLOGE("callbackPipelineSource_ is nullptr."); + DCLOGE("callbackPipelineSource_ is nullptr."); return DCAMERA_BAD_VALUE; } targetPipelineSource->OnProcessedVideoBuffer(outputBuffers[0]); diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp index 14ffc1fb9239ba30ccaf007ab1bf7974091782e7..1512bbfae3543b182cc1299690fe002d3c29d263 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp @@ -17,7 +17,7 @@ #include "libyuv.h" #include "distributed_camera_constants.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "dcamera_hisysevent_adapter.h" #include "dcamera_utils_tools.h" #include "decode_surface_listener.h" @@ -33,7 +33,7 @@ const std::string ENUM_VIDEOFORMAT_STRINGS[] = { DecodeDataProcess::~DecodeDataProcess() { if (isDecoderProcess_.load()) { - DHLOGD("~DecodeDataProcess : ReleaseProcessNode."); + DCLOGD("~DecodeDataProcess : ReleaseProcessNode."); ReleaseProcessNode(); } } @@ -41,13 +41,13 @@ DecodeDataProcess::~DecodeDataProcess() int32_t DecodeDataProcess::InitNode(const VideoConfigParams& sourceConfig, const VideoConfigParams& targetConfig, VideoConfigParams& processedConfig) { - DHLOGD("Init DCamera DecodeNode start."); + DCLOGD("Init DCamera DecodeNode start."); if (!(IsInDecoderRange(sourceConfig) && IsInDecoderRange(targetConfig))) { - DHLOGE("Source config or target config are invalid."); + DCLOGE("Source config or target config are invalid."); return DCAMERA_BAD_VALUE; } if (!IsConvertible(sourceConfig, targetConfig)) { - DHLOGE("The DecodeNode can't convert %d to %d.", sourceConfig.GetVideoCodecType(), + DCLOGE("The DecodeNode can't convert %d to %d.", sourceConfig.GetVideoCodecType(), targetConfig_.GetVideoCodecType()); return DCAMERA_BAD_TYPE; } @@ -55,7 +55,7 @@ int32_t DecodeDataProcess::InitNode(const VideoConfigParams& sourceConfig, const sourceConfig_ = sourceConfig; targetConfig_ = targetConfig; if (sourceConfig_.GetVideoCodecType() == targetConfig_.GetVideoCodecType()) { - DHLOGD("Disable DecodeNode. The target video codec type %d is the same as the source video codec type %d.", + DCLOGD("Disable DecodeNode. The target video codec type %d is the same as the source video codec type %d.", targetConfig_.GetVideoCodecType(), sourceConfig_.GetVideoCodecType()); processedConfig_ = sourceConfig; processedConfig = processedConfig_; @@ -66,7 +66,7 @@ int32_t DecodeDataProcess::InitNode(const VideoConfigParams& sourceConfig, const InitCodecEvent(); int32_t err = InitDecoder(); if (err != DCAMERA_OK) { - DHLOGE("Init video decoder failed."); + DCLOGE("Init video decoder failed."); ReleaseProcessNode(); return err; } @@ -91,27 +91,27 @@ bool DecodeDataProcess::IsConvertible(const VideoConfigParams& sourceConfig, con void DecodeDataProcess::InitCodecEvent() { - DHLOGD("Init DecodeNode eventBus, and add handler for it."); + DCLOGD("Init DecodeNode eventBus, and add handler for it."); eventBusDecode_ = std::make_shared("DeDtProcHandler"); DCameraCodecEvent codecEvent(*this, std::make_shared()); eventBusRegHandleDecode_ = eventBusDecode_->AddHandler(codecEvent.GetType(), *this); - DHLOGD("Add handler for DCamera pipeline eventBus."); + DCLOGD("Add handler for DCamera pipeline eventBus."); eventBusRegHandlePipeline2Decode_ = eventBusPipeline_->AddHandler(codecEvent.GetType(), *this); } int32_t DecodeDataProcess::InitDecoder() { - DHLOGD("Init video decoder."); + DCLOGD("Init video decoder."); int32_t ret = ConfigureVideoDecoder(); if (ret != DCAMERA_OK) { - DHLOGE("Init video decoder metadata format failed."); + DCLOGE("Init video decoder metadata format failed."); return ret; } ret = StartVideoDecoder(); if (ret != DCAMERA_OK) { - DHLOGE("Start Video decoder failed."); + DCLOGE("Start Video decoder failed."); ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_DECODE_ERROR, CreateMsg("start video decoder failed, width: %d, height: %d, format: %s", sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), @@ -125,31 +125,31 @@ int32_t DecodeDataProcess::ConfigureVideoDecoder() { int32_t ret = InitDecoderMetadataFormat(); if (ret != DCAMERA_OK) { - DHLOGE("Init video decoder metadata format failed. Error code %d.", ret); + DCLOGE("Init video decoder metadata format failed. Error code %d.", ret); return ret; } videoDecoder_ = Media::VideoDecoderFactory::CreateByMime(processType_); if (videoDecoder_ == nullptr) { - DHLOGE("Create video decoder failed."); + DCLOGE("Create video decoder failed."); return DCAMERA_INIT_ERR; } decodeVideoCallback_ = std::make_shared(shared_from_this()); ret = videoDecoder_->SetCallback(decodeVideoCallback_); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("Set video decoder callback failed. Error code %d.", ret); + DCLOGE("Set video decoder callback failed. Error code %d.", ret); return DCAMERA_INIT_ERR; } ret = videoDecoder_->Configure(metadataFormat_); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("Set video decoder metadata format failed. Error code %d.", ret); + DCLOGE("Set video decoder metadata format failed. Error code %d.", ret); return DCAMERA_INIT_ERR; } ret = SetDecoderOutputSurface(); if (ret != DCAMERA_OK) { - DHLOGE("Set decoder output surface failed. Error code %d.", ret); + DCLOGE("Set decoder output surface failed. Error code %d.", ret); return ret; } @@ -158,7 +158,7 @@ int32_t DecodeDataProcess::ConfigureVideoDecoder() int32_t DecodeDataProcess::InitDecoderMetadataFormat() { - DHLOGI("Init video decoder metadata format. codecType: %d", sourceConfig_.GetVideoCodecType()); + DCLOGI("Init video decoder metadata format. codecType: %d", sourceConfig_.GetVideoCodecType()); processedConfig_ = sourceConfig_; processedConfig_.SetVideoCodecType(VideoCodecType::NO_CODEC); switch (sourceConfig_.GetVideoCodecType()) { @@ -174,7 +174,7 @@ int32_t DecodeDataProcess::InitDecoderMetadataFormat() processType_ = "video/mp4v-es"; break; default: - DHLOGE("The current codec type does not support decoding."); + DCLOGE("The current codec type does not support decoding."); return DCAMERA_NOT_FOUND; } @@ -189,15 +189,15 @@ int32_t DecodeDataProcess::InitDecoderMetadataFormat() int32_t DecodeDataProcess::SetDecoderOutputSurface() { - DHLOGD("Set the video decoder output surface."); + DCLOGD("Set the video decoder output surface."); if (videoDecoder_ == nullptr) { - DHLOGE("The video decoder is null."); + DCLOGE("The video decoder is null."); return DCAMERA_BAD_VALUE; } decodeConsumerSurface_ = IConsumerSurface::Create(); if (decodeConsumerSurface_ == nullptr) { - DHLOGE("Create the decode consumer surface failed."); + DCLOGE("Create the decode consumer surface failed."); return DCAMERA_INIT_ERR; } decodeConsumerSurface_->SetDefaultWidthAndHeight(static_cast(sourceConfig_.GetWidth()), @@ -205,25 +205,25 @@ int32_t DecodeDataProcess::SetDecoderOutputSurface() decodeSurfaceListener_ = new DecodeSurfaceListener(decodeConsumerSurface_, shared_from_this()); if (decodeConsumerSurface_->RegisterConsumerListener(decodeSurfaceListener_) != SURFACE_ERROR_OK) { - DHLOGE("Register consumer listener failed."); + DCLOGE("Register consumer listener failed."); return DCAMERA_INIT_ERR; } sptr surfaceProducer = decodeConsumerSurface_->GetProducer(); if (surfaceProducer == nullptr) { - DHLOGE("Get the surface producer of the decode consumer surface failed."); + DCLOGE("Get the surface producer of the decode consumer surface failed."); return DCAMERA_INIT_ERR; } decodeProducerSurface_ = Surface::CreateSurfaceAsProducer(surfaceProducer); if (decodeProducerSurface_ == nullptr) { - DHLOGE("Create the decode producer surface of the decode consumer surface failed."); + DCLOGE("Create the decode producer surface of the decode consumer surface failed."); return DCAMERA_INIT_ERR; } - DHLOGD("Set the producer surface to video decoder output surface."); + DCLOGD("Set the producer surface to video decoder output surface."); int32_t err = videoDecoder_->SetOutputSurface(decodeProducerSurface_); if (err != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("Set decoder output surface failed."); + DCLOGE("Set decoder output surface failed."); return DCAMERA_INIT_ERR; } return DCAMERA_OK; @@ -232,18 +232,18 @@ int32_t DecodeDataProcess::SetDecoderOutputSurface() int32_t DecodeDataProcess::StartVideoDecoder() { if (videoDecoder_ == nullptr) { - DHLOGE("The video decoder does not exist before StartVideoDecoder."); + DCLOGE("The video decoder does not exist before StartVideoDecoder."); return DCAMERA_BAD_VALUE; } int32_t ret = videoDecoder_->Prepare(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("Video decoder prepare failed. Error code %d.", ret); + DCLOGE("Video decoder prepare failed. Error code %d.", ret); return DCAMERA_INIT_ERR; } ret = videoDecoder_->Start(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("Video decoder start failed. Error code %d.", ret); + DCLOGE("Video decoder start failed. Error code %d.", ret); return DCAMERA_INIT_ERR; } return DCAMERA_OK; @@ -252,19 +252,19 @@ int32_t DecodeDataProcess::StartVideoDecoder() int32_t DecodeDataProcess::StopVideoDecoder() { if (videoDecoder_ == nullptr) { - DHLOGE("The video decoder does not exist before StopVideoDecoder."); + DCLOGE("The video decoder does not exist before StopVideoDecoder."); return DCAMERA_BAD_VALUE; } bool isSuccess = true; int32_t ret = videoDecoder_->Flush(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("VideoDecoder flush failed. Error type: %d.", ret); + DCLOGE("VideoDecoder flush failed. Error type: %d.", ret); isSuccess = isSuccess && false; } ret = videoDecoder_->Stop(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("VideoDecoder stop failed. Error type: %d.", ret); + DCLOGE("VideoDecoder stop failed. Error type: %d.", ret); isSuccess = isSuccess && false; } if (!isSuccess) { @@ -275,21 +275,21 @@ int32_t DecodeDataProcess::StopVideoDecoder() void DecodeDataProcess::ReleaseVideoDecoder() { - DHLOGD("Start release videoDecoder."); + DCLOGD("Start release videoDecoder."); std::lock_guard inputLock(mtxDecoderLock_); std::lock_guard outputLock(mtxDecoderState_); if (videoDecoder_ == nullptr) { - DHLOGE("The video decoder does not exist before ReleaseVideoDecoder."); + DCLOGE("The video decoder does not exist before ReleaseVideoDecoder."); decodeVideoCallback_ = nullptr; return; } int32_t ret = StopVideoDecoder(); if (ret != DCAMERA_OK) { - DHLOGE("StopVideoDecoder failed."); + DCLOGE("StopVideoDecoder failed."); } ret = videoDecoder_->Release(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("VideoDecoder release failed. Error type: %d.", ret); + DCLOGE("VideoDecoder release failed. Error type: %d.", ret); } videoDecoder_ = nullptr; decodeVideoCallback_ = nullptr; @@ -299,12 +299,12 @@ void DecodeDataProcess::ReleaseDecoderSurface() { if (decodeConsumerSurface_ == nullptr) { decodeProducerSurface_ = nullptr; - DHLOGE("The decode consumer surface does not exist before UnregisterConsumerListener."); + DCLOGE("The decode consumer surface does not exist before UnregisterConsumerListener."); return; } int32_t ret = decodeConsumerSurface_->UnregisterConsumerListener(); if (ret != SURFACE_ERROR_OK) { - DHLOGE("Unregister consumer listener failed. Error type: %d.", ret); + DCLOGE("Unregister consumer listener failed. Error type: %d.", ret); } decodeConsumerSurface_ = nullptr; decodeProducerSurface_ = nullptr; @@ -323,12 +323,12 @@ void DecodeDataProcess::ReleaseCodecEvent() eventBusRegHandlePipeline2Decode_ = nullptr; eventBusPipeline_ = nullptr; } - DHLOGD("Release DecodeNode eventBusDecode and eventBusPipeline end."); + DCLOGD("Release DecodeNode eventBusDecode and eventBusPipeline end."); } void DecodeDataProcess::ReleaseProcessNode() { - DHLOGD("Start release [%d] node : DecodeNode.", nodeRank_); + DCLOGD("Start release [%d] node : DecodeNode.", nodeRank_); isDecoderProcess_.store(false); ReleaseVideoDecoder(); ReleaseDecoderSurface(); @@ -347,50 +347,50 @@ void DecodeDataProcess::ReleaseProcessNode() nextDataProcess_->ReleaseProcessNode(); nextDataProcess_ = nullptr; } - DHLOGD("Release [%d] node : DecodeNode end.", nodeRank_); + DCLOGD("Release [%d] node : DecodeNode end.", nodeRank_); } int32_t DecodeDataProcess::ProcessData(std::vector>& inputBuffers) { - DHLOGD("Process data in DecodeDataProcess."); + DCLOGD("Process data in DecodeDataProcess."); if (inputBuffers.empty()) { - DHLOGE("The input data buffers is empty."); + DCLOGE("The input data buffers is empty."); return DCAMERA_BAD_VALUE; } if (sourceConfig_.GetVideoCodecType() == processedConfig_.GetVideoCodecType()) { - DHLOGD("The target VideoCodecType : %d is the same as the source VideoCodecType : %d.", + DCLOGD("The target VideoCodecType : %d is the same as the source VideoCodecType : %d.", sourceConfig_.GetVideoCodecType(), processedConfig_.GetVideoCodecType()); return DecodeDone(inputBuffers); } if (videoDecoder_ == nullptr) { - DHLOGE("The video decoder does not exist before decoding data."); + DCLOGE("The video decoder does not exist before decoding data."); return DCAMERA_INIT_ERR; } if (inputBuffersQueue_.size() > VIDEO_DECODER_QUEUE_MAX) { - DHLOGE("video decoder input buffers queue over flow."); + DCLOGE("video decoder input buffers queue over flow."); return DCAMERA_INDEX_OVERFLOW; } if (inputBuffers[0]->Size() > MAX_YUV420_BUFFER_SIZE) { - DHLOGE("DecodeNode input buffer size %zu error.", inputBuffers[0]->Size()); + DCLOGE("DecodeNode input buffer size %zu error.", inputBuffers[0]->Size()); return DCAMERA_MEMORY_OPT_ERROR; } if (!isDecoderProcess_.load()) { - DHLOGE("Decoder node occurred error or start release."); + DCLOGE("Decoder node occurred error or start release."); return DCAMERA_DISABLE_PROCESS; } inputBuffersQueue_.push(inputBuffers[0]); - DHLOGD("Push inputBuf sucess. BufSize %zu, QueueSize %zu.", inputBuffers[0]->Size(), inputBuffersQueue_.size()); + DCLOGD("Push inputBuf sucess. BufSize %zu, QueueSize %zu.", inputBuffers[0]->Size(), inputBuffersQueue_.size()); int32_t err = FeedDecoderInputBuffer(); if (err != DCAMERA_OK) { int32_t sleepTimeUs = 5000; std::this_thread::sleep_for(std::chrono::microseconds(sleepTimeUs)); - DHLOGD("Feed decoder input buffer failed. Try FeedDecoderInputBuffer again."); + DCLOGD("Feed decoder input buffer failed. Try FeedDecoderInputBuffer again."); std::shared_ptr reFeedInputPacket = std::make_shared(); reFeedInputPacket->SetVideoCodecType(sourceConfig_.GetVideoCodecType()); DCameraCodecEvent dCamCodecEv(*this, reFeedInputPacket, VideoCodecAction::ACTION_ONCE_AGAIN); if (eventBusPipeline_ == nullptr) { - DHLOGE("eventBusPipeline_ is nullptr."); + DCLOGE("eventBusPipeline_ is nullptr."); return DCAMERA_BAD_VALUE; } eventBusPipeline_->PostEvent(dCamCodecEv, POSTMODE::POST_ASYNC); @@ -400,11 +400,11 @@ int32_t DecodeDataProcess::ProcessData(std::vector>& int32_t DecodeDataProcess::FeedDecoderInputBuffer() { - DHLOGD("Feed decoder input buffer."); + DCLOGD("Feed decoder input buffer."); while ((!inputBuffersQueue_.empty()) && (isDecoderProcess_.load())) { std::shared_ptr buffer = inputBuffersQueue_.front(); if (buffer == nullptr || availableInputIndexsQueue_.empty()) { - DHLOGE("inputBuffersQueue size %zu, availableInputIndexsQueue size %zu.", + DCLOGE("inputBuffersQueue size %zu, availableInputIndexsQueue size %zu.", inputBuffersQueue_.size(), availableInputIndexsQueue_.size()); return DCAMERA_BAD_VALUE; } @@ -417,33 +417,33 @@ int32_t DecodeDataProcess::FeedDecoderInputBuffer() { std::lock_guard inputLock(mtxDecoderLock_); if (videoDecoder_ == nullptr) { - DHLOGE("The video decoder does not exist before GetInputBuffer."); + DCLOGE("The video decoder does not exist before GetInputBuffer."); return DCAMERA_OK; } uint32_t index = availableInputIndexsQueue_.front(); std::shared_ptr sharedMemoryInput = videoDecoder_->GetInputBuffer(index); if (sharedMemoryInput == nullptr) { - DHLOGE("Failed to obtain the input shared memory corresponding to the [%u] index.", index); + DCLOGE("Failed to obtain the input shared memory corresponding to the [%u] index.", index); return DCAMERA_BAD_VALUE; } size_t inputMemoDataSize = static_cast(sharedMemoryInput->GetSize()); errno_t err = memcpy_s(sharedMemoryInput->GetBase(), inputMemoDataSize, buffer->Data(), buffer->Size()); if (err != EOK) { - DHLOGE("memcpy_s buffer failed."); + DCLOGE("memcpy_s buffer failed."); return DCAMERA_MEMORY_OPT_ERROR; } - DHLOGD("Decoder input buffer size %zu, timeStamp %ld us.", buffer->Size(), timeStamp); + DCLOGD("Decoder input buffer size %zu, timeStamp %ld us.", buffer->Size(), timeStamp); Media::AVCodecBufferInfo bufferInfo {timeStamp, static_cast(buffer->Size()), 0}; int32_t ret = videoDecoder_->QueueInputBuffer(index, bufferInfo, Media::AVCODEC_BUFFER_FLAG_NONE); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("queue Input buffer failed."); + DCLOGE("queue Input buffer failed."); return DCAMERA_BAD_OPERATE; } } inputBuffersQueue_.pop(); - DHLOGD("Push inputBuffer sucess. inputBuffersQueue size is %d.", inputBuffersQueue_.size()); + DCLOGD("Push inputBuffer sucess. inputBuffersQueue size is %d.", inputBuffersQueue_.size()); IncreaseWaitDecodeCnt(); } @@ -468,21 +468,21 @@ void DecodeDataProcess::IncreaseWaitDecodeCnt() std::lock_guard lck(mtxHoldCount_); availableInputIndexsQueue_.pop(); waitDecoderOutputCount_++; - DHLOGD("Wait decoder output frames number is %d.", waitDecoderOutputCount_); + DCLOGD("Wait decoder output frames number is %d.", waitDecoderOutputCount_); } void DecodeDataProcess::ReduceWaitDecodeCnt() { std::lock_guard lck(mtxHoldCount_); if (waitDecoderOutputCount_ <= 0) { - DHLOGE("The waitDecoderOutputCount_ = %d.", waitDecoderOutputCount_); + DCLOGE("The waitDecoderOutputCount_ = %d.", waitDecoderOutputCount_); } if (outputTimeStampUs_ == 0) { waitDecoderOutputCount_ -= FIRST_FRAME_INPUT_NUM; } else { waitDecoderOutputCount_--; } - DHLOGD("Wait decoder output frames number is %d.", waitDecoderOutputCount_); + DCLOGD("Wait decoder output frames number is %d.", waitDecoderOutputCount_); } void DecodeDataProcess::OnSurfaceOutputBufferAvailable(const sptr& surface) @@ -494,9 +494,9 @@ void DecodeDataProcess::OnSurfaceOutputBufferAvailable(const sptr& surface) { - DHLOGD("Get decoder output buffer."); + DCLOGD("Get decoder output buffer."); if (surface == nullptr) { - DHLOGE("Get decode consumer surface failed."); + DCLOGE("Get decode consumer surface failed."); return; } Rect damage = {0, 0, 0, 0}; @@ -505,16 +505,16 @@ void DecodeDataProcess::GetDecoderOutputBuffer(const sptr& sur sptr surfaceBuffer = nullptr; GSError ret = surface->AcquireBuffer(surfaceBuffer, acquireFence, timeStamp, damage); if (ret != GSERROR_OK || surfaceBuffer == nullptr) { - DHLOGE("Acquire surface buffer failed!"); + DCLOGE("Acquire surface buffer failed!"); return; } int32_t alignedWidth = surfaceBuffer->GetStride(); if (surfaceBuffer->GetSize() > BUFFER_MAX_SIZE || alignedWidth > ALIGNED_WIDTH_MAX_SIZE) { - DHLOGE("surface buffer size or alignedWidth too long"); + DCLOGE("surface buffer size or alignedWidth too long"); return; } int32_t alignedHeight = alignedHeight_; - DHLOGD("OutputBuffer alignedWidth %d, alignedHeight %d, timeStamp %ld ns.", + DCLOGD("OutputBuffer alignedWidth %d, alignedHeight %d, timeStamp %ld ns.", alignedWidth, alignedHeight, timeStamp); CopyDecodedImage(surfaceBuffer, alignedWidth, alignedHeight); surface->ReleaseBuffer(surfaceBuffer, -1); @@ -526,11 +526,11 @@ void DecodeDataProcess::CopyDecodedImage(const sptr& surBuf, int3 int32_t alignedHeight) { if (!IsCorrectSurfaceBuffer(surBuf, alignedWidth, alignedHeight)) { - DHLOGE("Surface output buffer error."); + DCLOGE("Surface output buffer error."); return; } - DHLOGD("Convert NV12 to I420, format=%d, width=[%d, %d], height=[%d, %d]", sourceConfig_.GetVideoformat(), + DCLOGD("Convert NV12 to I420, format=%d, width=[%d, %d], height=[%d, %d]", sourceConfig_.GetVideoformat(), sourceConfig_.GetWidth(), alignedWidth, sourceConfig_.GetHeight(), alignedHeight); int srcSizeY = alignedWidth * alignedHeight; uint8_t *srcDataY = static_cast(surBuf->GetVirAddr()); @@ -553,7 +553,7 @@ void DecodeDataProcess::CopyDecodedImage(const sptr& surBuf, int3 dstDataV, static_cast(sourceConfig_.GetWidth()) >> MEMORY_RATIO_UV, processedConfig_.GetWidth(), processedConfig_.GetHeight()); if (ret != DCAMERA_OK) { - DHLOGE("Convert NV12 to I420 failed."); + DCLOGE("Convert NV12 to I420 failed."); return; } { @@ -574,7 +574,7 @@ bool DecodeDataProcess::IsCorrectSurfaceBuffer(const sptr& surBuf int32_t alignedHeight) { if (surBuf == nullptr) { - DHLOGE("surface buffer is null!"); + DCLOGE("surface buffer is null!"); return false; } @@ -584,7 +584,7 @@ bool DecodeDataProcess::IsCorrectSurfaceBuffer(const sptr& surBuf YUV_BYTES_PER_PIXEL / Y2UV_RATIO); size_t surfaceBufSize = static_cast(surBuf->GetSize()); if (yuvImageAlignedSize > surfaceBufSize || yuvImageAlignedSize < yuvImageSize) { - DHLOGE("Buffer size error, yuvImageSize %zu, yuvImageAlignedSize %zu, surBufSize %zu.", + DCLOGE("Buffer size error, yuvImageSize %zu, yuvImageAlignedSize %zu, surBufSize %zu.", yuvImageSize, yuvImageAlignedSize, surBuf->GetSize()); return false; } @@ -594,7 +594,7 @@ bool DecodeDataProcess::IsCorrectSurfaceBuffer(const sptr& surBuf void DecodeDataProcess::PostOutputDataBuffers(std::shared_ptr& outputBuffer) { if (eventBusDecode_ == nullptr || outputBuffer == nullptr) { - DHLOGE("eventBusDecode_ or outputBuffer is null."); + DCLOGE("eventBusDecode_ or outputBuffer is null."); return; } std::vector> multiDataBuffers; @@ -603,29 +603,29 @@ void DecodeDataProcess::PostOutputDataBuffers(std::shared_ptr& outpu multiDataBuffers); DCameraCodecEvent dCamCodecEv(*this, transNextNodePacket, VideoCodecAction::NO_ACTION); eventBusDecode_->PostEvent(dCamCodecEv, POSTMODE::POST_ASYNC); - DHLOGD("Send video decoder output asynchronous DCameraCodecEvents success."); + DCLOGD("Send video decoder output asynchronous DCameraCodecEvents success."); } int32_t DecodeDataProcess::DecodeDone(std::vector>& outputBuffers) { - DHLOGD("Decoder Done."); + DCLOGD("Decoder Done."); if (outputBuffers.empty()) { - DHLOGE("The received data buffers is empty."); + DCLOGE("The received data buffers is empty."); return DCAMERA_BAD_VALUE; } if (nextDataProcess_ != nullptr) { - DHLOGD("Send to the next node of the decoder for processing."); + DCLOGD("Send to the next node of the decoder for processing."); int32_t err = nextDataProcess_->ProcessData(outputBuffers); if (err != DCAMERA_OK) { - DHLOGE("Someone node after the decoder processes failed."); + DCLOGE("Someone node after the decoder processes failed."); } return err; } - DHLOGD("The current node is the last node, and Output the processed video buffer"); + DCLOGD("The current node is the last node, and Output the processed video buffer"); std::shared_ptr targetPipelineSource = callbackPipelineSource_.lock(); if (targetPipelineSource == nullptr) { - DHLOGE("callbackPipelineSource_ is nullptr."); + DCLOGE("callbackPipelineSource_ is nullptr."); return DCAMERA_BAD_VALUE; } targetPipelineSource->OnProcessedVideoBuffer(outputBuffers[0]); @@ -634,13 +634,13 @@ int32_t DecodeDataProcess::DecodeDone(std::vector>& void DecodeDataProcess::OnEvent(DCameraCodecEvent& ev) { - DHLOGD("Receiving asynchronous DCameraCodecEvents."); + DCLOGD("Receiving asynchronous DCameraCodecEvents."); std::shared_ptr receivedCodecPacket = ev.GetCodecPacket(); VideoCodecAction action = ev.GetAction(); switch (action) { case VideoCodecAction::NO_ACTION: { if (receivedCodecPacket == nullptr) { - DHLOGE("the received codecPacket of action [%d] is null.", action); + DCLOGE("the received codecPacket of action [%d] is null.", action); OnError(); return; } @@ -649,33 +649,33 @@ void DecodeDataProcess::OnEvent(DCameraCodecEvent& ev) break; } case VideoCodecAction::ACTION_ONCE_AGAIN: - DHLOGD("Try FeedDecoderInputBuffer again."); + DCLOGD("Try FeedDecoderInputBuffer again."); FeedDecoderInputBuffer(); return; case VideoCodecAction::ACTION_GET_DECODER_OUTPUT_BUFFER: if (receivedCodecPacket == nullptr) { - DHLOGE("the received codecPacket of action [%d] is null.", action); + DCLOGE("the received codecPacket of action [%d] is null.", action); OnError(); return; } GetDecoderOutputBuffer(receivedCodecPacket->GetSurface()); break; default: - DHLOGD("The action : %d is not supported.", action); + DCLOGD("The action : %d is not supported.", action); return; } } void DecodeDataProcess::OnError() { - DHLOGD("DecodeDataProcess : OnError."); + DCLOGD("DecodeDataProcess : OnError."); isDecoderProcess_.store(false); if (videoDecoder_ != nullptr) { videoDecoder_->Stop(); } std::shared_ptr targetPipelineSource = callbackPipelineSource_.lock(); if (targetPipelineSource == nullptr) { - DHLOGE("callbackPipelineSource_ is nullptr."); + DCLOGE("callbackPipelineSource_ is nullptr."); return; } targetPipelineSource->OnError(DataProcessErrorType::ERROR_PIPELINE_DECODER); @@ -683,20 +683,20 @@ void DecodeDataProcess::OnError() void DecodeDataProcess::OnInputBufferAvailable(uint32_t index) { - DHLOGD("DecodeDataProcess::OnInputBufferAvailable"); + DCLOGD("DecodeDataProcess::OnInputBufferAvailable"); std::lock_guard lck(mtxHoldCount_); if (availableInputIndexsQueue_.size() > VIDEO_DECODER_QUEUE_MAX) { - DHLOGE("Video decoder available indexs queue overflow."); + DCLOGE("Video decoder available indexs queue overflow."); return; } - DHLOGD("Video decoder available indexs queue push index [%u].", index); + DCLOGD("Video decoder available indexs queue push index [%u].", index); availableInputIndexsQueue_.push(index); } void DecodeDataProcess::OnOutputFormatChanged(const Media::Format &format) { if (decodeOutputFormat_.GetFormatMap().empty()) { - DHLOGE("The first changed video decoder output format is null."); + DCLOGE("The first changed video decoder output format is null."); return; } decodeOutputFormat_ = format; @@ -707,10 +707,10 @@ void DecodeDataProcess::OnOutputBufferAvailable(uint32_t index, const Media::AVC { int64_t finishDecodeT = GetNowTimeStampUs(); if (!isDecoderProcess_.load()) { - DHLOGE("Decoder node occurred error or start release."); + DCLOGE("Decoder node occurred error or start release."); return; } - DHLOGD("Video decode buffer info: presentation TimeUs %lld, size %d, offset %d, flag %d", + DCLOGD("Video decode buffer info: presentation TimeUs %lld, size %d, offset %d, flag %d", info.presentationTimeUs, info.size, info.offset, flag); outputInfo_ = info; { @@ -729,12 +729,12 @@ void DecodeDataProcess::OnOutputBufferAvailable(uint32_t index, const Media::AVC { std::lock_guard outputLock(mtxDecoderState_); if (videoDecoder_ == nullptr) { - DHLOGE("The video decoder does not exist before decoding data."); + DCLOGE("The video decoder does not exist before decoding data."); return; } int32_t errRelease = videoDecoder_->ReleaseOutputBuffer(index, true); if (errRelease != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("The video decoder output decoded data to surface failed, index : [%u].", index); + DCLOGE("The video decoder output decoded data to surface failed, index : [%u].", index); } } } diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp index 2cd79817e0ebd2dd782fa9311a0888e86b481ccf..df8a47e0b69ad2fadee6fa8b3d6e47e3f449f915 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp @@ -15,7 +15,7 @@ #include "decode_data_process.h" #include "distributed_camera_constants.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "graphic_common_c.h" #include "dcamera_hisysevent_adapter.h" @@ -32,7 +32,7 @@ const std::string ENUM_VIDEOFORMAT_STRINGS[] = { DecodeDataProcess::~DecodeDataProcess() { if (isDecoderProcess_.load()) { - DHLOGD("~DecodeDataProcess : ReleaseProcessNode."); + DCLOGD("~DecodeDataProcess : ReleaseProcessNode."); ReleaseProcessNode(); } } @@ -40,13 +40,13 @@ DecodeDataProcess::~DecodeDataProcess() int32_t DecodeDataProcess::InitNode(const VideoConfigParams& sourceConfig, const VideoConfigParams& targetConfig, VideoConfigParams& processedConfig) { - DHLOGD("Init DCamera DecodeNode start."); + DCLOGD("Init DCamera DecodeNode start."); if (!(IsInDecoderRange(sourceConfig) && IsInDecoderRange(targetConfig))) { - DHLOGE("Source config or target config are invalid."); + DCLOGE("Source config or target config are invalid."); return DCAMERA_BAD_VALUE; } if (!IsConvertible(sourceConfig, targetConfig)) { - DHLOGE("The DecodeNode can't convert %d to %d.", sourceConfig.GetVideoCodecType(), + DCLOGE("The DecodeNode can't convert %d to %d.", sourceConfig.GetVideoCodecType(), targetConfig_.GetVideoCodecType()); return DCAMERA_BAD_TYPE; } @@ -54,7 +54,7 @@ int32_t DecodeDataProcess::InitNode(const VideoConfigParams& sourceConfig, const sourceConfig_ = sourceConfig; targetConfig_ = targetConfig; if (sourceConfig_.GetVideoCodecType() == targetConfig_.GetVideoCodecType()) { - DHLOGD("Disable DecodeNode. The target video codec type %d is the same as the source video codec type %d.", + DCLOGD("Disable DecodeNode. The target video codec type %d is the same as the source video codec type %d.", targetConfig_.GetVideoCodecType(), sourceConfig_.GetVideoCodecType()); processedConfig_ = sourceConfig; processedConfig = processedConfig_; @@ -65,7 +65,7 @@ int32_t DecodeDataProcess::InitNode(const VideoConfigParams& sourceConfig, const InitCodecEvent(); int32_t err = InitDecoder(); if (err != DCAMERA_OK) { - DHLOGE("Init video decoder failed."); + DCLOGE("Init video decoder failed."); ReleaseProcessNode(); return err; } @@ -90,27 +90,27 @@ bool DecodeDataProcess::IsConvertible(const VideoConfigParams& sourceConfig, con void DecodeDataProcess::InitCodecEvent() { - DHLOGD("Init DecodeNode eventBus, and add handler for it."); + DCLOGD("Init DecodeNode eventBus, and add handler for it."); eventBusDecode_ = std::make_shared("DeDtProcHandler"); DCameraCodecEvent codecEvent(*this, std::make_shared()); eventBusRegHandleDecode_ = eventBusDecode_->AddHandler(codecEvent.GetType(), *this); - DHLOGD("Add handler for DCamera pipeline eventBus."); + DCLOGD("Add handler for DCamera pipeline eventBus."); eventBusRegHandlePipeline2Decode_ = eventBusPipeline_->AddHandler(codecEvent.GetType(), *this); } int32_t DecodeDataProcess::InitDecoder() { - DHLOGD("Init video decoder."); + DCLOGD("Init video decoder."); int32_t ret = ConfigureVideoDecoder(); if (ret != DCAMERA_OK) { - DHLOGE("Init video decoder metadata format failed."); + DCLOGE("Init video decoder metadata format failed."); return ret; } ret = StartVideoDecoder(); if (ret != DCAMERA_OK) { - DHLOGE("Start Video decoder failed."); + DCLOGE("Start Video decoder failed."); ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_DECODE_ERROR, CreateMsg("start video decoder failed, width: %d, height: %d, format: %s", sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), @@ -124,31 +124,31 @@ int32_t DecodeDataProcess::ConfigureVideoDecoder() { int32_t ret = InitDecoderMetadataFormat(); if (ret != DCAMERA_OK) { - DHLOGE("Init video decoder metadata format failed. Error code %d.", ret); + DCLOGE("Init video decoder metadata format failed. Error code %d.", ret); return ret; } videoDecoder_ = Media::VideoDecoderFactory::CreateByMime(processType_); if (videoDecoder_ == nullptr) { - DHLOGE("Create video decoder failed."); + DCLOGE("Create video decoder failed."); return DCAMERA_INIT_ERR; } decodeVideoCallback_ = std::make_shared(shared_from_this()); ret = videoDecoder_->SetCallback(decodeVideoCallback_); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("Set video decoder callback failed. Error code %d.", ret); + DCLOGE("Set video decoder callback failed. Error code %d.", ret); return DCAMERA_INIT_ERR; } ret = videoDecoder_->Configure(metadataFormat_); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("Set video decoder metadata format failed. Error code %d.", ret); + DCLOGE("Set video decoder metadata format failed. Error code %d.", ret); return DCAMERA_INIT_ERR; } ret = SetDecoderOutputSurface(); if (ret != DCAMERA_OK) { - DHLOGE("Set decoder output surface failed. Error code %d.", ret); + DCLOGE("Set decoder output surface failed. Error code %d.", ret); return ret; } @@ -157,7 +157,7 @@ int32_t DecodeDataProcess::ConfigureVideoDecoder() int32_t DecodeDataProcess::InitDecoderMetadataFormat() { - DHLOGI("Init video decoder metadata format. codecType: %d", sourceConfig_.GetVideoCodecType()); + DCLOGI("Init video decoder metadata format. codecType: %d", sourceConfig_.GetVideoCodecType()); processedConfig_ = sourceConfig_; processedConfig_.SetVideoCodecType(VideoCodecType::NO_CODEC); switch (sourceConfig_.GetVideoCodecType()) { @@ -173,11 +173,11 @@ int32_t DecodeDataProcess::InitDecoderMetadataFormat() processType_ = "video/mp4v-es"; break; default: - DHLOGE("The current codec type does not support decoding."); + DCLOGE("The current codec type does not support decoding."); return DCAMERA_NOT_FOUND; } - DHLOGI("Init video decoder metadata format. videoformat: %d", processedConfig_.GetVideoformat()); + DCLOGI("Init video decoder metadata format. videoformat: %d", processedConfig_.GetVideoformat()); switch (processedConfig_.GetVideoformat()) { case Videoformat::YUVI420: metadataFormat_.PutIntValue("pixel_format", Media::VideoPixelFormat::YUVI420); @@ -196,7 +196,7 @@ int32_t DecodeDataProcess::InitDecoderMetadataFormat() metadataFormat_.PutIntValue("max_input_size", MAX_RGB32_BUFFER_SIZE); break; default: - DHLOGE("The current pixel format does not support encoding."); + DCLOGE("The current pixel format does not support encoding."); return DCAMERA_NOT_FOUND; } @@ -210,15 +210,15 @@ int32_t DecodeDataProcess::InitDecoderMetadataFormat() int32_t DecodeDataProcess::SetDecoderOutputSurface() { - DHLOGD("Set the video decoder output surface."); + DCLOGD("Set the video decoder output surface."); if (videoDecoder_ == nullptr) { - DHLOGE("The video decoder is null."); + DCLOGE("The video decoder is null."); return DCAMERA_BAD_VALUE; } decodeConsumerSurface_ = IConsumerSurface::Create(); if (decodeConsumerSurface_ == nullptr) { - DHLOGE("Create the decode consumer surface failed."); + DCLOGE("Create the decode consumer surface failed."); return DCAMERA_INIT_ERR; } decodeConsumerSurface_->SetDefaultWidthAndHeight(static_cast(sourceConfig_.GetWidth()), @@ -226,25 +226,25 @@ int32_t DecodeDataProcess::SetDecoderOutputSurface() decodeSurfaceListener_ = new DecodeSurfaceListener(decodeConsumerSurface_, shared_from_this()); if (decodeConsumerSurface_->RegisterConsumerListener(decodeSurfaceListener_) != SURFACE_ERROR_OK) { - DHLOGE("Register consumer listener failed."); + DCLOGE("Register consumer listener failed."); return DCAMERA_INIT_ERR; } sptr surfaceProducer = decodeConsumerSurface_->GetProducer(); if (surfaceProducer == nullptr) { - DHLOGE("Get the surface producer of the decode consumer surface failed."); + DCLOGE("Get the surface producer of the decode consumer surface failed."); return DCAMERA_INIT_ERR; } decodeProducerSurface_ = Surface::CreateSurfaceAsProducer(surfaceProducer); if (decodeProducerSurface_ == nullptr) { - DHLOGE("Create the decode producer surface of the decode consumer surface failed."); + DCLOGE("Create the decode producer surface of the decode consumer surface failed."); return DCAMERA_INIT_ERR; } - DHLOGD("Set the producer surface to video decoder output surface."); + DCLOGD("Set the producer surface to video decoder output surface."); int32_t err = videoDecoder_->SetOutputSurface(decodeProducerSurface_); if (err != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("Set decoder output surface failed."); + DCLOGE("Set decoder output surface failed."); return DCAMERA_INIT_ERR; } return DCAMERA_OK; @@ -253,18 +253,18 @@ int32_t DecodeDataProcess::SetDecoderOutputSurface() int32_t DecodeDataProcess::StartVideoDecoder() { if (videoDecoder_ == nullptr) { - DHLOGE("The video decoder does not exist before StartVideoDecoder."); + DCLOGE("The video decoder does not exist before StartVideoDecoder."); return DCAMERA_BAD_VALUE; } int32_t ret = videoDecoder_->Prepare(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("Video decoder prepare failed. Error code %d.", ret); + DCLOGE("Video decoder prepare failed. Error code %d.", ret); return DCAMERA_INIT_ERR; } ret = videoDecoder_->Start(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("Video decoder start failed. Error code %d.", ret); + DCLOGE("Video decoder start failed. Error code %d.", ret); return DCAMERA_INIT_ERR; } return DCAMERA_OK; @@ -273,19 +273,19 @@ int32_t DecodeDataProcess::StartVideoDecoder() int32_t DecodeDataProcess::StopVideoDecoder() { if (videoDecoder_ == nullptr) { - DHLOGE("The video decoder does not exist before StopVideoDecoder."); + DCLOGE("The video decoder does not exist before StopVideoDecoder."); return DCAMERA_BAD_VALUE; } bool isSuccess = true; int32_t ret = videoDecoder_->Flush(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("VideoDecoder flush failed. Error type: %d.", ret); + DCLOGE("VideoDecoder flush failed. Error type: %d.", ret); isSuccess = isSuccess && false; } ret = videoDecoder_->Stop(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("VideoDecoder stop failed. Error type: %d.", ret); + DCLOGE("VideoDecoder stop failed. Error type: %d.", ret); isSuccess = isSuccess && false; } if (!isSuccess) { @@ -296,21 +296,21 @@ int32_t DecodeDataProcess::StopVideoDecoder() void DecodeDataProcess::ReleaseVideoDecoder() { - DHLOGD("Start release videoDecoder."); + DCLOGD("Start release videoDecoder."); std::lock_guard inputLock(mtxDecoderLock_); std::lock_guard outputLock(mtxDecoderState_); if (videoDecoder_ == nullptr) { - DHLOGE("The video decoder does not exist before ReleaseVideoDecoder."); + DCLOGE("The video decoder does not exist before ReleaseVideoDecoder."); decodeVideoCallback_ = nullptr; return; } int32_t ret = StopVideoDecoder(); if (ret != DCAMERA_OK) { - DHLOGE("StopVideoDecoder failed."); + DCLOGE("StopVideoDecoder failed."); } ret = videoDecoder_->Release(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("VideoDecoder release failed. Error type: %d.", ret); + DCLOGE("VideoDecoder release failed. Error type: %d.", ret); } videoDecoder_ = nullptr; decodeVideoCallback_ = nullptr; @@ -320,12 +320,12 @@ void DecodeDataProcess::ReleaseDecoderSurface() { if (decodeConsumerSurface_ == nullptr) { decodeProducerSurface_ = nullptr; - DHLOGE("The decode consumer surface does not exist before UnregisterConsumerListener."); + DCLOGE("The decode consumer surface does not exist before UnregisterConsumerListener."); return; } int32_t ret = decodeConsumerSurface_->UnregisterConsumerListener(); if (ret != SURFACE_ERROR_OK) { - DHLOGE("Unregister consumer listener failed. Error type: %d.", ret); + DCLOGE("Unregister consumer listener failed. Error type: %d.", ret); } decodeConsumerSurface_ = nullptr; decodeProducerSurface_ = nullptr; @@ -344,12 +344,12 @@ void DecodeDataProcess::ReleaseCodecEvent() eventBusRegHandlePipeline2Decode_ = nullptr; eventBusPipeline_ = nullptr; } - DHLOGD("Release DecodeNode eventBusDecode and eventBusPipeline end."); + DCLOGD("Release DecodeNode eventBusDecode and eventBusPipeline end."); } void DecodeDataProcess::ReleaseProcessNode() { - DHLOGD("Start release [%d] node : DecodeNode.", nodeRank_); + DCLOGD("Start release [%d] node : DecodeNode.", nodeRank_); isDecoderProcess_.store(false); ReleaseVideoDecoder(); ReleaseDecoderSurface(); @@ -368,50 +368,50 @@ void DecodeDataProcess::ReleaseProcessNode() nextDataProcess_->ReleaseProcessNode(); nextDataProcess_ = nullptr; } - DHLOGD("Release [%d] node : DecodeNode end.", nodeRank_); + DCLOGD("Release [%d] node : DecodeNode end.", nodeRank_); } int32_t DecodeDataProcess::ProcessData(std::vector>& inputBuffers) { - DHLOGD("Process data in DecodeDataProcess."); + DCLOGD("Process data in DecodeDataProcess."); if (inputBuffers.empty()) { - DHLOGE("The input data buffers is empty."); + DCLOGE("The input data buffers is empty."); return DCAMERA_BAD_VALUE; } if (sourceConfig_.GetVideoCodecType() == processedConfig_.GetVideoCodecType()) { - DHLOGD("The target VideoCodecType : %d is the same as the source VideoCodecType : %d.", + DCLOGD("The target VideoCodecType : %d is the same as the source VideoCodecType : %d.", sourceConfig_.GetVideoCodecType(), processedConfig_.GetVideoCodecType()); return DecodeDone(inputBuffers); } if (videoDecoder_ == nullptr) { - DHLOGE("The video decoder does not exist before decoding data."); + DCLOGE("The video decoder does not exist before decoding data."); return DCAMERA_INIT_ERR; } if (inputBuffersQueue_.size() > VIDEO_DECODER_QUEUE_MAX) { - DHLOGE("video decoder input buffers queue over flow."); + DCLOGE("video decoder input buffers queue over flow."); return DCAMERA_INDEX_OVERFLOW; } if (inputBuffers[0]->Size() > MAX_RGB32_BUFFER_SIZE) { - DHLOGE("DecodeNode input buffer size %zu error.", inputBuffers[0]->Size()); + DCLOGE("DecodeNode input buffer size %zu error.", inputBuffers[0]->Size()); return DCAMERA_MEMORY_OPT_ERROR; } if (!isDecoderProcess_.load()) { - DHLOGE("Decoder node occurred error or start release."); + DCLOGE("Decoder node occurred error or start release."); return DCAMERA_DISABLE_PROCESS; } inputBuffersQueue_.push(inputBuffers[0]); - DHLOGD("Push inputBuf sucess. BufSize %zu, QueueSize %zu.", inputBuffers[0]->Size(), inputBuffersQueue_.size()); + DCLOGD("Push inputBuf sucess. BufSize %zu, QueueSize %zu.", inputBuffers[0]->Size(), inputBuffersQueue_.size()); int32_t err = FeedDecoderInputBuffer(); if (err != DCAMERA_OK) { int32_t sleepTimeUs = 5000; std::this_thread::sleep_for(std::chrono::microseconds(sleepTimeUs)); - DHLOGD("Feed decoder input buffer failed. Try FeedDecoderInputBuffer again."); + DCLOGD("Feed decoder input buffer failed. Try FeedDecoderInputBuffer again."); std::shared_ptr reFeedInputPacket = std::make_shared(); reFeedInputPacket->SetVideoCodecType(sourceConfig_.GetVideoCodecType()); DCameraCodecEvent dCamCodecEv(*this, reFeedInputPacket, VideoCodecAction::ACTION_ONCE_AGAIN); if (eventBusPipeline_ == nullptr) { - DHLOGE("eventBusPipeline_ is nullptr."); + DCLOGE("eventBusPipeline_ is nullptr."); return DCAMERA_BAD_VALUE; } eventBusPipeline_->PostEvent(dCamCodecEv, POSTMODE::POST_ASYNC); @@ -421,11 +421,11 @@ int32_t DecodeDataProcess::ProcessData(std::vector>& int32_t DecodeDataProcess::FeedDecoderInputBuffer() { - DHLOGD("Feed decoder input buffer."); + DCLOGD("Feed decoder input buffer."); while ((!inputBuffersQueue_.empty()) && (isDecoderProcess_.load())) { std::shared_ptr buffer = inputBuffersQueue_.front(); if (buffer == nullptr || availableInputIndexsQueue_.empty()) { - DHLOGE("inputBuffersQueue size %zu, availableInputIndexsQueue size %zu.", + DCLOGE("inputBuffersQueue size %zu, availableInputIndexsQueue size %zu.", inputBuffersQueue_.size(), availableInputIndexsQueue_.size()); return DCAMERA_BAD_VALUE; } @@ -438,33 +438,33 @@ int32_t DecodeDataProcess::FeedDecoderInputBuffer() { std::lock_guard inputLock(mtxDecoderLock_); if (videoDecoder_ == nullptr) { - DHLOGE("The video decoder does not exist before GetInputBuffer."); + DCLOGE("The video decoder does not exist before GetInputBuffer."); return DCAMERA_OK; } uint32_t index = availableInputIndexsQueue_.front(); std::shared_ptr sharedMemoryInput = videoDecoder_->GetInputBuffer(index); if (sharedMemoryInput == nullptr) { - DHLOGE("Failed to obtain the input shared memory corresponding to the [%u] index.", index); + DCLOGE("Failed to obtain the input shared memory corresponding to the [%u] index.", index); return DCAMERA_BAD_VALUE; } size_t inputMemoDataSize = static_cast(sharedMemoryInput->GetSize()); errno_t err = memcpy_s(sharedMemoryInput->GetBase(), inputMemoDataSize, buffer->Data(), buffer->Size()); if (err != EOK) { - DHLOGE("memcpy_s buffer failed."); + DCLOGE("memcpy_s buffer failed."); return DCAMERA_MEMORY_OPT_ERROR; } - DHLOGD("Decoder input buffer size %zu, timeStamp %ld us.", buffer->Size(), timeStamp); + DCLOGD("Decoder input buffer size %zu, timeStamp %ld us.", buffer->Size(), timeStamp); Media::AVCodecBufferInfo bufferInfo {timeStamp, static_cast(buffer->Size()), 0}; int32_t ret = videoDecoder_->QueueInputBuffer(index, bufferInfo, Media::AVCODEC_BUFFER_FLAG_NONE); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("queue Input buffer failed."); + DCLOGE("queue Input buffer failed."); return DCAMERA_BAD_OPERATE; } } inputBuffersQueue_.pop(); - DHLOGD("Push inputBuffer sucess. inputBuffersQueue size is %d.", inputBuffersQueue_.size()); + DCLOGD("Push inputBuffer sucess. inputBuffersQueue size is %d.", inputBuffersQueue_.size()); IncreaseWaitDecodeCnt(); } @@ -489,21 +489,21 @@ void DecodeDataProcess::IncreaseWaitDecodeCnt() std::lock_guard lck(mtxHoldCount_); availableInputIndexsQueue_.pop(); waitDecoderOutputCount_++; - DHLOGD("Wait decoder output frames number is %d.", waitDecoderOutputCount_); + DCLOGD("Wait decoder output frames number is %d.", waitDecoderOutputCount_); } void DecodeDataProcess::ReduceWaitDecodeCnt() { std::lock_guard lck(mtxHoldCount_); if (waitDecoderOutputCount_ <= 0) { - DHLOGE("The waitDecoderOutputCount_ = %d.", waitDecoderOutputCount_); + DCLOGE("The waitDecoderOutputCount_ = %d.", waitDecoderOutputCount_); } if (outputTimeStampUs_ == 0) { waitDecoderOutputCount_ -= FIRST_FRAME_INPUT_NUM; } else { waitDecoderOutputCount_--; } - DHLOGD("Wait decoder output frames number is %d.", waitDecoderOutputCount_); + DCLOGD("Wait decoder output frames number is %d.", waitDecoderOutputCount_); } void DecodeDataProcess::OnSurfaceOutputBufferAvailable(const sptr& surface) @@ -515,9 +515,9 @@ void DecodeDataProcess::OnSurfaceOutputBufferAvailable(const sptr& surface) { - DHLOGD("Get decoder output buffer."); + DCLOGD("Get decoder output buffer."); if (surface == nullptr) { - DHLOGE("Get decode consumer surface failed."); + DCLOGE("Get decode consumer surface failed."); return; } Rect damage = {0, 0, 0, 0}; @@ -526,16 +526,16 @@ void DecodeDataProcess::GetDecoderOutputBuffer(const sptr& sur sptr surfaceBuffer = nullptr; GSError ret = surface->AcquireBuffer(surfaceBuffer, acquireFence, timeStamp, damage); if (ret != GSERROR_OK || surfaceBuffer == nullptr) { - DHLOGE("Acquire surface buffer failed!"); + DCLOGE("Acquire surface buffer failed!"); return; } int32_t alignedWidth = surfaceBuffer->GetStride(); if (surfaceBuffer->GetSize() > BUFFER_MAX_SIZE || alignedWidth > ALIGNED_WIDTH_MAX_SIZE) { - DHLOGE("surface buffer size or alignedWidth too long"); + DCLOGE("surface buffer size or alignedWidth too long"); return; } int32_t alignedHeight = alignedHeight_; - DHLOGD("OutputBuffer alignedWidth %d, alignedHeight %d, timeStamp %ld ns.", + DCLOGD("OutputBuffer alignedWidth %d, alignedHeight %d, timeStamp %ld ns.", alignedWidth, alignedHeight, timeStamp); CopyDecodedImage(surfaceBuffer, alignedWidth, alignedHeight); surface->ReleaseBuffer(surfaceBuffer, -1); @@ -547,7 +547,7 @@ void DecodeDataProcess::CopyDecodedImage(const sptr& surBuf, int3 int32_t alignedHeight) { if (!IsCorrectSurfaceBuffer(surBuf, alignedWidth, alignedHeight)) { - DHLOGE("Surface output buffer error."); + DCLOGE("Surface output buffer error."); return; } @@ -557,7 +557,7 @@ void DecodeDataProcess::CopyDecodedImage(const sptr& surBuf, int3 uint8_t *addr = static_cast(surBuf->GetVirAddr()); errno_t err = memcpy_s(bufferOutput->Data(), bufferOutput->Size(), addr, rgbImageSize); if (err != EOK) { - DHLOGE("memcpy_s surface buffer failed."); + DCLOGE("memcpy_s surface buffer failed."); return; } { @@ -578,7 +578,7 @@ bool DecodeDataProcess::IsCorrectSurfaceBuffer(const sptr& surBuf int32_t alignedHeight) { if (surBuf == nullptr) { - DHLOGE("surface buffer is null!"); + DCLOGE("surface buffer is null!"); return false; } @@ -586,7 +586,7 @@ bool DecodeDataProcess::IsCorrectSurfaceBuffer(const sptr& surBuf RGB32_MEMORY_COEFFICIENT); size_t surfaceBufSize = static_cast(surBuf->GetSize()); if (rgbImageSize > surfaceBufSize) { - DHLOGE("Buffer size error, rgbImageSize %d, surBufSize %d.", rgbImageSize, surBuf->GetSize()); + DCLOGE("Buffer size error, rgbImageSize %d, surBufSize %d.", rgbImageSize, surBuf->GetSize()); return false; } return true; @@ -595,7 +595,7 @@ bool DecodeDataProcess::IsCorrectSurfaceBuffer(const sptr& surBuf void DecodeDataProcess::PostOutputDataBuffers(std::shared_ptr& outputBuffer) { if (eventBusDecode_ == nullptr || outputBuffer == nullptr) { - DHLOGE("eventBusDecode_ or outputBuffer is null."); + DCLOGE("eventBusDecode_ or outputBuffer is null."); return; } std::vector> multiDataBuffers; @@ -604,29 +604,29 @@ void DecodeDataProcess::PostOutputDataBuffers(std::shared_ptr& outpu multiDataBuffers); DCameraCodecEvent dCamCodecEv(*this, transNextNodePacket, VideoCodecAction::NO_ACTION); eventBusDecode_->PostEvent(dCamCodecEv, POSTMODE::POST_ASYNC); - DHLOGD("Send video decoder output asynchronous DCameraCodecEvents success."); + DCLOGD("Send video decoder output asynchronous DCameraCodecEvents success."); } int32_t DecodeDataProcess::DecodeDone(std::vector>& outputBuffers) { - DHLOGD("Decoder Done."); + DCLOGD("Decoder Done."); if (outputBuffers.empty()) { - DHLOGE("The received data buffers is empty."); + DCLOGE("The received data buffers is empty."); return DCAMERA_BAD_VALUE; } if (nextDataProcess_ != nullptr) { - DHLOGD("Send to the next node of the decoder for processing."); + DCLOGD("Send to the next node of the decoder for processing."); int32_t err = nextDataProcess_->ProcessData(outputBuffers); if (err != DCAMERA_OK) { - DHLOGE("Someone node after the decoder processes failed."); + DCLOGE("Someone node after the decoder processes failed."); } return err; } - DHLOGD("The current node is the last node, and Output the processed video buffer"); + DCLOGD("The current node is the last node, and Output the processed video buffer"); std::shared_ptr targetPipelineSource = callbackPipelineSource_.lock(); if (targetPipelineSource == nullptr) { - DHLOGE("callbackPipelineSource_ is nullptr."); + DCLOGE("callbackPipelineSource_ is nullptr."); return DCAMERA_BAD_VALUE; } targetPipelineSource->OnProcessedVideoBuffer(outputBuffers[0]); @@ -635,13 +635,13 @@ int32_t DecodeDataProcess::DecodeDone(std::vector>& void DecodeDataProcess::OnEvent(DCameraCodecEvent& ev) { - DHLOGD("Receiving asynchronous DCameraCodecEvents."); + DCLOGD("Receiving asynchronous DCameraCodecEvents."); std::shared_ptr receivedCodecPacket = ev.GetCodecPacket(); VideoCodecAction action = ev.GetAction(); switch (action) { case VideoCodecAction::NO_ACTION: { if (receivedCodecPacket == nullptr) { - DHLOGE("the received codecPacket of action [%d] is null.", action); + DCLOGE("the received codecPacket of action [%d] is null.", action); OnError(); return; } @@ -650,33 +650,33 @@ void DecodeDataProcess::OnEvent(DCameraCodecEvent& ev) break; } case VideoCodecAction::ACTION_ONCE_AGAIN: - DHLOGD("Try FeedDecoderInputBuffer again."); + DCLOGD("Try FeedDecoderInputBuffer again."); FeedDecoderInputBuffer(); return; case VideoCodecAction::ACTION_GET_DECODER_OUTPUT_BUFFER: if (receivedCodecPacket == nullptr) { - DHLOGE("the received codecPacket of action [%d] is null.", action); + DCLOGE("the received codecPacket of action [%d] is null.", action); OnError(); return; } GetDecoderOutputBuffer(receivedCodecPacket->GetSurface()); break; default: - DHLOGD("The action : %d is not supported.", action); + DCLOGD("The action : %d is not supported.", action); return; } } void DecodeDataProcess::OnError() { - DHLOGD("DecodeDataProcess : OnError."); + DCLOGD("DecodeDataProcess : OnError."); isDecoderProcess_.store(false); if (videoDecoder_ != nullptr) { videoDecoder_->Stop(); } std::shared_ptr targetPipelineSource = callbackPipelineSource_.lock(); if (targetPipelineSource == nullptr) { - DHLOGE("callbackPipelineSource_ is nullptr."); + DCLOGE("callbackPipelineSource_ is nullptr."); return; } targetPipelineSource->OnError(DataProcessErrorType::ERROR_PIPELINE_DECODER); @@ -684,20 +684,20 @@ void DecodeDataProcess::OnError() void DecodeDataProcess::OnInputBufferAvailable(uint32_t index) { - DHLOGD("DecodeDataProcess::OnInputBufferAvailable"); + DCLOGD("DecodeDataProcess::OnInputBufferAvailable"); std::lock_guard lck(mtxHoldCount_); if (availableInputIndexsQueue_.size() > VIDEO_DECODER_QUEUE_MAX) { - DHLOGE("Video decoder available indexs queue overflow."); + DCLOGE("Video decoder available indexs queue overflow."); return; } - DHLOGD("Video decoder available indexs queue push index [%u].", index); + DCLOGD("Video decoder available indexs queue push index [%u].", index); availableInputIndexsQueue_.push(index); } void DecodeDataProcess::OnOutputFormatChanged(const Media::Format &format) { if (decodeOutputFormat_.GetFormatMap().empty()) { - DHLOGE("The first changed video decoder output format is null."); + DCLOGE("The first changed video decoder output format is null."); return; } decodeOutputFormat_ = format; @@ -708,10 +708,10 @@ void DecodeDataProcess::OnOutputBufferAvailable(uint32_t index, const Media::AVC { int64_t finishDecodeT = GetNowTimeStampUs(); if (!isDecoderProcess_.load()) { - DHLOGE("Decoder node occurred error or start release."); + DCLOGE("Decoder node occurred error or start release."); return; } - DHLOGD("Video decode buffer info: presentation TimeUs %lld, size %d, offset %d, flag %d", + DCLOGD("Video decode buffer info: presentation TimeUs %lld, size %d, offset %d, flag %d", info.presentationTimeUs, info.size, info.offset, flag); outputInfo_ = info; { @@ -730,12 +730,12 @@ void DecodeDataProcess::OnOutputBufferAvailable(uint32_t index, const Media::AVC { std::lock_guard outputLock(mtxDecoderState_); if (videoDecoder_ == nullptr) { - DHLOGE("The video decoder does not exist before decoding data."); + DCLOGE("The video decoder does not exist before decoding data."); return; } int32_t errRelease = videoDecoder_->ReleaseOutputBuffer(index, true); if (errRelease != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("The video decoder output decoded data to surface failed, index : [%u].", index); + DCLOGE("The video decoder output decoded data to surface failed, index : [%u].", index); } } } diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_surface_listener.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_surface_listener.cpp index ab1b6eefd522227095021b2decf0aaa62ad58b27..80b036c04881be40819d7092057279874ddc60a7 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_surface_listener.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_surface_listener.cpp @@ -15,22 +15,22 @@ #include "decode_surface_listener.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { DecodeSurfaceListener::~DecodeSurfaceListener() { - DHLOGD("DecodeSurfaceListener : ~DecodeSurfaceListener."); + DCLOGD("DecodeSurfaceListener : ~DecodeSurfaceListener."); surface_ = nullptr; } void DecodeSurfaceListener::OnBufferAvailable() { - DHLOGD("DecodeSurfaceListener : OnBufferAvailable."); + DCLOGD("DecodeSurfaceListener : OnBufferAvailable."); std::shared_ptr targetDecoderNode = decodeVideoNode_.lock(); if (targetDecoderNode == nullptr) { - DHLOGE("decodeVideoNode_ is nullptr."); + DCLOGE("decodeVideoNode_ is nullptr."); return; } targetDecoderNode->OnSurfaceOutputBufferAvailable(surface_); @@ -55,7 +55,7 @@ std::shared_ptr DecodeSurfaceListener::GetDecodeVideoNode() c { std::shared_ptr targetDecoderNode = decodeVideoNode_.lock(); if (targetDecoderNode == nullptr) { - DHLOGE("decodeVideoNode_ is nullptr."); + DCLOGE("decodeVideoNode_ is nullptr."); } return targetDecoderNode; } diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_video_callback.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_video_callback.cpp index fd950b27ef0384f2b9729cc65348ca30576914f3..8a4f19dfd381ee02aac606aca637bf36a25add88 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_video_callback.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_video_callback.cpp @@ -15,16 +15,16 @@ #include "decode_video_callback.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { void DecodeVideoCallback::OnError(Media::AVCodecErrorType errorType, int32_t errorCode) { - DHLOGE("DecodeVideoCallback : OnError. Error type: %d. Error code: %d ", errorType, errorCode); + DCLOGE("DecodeVideoCallback : OnError. Error type: %d. Error code: %d ", errorType, errorCode); std::shared_ptr targetDecoderNode = decodeVideoNode_.lock(); if (targetDecoderNode == nullptr) { - DHLOGE("decodeVideoNode_ is nullptr."); + DCLOGE("decodeVideoNode_ is nullptr."); return; } targetDecoderNode->OnError(); @@ -32,10 +32,10 @@ void DecodeVideoCallback::OnError(Media::AVCodecErrorType errorType, int32_t err void DecodeVideoCallback::OnInputBufferAvailable(uint32_t index) { - DHLOGD("DecodeVideoCallback : OnInputBufferAvailable."); + DCLOGD("DecodeVideoCallback : OnInputBufferAvailable."); std::shared_ptr targetDecoderNode = decodeVideoNode_.lock(); if (targetDecoderNode == nullptr) { - DHLOGE("decodeVideoNode_ is nullptr."); + DCLOGE("decodeVideoNode_ is nullptr."); return; } targetDecoderNode->OnInputBufferAvailable(index); @@ -43,10 +43,10 @@ void DecodeVideoCallback::OnInputBufferAvailable(uint32_t index) void DecodeVideoCallback::OnOutputFormatChanged(const Media::Format &format) { - DHLOGD("DecodeVideoCallback : OnOutputFormatChanged."); + DCLOGD("DecodeVideoCallback : OnOutputFormatChanged."); std::shared_ptr targetDecoderNode = decodeVideoNode_.lock(); if (targetDecoderNode == nullptr) { - DHLOGE("decodeVideoNode_ is nullptr."); + DCLOGE("decodeVideoNode_ is nullptr."); return; } targetDecoderNode->OnOutputFormatChanged(format); @@ -55,10 +55,10 @@ void DecodeVideoCallback::OnOutputFormatChanged(const Media::Format &format) void DecodeVideoCallback::OnOutputBufferAvailable(uint32_t index, Media::AVCodecBufferInfo info, Media::AVCodecBufferFlag flag) { - DHLOGD("DecodeVideoCallback : OnOutputBufferAvailable. Only relaese buffer when using surface output."); + DCLOGD("DecodeVideoCallback : OnOutputBufferAvailable. Only relaese buffer when using surface output."); std::shared_ptr targetDecoderNode = decodeVideoNode_.lock(); if (targetDecoderNode == nullptr) { - DHLOGE("decodeVideoNode_ is nullptr."); + DCLOGE("decodeVideoNode_ is nullptr."); return; } targetDecoderNode->OnOutputBufferAvailable(index, info, flag); diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp index cf2d7f1df3a9f2b22f92549f790ff540185e1400..ce844e2abcd70f53dbb870c8954d7c990b6e0436 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp @@ -16,14 +16,14 @@ #include #include "dcamera_hisysevent_adapter.h" #include "dcamera_utils_tools.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "encode_data_process.h" #include "encode_video_callback.h" #include "graphic_common_c.h" #include -#ifndef DH_LOG_TAG -#define DH_LOG_TAG "DCDP_NODE_ENCODEC" +#ifndef DC_LOG_TAG +#define DC_LOG_TAG "DCDP_NODE_ENCODEC" #endif namespace OHOS { @@ -47,7 +47,7 @@ const std::string ENUM_VIDEOFORMAT_STRINGS[] = { EncodeDataProcess::~EncodeDataProcess() { if (isEncoderProcess_.load()) { - DHLOGD("~EncodeDataProcess : ReleaseProcessNode."); + DCLOGD("~EncodeDataProcess : ReleaseProcessNode."); ReleaseProcessNode(); } } @@ -55,13 +55,13 @@ EncodeDataProcess::~EncodeDataProcess() int32_t EncodeDataProcess::InitNode(const VideoConfigParams& sourceConfig, const VideoConfigParams& targetConfig, VideoConfigParams& processedConfig) { - DHLOGD("Init DCamera EncodeNode start."); + DCLOGD("Init DCamera EncodeNode start."); if (!(IsInEncoderRange(sourceConfig) && IsInEncoderRange(targetConfig))) { - DHLOGE("Source config or target config are invalid."); + DCLOGE("Source config or target config are invalid."); return DCAMERA_BAD_VALUE; } if (!IsConvertible(sourceConfig, targetConfig)) { - DHLOGE("The EncodeNode cannot convert source VideoCodecType %d to target VideoCodecType %d.", + DCLOGE("The EncodeNode cannot convert source VideoCodecType %d to target VideoCodecType %d.", sourceConfig.GetVideoCodecType(), targetConfig.GetVideoCodecType()); return DCAMERA_BAD_TYPE; } @@ -69,7 +69,7 @@ int32_t EncodeDataProcess::InitNode(const VideoConfigParams& sourceConfig, const sourceConfig_ = sourceConfig; targetConfig_ = targetConfig; if (sourceConfig_.GetVideoCodecType() == targetConfig_.GetVideoCodecType()) { - DHLOGD("Disable EncodeNode. The target VideoCodecType %d is the same as the source VideoCodecType %d.", + DCLOGD("Disable EncodeNode. The target VideoCodecType %d is the same as the source VideoCodecType %d.", sourceConfig_.GetVideoCodecType(), targetConfig_.GetVideoCodecType()); processedConfig_ = sourceConfig; processedConfig = processedConfig_; @@ -79,7 +79,7 @@ int32_t EncodeDataProcess::InitNode(const VideoConfigParams& sourceConfig, const int32_t err = InitEncoder(); if (err != DCAMERA_OK) { - DHLOGE("Init video encoder failed."); + DCLOGE("Init video encoder failed."); ReleaseProcessNode(); return err; } @@ -103,16 +103,16 @@ bool EncodeDataProcess::IsConvertible(const VideoConfigParams& sourceConfig, con int32_t EncodeDataProcess::InitEncoder() { - DHLOGD("Init video encoder."); + DCLOGD("Init video encoder."); int32_t ret = ConfigureVideoEncoder(); if (ret != DCAMERA_OK) { - DHLOGE("Init video encoder metadata format failed. Error code %d.", ret); + DCLOGE("Init video encoder metadata format failed. Error code %d.", ret); return ret; } ret = StartVideoEncoder(); if (ret != DCAMERA_OK) { - DHLOGE("Start Video encoder failed."); + DCLOGE("Start Video encoder failed."); ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_ENCODE_ERROR, CreateMsg("start video encoder failed, width: %d, height: %d, format: %s", sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), @@ -127,36 +127,36 @@ int32_t EncodeDataProcess::ConfigureVideoEncoder() { int32_t ret = InitEncoderMetadataFormat(); if (ret != DCAMERA_OK) { - DHLOGE("Init video encoder metadata format failed. Error code %d.", ret); + DCLOGE("Init video encoder metadata format failed. Error code %d.", ret); return ret; } ret = InitEncoderBitrateFormat(); if (ret != DCAMERA_OK) { - DHLOGE("Init video encoder bitrate format failed. Error code %d.", ret); + DCLOGE("Init video encoder bitrate format failed. Error code %d.", ret); return ret; } videoEncoder_ = Media::VideoEncoderFactory::CreateByMime(processType_); if (videoEncoder_ == nullptr) { - DHLOGE("Create video encoder failed."); + DCLOGE("Create video encoder failed."); return DCAMERA_INIT_ERR; } encodeVideoCallback_ = std::make_shared(shared_from_this()); ret = videoEncoder_->SetCallback(encodeVideoCallback_); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("Set video encoder callback failed. Error code %d.", ret); + DCLOGE("Set video encoder callback failed. Error code %d.", ret); return DCAMERA_INIT_ERR; } ret = videoEncoder_->Configure(metadataFormat_); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("Set video encoder metadata format failed. Error code %d.", ret); + DCLOGE("Set video encoder metadata format failed. Error code %d.", ret); return DCAMERA_INIT_ERR; } encodeProducerSurface_ = videoEncoder_->CreateInputSurface(); if (encodeProducerSurface_ == nullptr) { - DHLOGE("Get video encoder producer surface failed."); + DCLOGE("Get video encoder producer surface failed."); return DCAMERA_INIT_ERR; } @@ -183,7 +183,7 @@ int32_t EncodeDataProcess::InitEncoderMetadataFormat() processedConfig_.SetVideoCodecType(VideoCodecType::CODEC_MPEG4_ES); break; default: - DHLOGE("The current codec type does not support encoding."); + DCLOGE("The current codec type does not support encoding."); return DCAMERA_NOT_FOUND; } switch (sourceConfig_.GetVideoformat()) { @@ -204,7 +204,7 @@ int32_t EncodeDataProcess::InitEncoderMetadataFormat() metadataFormat_.PutLongValue("max_input_size", NORM_RGB32_BUFFER_SIZE); break; default: - DHLOGE("The current pixel format does not support encoding."); + DCLOGE("The current pixel format does not support encoding."); return DCAMERA_NOT_FOUND; } metadataFormat_.PutStringValue("codec_mime", processType_); @@ -216,16 +216,16 @@ int32_t EncodeDataProcess::InitEncoderMetadataFormat() int32_t EncodeDataProcess::InitEncoderBitrateFormat() { - DHLOGD("Init video encoder bitrate format."); + DCLOGD("Init video encoder bitrate format."); if (!(IsInEncoderRange(sourceConfig_) && IsInEncoderRange(targetConfig_))) { - DHLOGE("Source config or target config are invalid."); + DCLOGE("Source config or target config are invalid."); return DCAMERA_BAD_VALUE; } metadataFormat_.PutIntValue("i_frame_interval", IDR_FRAME_INTERVAL_MS); metadataFormat_.PutIntValue("video_encode_bitrate_mode", Media::VideoEncodeBitrateMode::VBR); if (ENCODER_BITRATE_TABLE.empty()) { - DHLOGD("ENCODER_BITRATE_TABLE is null, use the default bitrate of the encoder."); + DCLOGD("ENCODER_BITRATE_TABLE is null, use the default bitrate of the encoder."); return DCAMERA_OK; } int64_t pixelformat = static_cast(sourceConfig_.GetWidth() * sourceConfig_.GetHeight()); @@ -242,7 +242,7 @@ int32_t EncodeDataProcess::InitEncoderBitrateFormat() matchedBitrate = it->second; } } - DHLOGD("Source config: width : %d, height : %d, matched bitrate %d.", sourceConfig_.GetWidth(), + DCLOGD("Source config: width : %d, height : %d, matched bitrate %d.", sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), matchedBitrate); metadataFormat_.PutIntValue("bitrate", matchedBitrate); return DCAMERA_OK; @@ -251,18 +251,18 @@ int32_t EncodeDataProcess::InitEncoderBitrateFormat() int32_t EncodeDataProcess::StartVideoEncoder() { if (videoEncoder_ == nullptr) { - DHLOGE("The video encoder does not exist before StopVideoEncoder."); + DCLOGE("The video encoder does not exist before StopVideoEncoder."); return DCAMERA_BAD_VALUE; } int32_t ret = videoEncoder_->Prepare(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("Video encoder prepare failed. Error code %d.", ret); + DCLOGE("Video encoder prepare failed. Error code %d.", ret); return DCAMERA_INIT_ERR; } ret = videoEncoder_->Start(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("Video encoder start failed. Error code %d.", ret); + DCLOGE("Video encoder start failed. Error code %d.", ret); return DCAMERA_INIT_ERR; } return DCAMERA_OK; @@ -271,19 +271,19 @@ int32_t EncodeDataProcess::StartVideoEncoder() int32_t EncodeDataProcess::StopVideoEncoder() { if (videoEncoder_ == nullptr) { - DHLOGE("The video encoder does not exist before StopVideoEncoder."); + DCLOGE("The video encoder does not exist before StopVideoEncoder."); return DCAMERA_BAD_VALUE; } bool isSuccess = true; int32_t ret = videoEncoder_->Flush(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("VideoEncoder flush failed. Error type: %d.", ret); + DCLOGE("VideoEncoder flush failed. Error type: %d.", ret); isSuccess = isSuccess && false; } ret = videoEncoder_->Stop(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("VideoEncoder stop failed. Error type: %d.", ret); + DCLOGE("VideoEncoder stop failed. Error type: %d.", ret); isSuccess = isSuccess && false; } @@ -296,30 +296,30 @@ int32_t EncodeDataProcess::StopVideoEncoder() void EncodeDataProcess::ReleaseVideoEncoder() { std::lock_guard lck(mtxEncoderState_); - DHLOGD("Start release videoEncoder."); + DCLOGD("Start release videoEncoder."); if (videoEncoder_ == nullptr) { - DHLOGE("The video encoder does not exist before ReleaseVideoEncoder."); + DCLOGE("The video encoder does not exist before ReleaseVideoEncoder."); encodeProducerSurface_ = nullptr; encodeVideoCallback_ = nullptr; return; } int32_t ret = StopVideoEncoder(); if (ret != DCAMERA_OK) { - DHLOGE("StopVideoEncoder failed."); + DCLOGE("StopVideoEncoder failed."); } ret = videoEncoder_->Release(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("VideoEncoder release failed. Error type: %d.", ret); + DCLOGE("VideoEncoder release failed. Error type: %d.", ret); } encodeProducerSurface_ = nullptr; videoEncoder_ = nullptr; encodeVideoCallback_ = nullptr; - DHLOGD("Start release videoEncoder success."); + DCLOGD("Start release videoEncoder success."); } void EncodeDataProcess::ReleaseProcessNode() { - DHLOGD("Start release [%d] node : EncodeNode.", nodeRank_); + DCLOGD("Start release [%d] node : EncodeNode.", nodeRank_); isEncoderProcess_.store(false); ReleaseVideoEncoder(); @@ -332,36 +332,36 @@ void EncodeDataProcess::ReleaseProcessNode() nextDataProcess_->ReleaseProcessNode(); nextDataProcess_ = nullptr; } - DHLOGD("Release [%d] node : EncodeNode end.", nodeRank_); + DCLOGD("Release [%d] node : EncodeNode end.", nodeRank_); } int32_t EncodeDataProcess::ProcessData(std::vector>& inputBuffers) { - DHLOGD("Process data in EncodeDataProcess."); + DCLOGD("Process data in EncodeDataProcess."); if (inputBuffers.empty()) { - DHLOGE("The input data buffers is empty."); + DCLOGE("The input data buffers is empty."); return DCAMERA_BAD_VALUE; } if (sourceConfig_.GetVideoCodecType() == processedConfig_.GetVideoCodecType()) { - DHLOGD("The target VideoCodecType : %d is the same as the source VideoCodecType : %d.", + DCLOGD("The target VideoCodecType : %d is the same as the source VideoCodecType : %d.", sourceConfig_.GetVideoCodecType(), processedConfig_.GetVideoCodecType()); return EncodeDone(inputBuffers); } if (videoEncoder_ == nullptr) { - DHLOGE("The video encoder does not exist before encoding data."); + DCLOGE("The video encoder does not exist before encoding data."); return DCAMERA_INIT_ERR; } if (inputBuffers[0]->Size() > NORM_YUV420_BUFFER_SIZE) { - DHLOGE("EncodeNode input buffer size %d error.", inputBuffers[0]->Size()); + DCLOGE("EncodeNode input buffer size %d error.", inputBuffers[0]->Size()); return DCAMERA_MEMORY_OPT_ERROR; } if (!isEncoderProcess_.load()) { - DHLOGE("EncodeNode occurred error or start release."); + DCLOGE("EncodeNode occurred error or start release."); return DCAMERA_DISABLE_PROCESS; } int32_t err = FeedEncoderInputBuffer(inputBuffers[0]); if (err != DCAMERA_OK) { - DHLOGE("Feed encoder input Buffer failed."); + DCLOGE("Feed encoder input Buffer failed."); return err; } return DCAMERA_OK; @@ -370,38 +370,38 @@ int32_t EncodeDataProcess::ProcessData(std::vector>& int32_t EncodeDataProcess::FeedEncoderInputBuffer(std::shared_ptr& inputBuffer) { std::lock_guard lck(mtxEncoderState_); - DHLOGD("Feed encoder input buffer, buffer size %d.", inputBuffer->Size()); + DCLOGD("Feed encoder input buffer, buffer size %d.", inputBuffer->Size()); if (encodeProducerSurface_ == nullptr) { - DHLOGE("Get encoder input producer surface failed."); + DCLOGE("Get encoder input producer surface failed."); return DCAMERA_INIT_ERR; } sptr surfacebuffer = GetEncoderInputSurfaceBuffer(); if (surfacebuffer == nullptr) { - DHLOGE("Get encoder input producer surface buffer failed."); + DCLOGE("Get encoder input producer surface buffer failed."); return DCAMERA_BAD_OPERATE; } uint8_t *addr = static_cast(surfacebuffer->GetVirAddr()); if (addr == nullptr) { - DHLOGE("SurfaceBuffer address is nullptr"); + DCLOGE("SurfaceBuffer address is nullptr"); encodeProducerSurface_->CancelBuffer(surfacebuffer); return DCAMERA_BAD_OPERATE; } size_t size = static_cast(surfacebuffer->GetSize()); errno_t err = memcpy_s(addr, size, inputBuffer->Data(), inputBuffer->Size()); if (err != EOK) { - DHLOGE("memcpy_s encoder input producer surface buffer failed, surBufSize %z.", size); + DCLOGE("memcpy_s encoder input producer surface buffer failed, surBufSize %z.", size); return DCAMERA_MEMORY_OPT_ERROR; } inputTimeStampUs_ = GetEncoderTimeStamp(); - DHLOGD("Encoder input buffer size %d, timeStamp %lld.", inputBuffer->Size(), (long long)inputTimeStampUs_); + DCLOGD("Encoder input buffer size %d, timeStamp %lld.", inputBuffer->Size(), (long long)inputTimeStampUs_); surfacebuffer->GetExtraData()->ExtraSet("timeStamp", inputTimeStampUs_); BufferFlushConfig flushConfig = { {0, 0, sourceConfig_.GetWidth(), sourceConfig_.GetHeight()}, 0}; SurfaceError ret = encodeProducerSurface_->FlushBuffer(surfacebuffer, -1, flushConfig); if (ret != SURFACE_ERROR_OK) { - DHLOGE("Flush encoder input producer surface buffer failed."); + DCLOGE("Flush encoder input producer surface buffer failed."); return DCAMERA_BAD_OPERATE; } return DCAMERA_OK; @@ -429,14 +429,14 @@ sptr EncodeDataProcess::GetEncoderInputSurfaceBuffer() requestConfig.format = PixelFormat::PIXEL_FMT_RGBA_8888; break; default: - DHLOGE("The current pixel format does not support encoding."); + DCLOGE("The current pixel format does not support encoding."); return nullptr; } sptr surfacebuffer = nullptr; int32_t flushFence = -1; GSError err = encodeProducerSurface_->RequestBuffer(surfacebuffer, flushFence, requestConfig); if (err != GSERROR_OK || surfacebuffer == nullptr) { - DHLOGE("Request encoder input producer surface buffer failed, error code: %d.", err); + DCLOGE("Request encoder input producer surface buffer failed, error code: %d.", err); } return surfacebuffer; } @@ -459,45 +459,45 @@ void EncodeDataProcess::IncreaseWaitEncodeCnt() } else { waitEncoderOutputCount_++; } - DHLOGD("Wait encoder output frames number is %d.", waitEncoderOutputCount_); + DCLOGD("Wait encoder output frames number is %d.", waitEncoderOutputCount_); } void EncodeDataProcess::ReduceWaitEncodeCnt() { std::lock_guard lck(mtxHoldCount_); if (waitEncoderOutputCount_ <= 0) { - DHLOGE("The waitEncoderOutputCount_ = %d.", waitEncoderOutputCount_); + DCLOGE("The waitEncoderOutputCount_ = %d.", waitEncoderOutputCount_); } waitEncoderOutputCount_--; - DHLOGD("Wait encoder output frames number is %d.", waitEncoderOutputCount_); + DCLOGD("Wait encoder output frames number is %d.", waitEncoderOutputCount_); } int32_t EncodeDataProcess::GetEncoderOutputBuffer(uint32_t index, Media::AVCodecBufferInfo info, Media::AVCodecBufferFlag flag) { - DHLOGD("Get encoder output buffer."); + DCLOGD("Get encoder output buffer."); if (videoEncoder_ == nullptr) { - DHLOGE("The video encoder does not exist before output encoded data."); + DCLOGE("The video encoder does not exist before output encoded data."); return DCAMERA_BAD_VALUE; } std::shared_ptr sharedMemoryOutput = videoEncoder_->GetOutputBuffer(index); if (sharedMemoryOutput == nullptr) { - DHLOGE("Failed to get the output shared memory, index : %u", index); + DCLOGE("Failed to get the output shared memory, index : %u", index); return DCAMERA_BAD_OPERATE; } if (info.size <= 0 || info.size > DATABUFF_MAX_SIZE) { - DHLOGE("AVCodecBufferInfo error, buffer size : %d", info.size); + DCLOGE("AVCodecBufferInfo error, buffer size : %d", info.size); return DCAMERA_BAD_VALUE; } size_t outputMemoDataSize = static_cast(info.size); - DHLOGD("Encoder output buffer size : %d", outputMemoDataSize); + DCLOGD("Encoder output buffer size : %d", outputMemoDataSize); std::shared_ptr bufferOutput = std::make_shared(outputMemoDataSize); errno_t err = memcpy_s(bufferOutput->Data(), bufferOutput->Size(), sharedMemoryOutput->GetBase(), outputMemoDataSize); if (err != EOK) { - DHLOGE("memcpy_s buffer failed."); + DCLOGE("memcpy_s buffer failed."); return DCAMERA_MEMORY_OPT_ERROR; } int64_t timeStamp = info.presentationTimeUs; @@ -520,24 +520,24 @@ int32_t EncodeDataProcess::GetEncoderOutputBuffer(uint32_t index, Media::AVCodec int32_t EncodeDataProcess::EncodeDone(std::vector>& outputBuffers) { - DHLOGD("Encoder done."); + DCLOGD("Encoder done."); if (outputBuffers.empty()) { - DHLOGE("The received data buffers is empty."); + DCLOGE("The received data buffers is empty."); return DCAMERA_BAD_VALUE; } if (nextDataProcess_ != nullptr) { - DHLOGD("Send to the next node of the encoder for processing."); + DCLOGD("Send to the next node of the encoder for processing."); int32_t err = nextDataProcess_->ProcessData(outputBuffers); if (err != DCAMERA_OK) { - DHLOGE("Someone node after the encoder processes failed."); + DCLOGE("Someone node after the encoder processes failed."); } return err; } - DHLOGD("The current node is the last node, and Output the processed video buffer"); + DCLOGD("The current node is the last node, and Output the processed video buffer"); std::shared_ptr targetPipelineSink = callbackPipelineSink_.lock(); if (targetPipelineSink == nullptr) { - DHLOGE("callbackPipelineSink_ is nullptr."); + DCLOGE("callbackPipelineSink_ is nullptr."); return DCAMERA_BAD_VALUE; } targetPipelineSink->OnProcessedVideoBuffer(outputBuffers[0]); @@ -546,7 +546,7 @@ int32_t EncodeDataProcess::EncodeDone(std::vector>& void EncodeDataProcess::OnError() { - DHLOGD("EncodeDataProcess : OnError."); + DCLOGD("EncodeDataProcess : OnError."); isEncoderProcess_.store(false); if (videoEncoder_ != nullptr) { videoEncoder_->Flush(); @@ -554,7 +554,7 @@ void EncodeDataProcess::OnError() } std::shared_ptr targetPipelineSink = callbackPipelineSink_.lock(); if (targetPipelineSink == nullptr) { - DHLOGE("callbackPipelineSink_ is nullptr."); + DCLOGE("callbackPipelineSink_ is nullptr."); return; } targetPipelineSink->OnError(DataProcessErrorType::ERROR_PIPELINE_ENCODER); @@ -562,13 +562,13 @@ void EncodeDataProcess::OnError() void EncodeDataProcess::OnInputBufferAvailable(uint32_t index) { - DHLOGD("The available input buffer index : %u. No operation when using surface input.", index); + DCLOGD("The available input buffer index : %u. No operation when using surface input.", index); } void EncodeDataProcess::OnOutputFormatChanged(const Media::Format &format) { if (encodeOutputFormat_.GetFormatMap().empty()) { - DHLOGE("The first changed video encoder output format is null."); + DCLOGE("The first changed video encoder output format is null."); return; } encodeOutputFormat_ = format; @@ -578,23 +578,23 @@ void EncodeDataProcess::OnOutputBufferAvailable(uint32_t index, Media::AVCodecBu Media::AVCodecBufferFlag flag) { if (!isEncoderProcess_.load()) { - DHLOGE("EncodeNode occurred error or start release."); + DCLOGE("EncodeNode occurred error or start release."); return; } - DHLOGD("Video encode buffer info: presentation TimeUs %lld, size %d, offset %d, flag %d", + DCLOGD("Video encode buffer info: presentation TimeUs %lld, size %d, offset %d, flag %d", info.presentationTimeUs, info.size, info.offset, flag); int32_t err = GetEncoderOutputBuffer(index, info, flag); if (err != DCAMERA_OK) { - DHLOGE("Get encode output Buffer failed."); + DCLOGE("Get encode output Buffer failed."); return; } if (videoEncoder_ == nullptr) { - DHLOGE("The video encoder does not exist before release output buffer index."); + DCLOGE("The video encoder does not exist before release output buffer index."); return; } int32_t errRelease = videoEncoder_->ReleaseOutputBuffer(index); if (errRelease != Media::MediaServiceErrCode::MSERR_OK) { - DHLOGE("The video encoder release output buffer failed, index : [%u].", index); + DCLOGE("The video encoder release output buffer failed, index : [%u].", index); } } @@ -614,7 +614,7 @@ int32_t EncodeDataProcess::GetProperty(const std::string& propertyName, Property return DCAMERA_OK; } if (encodeProducerSurface_ == nullptr) { - DHLOGD("EncodeDataProcess::GetProperty: encode dataProcess get property fail, encode surface is nullptr."); + DCLOGD("EncodeDataProcess::GetProperty: encode dataProcess get property fail, encode surface is nullptr."); return DCAMERA_BAD_VALUE; } return propertyCarrier.CarrySurfaceProperty(encodeProducerSurface_); diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_video_callback.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_video_callback.cpp index 462a7e7bec35984e8c9aa6fd8738e5ef3ee358a1..cb488c7903ff4598c8695397aa2e25317f16e8f7 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_video_callback.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_video_callback.cpp @@ -14,16 +14,16 @@ */ #include "encode_video_callback.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" namespace OHOS { namespace DistributedHardware { void EncodeVideoCallback::OnError(Media::AVCodecErrorType errorType, int32_t errorCode) { - DHLOGD("EncodeVideoCallback : OnError. Error type: %d. Error code: %d ", errorType, errorCode); + DCLOGD("EncodeVideoCallback : OnError. Error type: %d. Error code: %d ", errorType, errorCode); std::shared_ptr targetEncoderNode = encodeVideoNode_.lock(); if (targetEncoderNode == nullptr) { - DHLOGE("encodeVideoNode_ is nullptr."); + DCLOGE("encodeVideoNode_ is nullptr."); return; } targetEncoderNode->OnError(); @@ -31,10 +31,10 @@ void EncodeVideoCallback::OnError(Media::AVCodecErrorType errorType, int32_t err void EncodeVideoCallback::OnInputBufferAvailable(uint32_t index) { - DHLOGD("EncodeVideoCallback : OnInputBufferAvailable. No operation when using surface input."); + DCLOGD("EncodeVideoCallback : OnInputBufferAvailable. No operation when using surface input."); std::shared_ptr targetEncoderNode = encodeVideoNode_.lock(); if (targetEncoderNode == nullptr) { - DHLOGE("encodeVideoNode_ is nullptr."); + DCLOGE("encodeVideoNode_ is nullptr."); return; } targetEncoderNode->OnInputBufferAvailable(index); @@ -42,10 +42,10 @@ void EncodeVideoCallback::OnInputBufferAvailable(uint32_t index) void EncodeVideoCallback::OnOutputFormatChanged(const Media::Format &format) { - DHLOGD("EncodeVideoCallback : OnOutputFormatChanged."); + DCLOGD("EncodeVideoCallback : OnOutputFormatChanged."); std::shared_ptr targetEncoderNode = encodeVideoNode_.lock(); if (targetEncoderNode == nullptr) { - DHLOGE("encodeVideoNode_ is nullptr."); + DCLOGE("encodeVideoNode_ is nullptr."); return; } targetEncoderNode->OnOutputFormatChanged(format); @@ -54,10 +54,10 @@ void EncodeVideoCallback::OnOutputFormatChanged(const Media::Format &format) void EncodeVideoCallback::OnOutputBufferAvailable(uint32_t index, Media::AVCodecBufferInfo info, Media::AVCodecBufferFlag flag) { - DHLOGD("EncodeVideoCallback : OnOutputBufferAvailable."); + DCLOGD("EncodeVideoCallback : OnOutputBufferAvailable."); std::shared_ptr targetEncoderNode = encodeVideoNode_.lock(); if (targetEncoderNode == nullptr) { - DHLOGE("encodeVideoNode_ is nullptr."); + DCLOGE("encodeVideoNode_ is nullptr."); return; } targetEncoderNode->OnOutputBufferAvailable(index, info, flag); diff --git a/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process.cpp b/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process.cpp index ed87884500ea348e8038ed0c06dcdffd39b6d1b2..f7b17af64a9be3e7d7fef74e2ec5c4d83aa6766e 100644 --- a/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process.cpp +++ b/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process.cpp @@ -19,7 +19,7 @@ #include "dcamera_utils_tools.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "dcamera_frame_info.h" namespace OHOS { @@ -27,7 +27,7 @@ namespace DistributedHardware { ScaleConvertProcess::~ScaleConvertProcess() { if (isScaleConvert_.load()) { - DHLOGI("~ScaleConvertProcess : ReleaseProcessNode"); + DCLOGI("~ScaleConvertProcess : ReleaseProcessNode"); ReleaseProcessNode(); } } @@ -35,7 +35,7 @@ ScaleConvertProcess::~ScaleConvertProcess() int32_t ScaleConvertProcess::InitNode(const VideoConfigParams& sourceConfig, const VideoConfigParams& targetConfig, VideoConfigParams& processedConfig) { - DHLOGI("ScaleConvertProcess : InitNode."); + DCLOGI("ScaleConvertProcess : InitNode."); sourceConfig_ = sourceConfig; targetConfig_ = targetConfig; processedConfig_ = sourceConfig; @@ -44,7 +44,7 @@ int32_t ScaleConvertProcess::InitNode(const VideoConfigParams& sourceConfig, con processedConfig = processedConfig_; if (!IsConvertible(sourceConfig, targetConfig)) { - DHLOGI("sourceConfig: Videoformat %d Width %d, Height %d is the same as the targetConfig: " + DCLOGI("sourceConfig: Videoformat %d Width %d, Height %d is the same as the targetConfig: " "Videoformat %d Width %d, Height %d.", sourceConfig.GetVideoformat(), sourceConfig.GetWidth(), sourceConfig.GetHeight(), targetConfig.GetVideoformat(), targetConfig.GetWidth(), targetConfig.GetHeight()); @@ -63,33 +63,33 @@ bool ScaleConvertProcess::IsConvertible(const VideoConfigParams& sourceConfig, c void ScaleConvertProcess::ReleaseProcessNode() { - DHLOGI("Start release [%d] node : ScaleConvertNode.", nodeRank_); + DCLOGI("Start release [%d] node : ScaleConvertNode.", nodeRank_); isScaleConvert_.store(false); if (nextDataProcess_ != nullptr) { nextDataProcess_->ReleaseProcessNode(); nextDataProcess_ = nullptr; } - DHLOGI("Release [%d] node : ScaleConvertNode end.", nodeRank_); + DCLOGI("Release [%d] node : ScaleConvertNode end.", nodeRank_); } int ScaleConvertProcess::ProcessData(std::vector>& inputBuffers) { int64_t startScaleTime = GetNowTimeStampUs(); - DHLOGD("Process data in ScaleConvertProcess."); + DCLOGD("Process data in ScaleConvertProcess."); if (!isScaleConvert_.load()) { - DHLOGE("Scale Convert node occurred error or start release."); + DCLOGE("Scale Convert node occurred error or start release."); return DCAMERA_DISABLE_PROCESS; } if (inputBuffers.empty() || inputBuffers[0] == nullptr) { - DHLOGE("The input data buffers is empty."); + DCLOGE("The input data buffers is empty."); return DCAMERA_BAD_VALUE; } inputBuffers[0]->frameInfo_.timePonit.startScale = startScaleTime; if (!IsConvertible(sourceConfig_, processedConfig_)) { - DHLOGD("The target resolution: %dx%d format: %d is the same as the source resolution: %dx%d format: %d", + DCLOGD("The target resolution: %dx%d format: %d is the same as the source resolution: %dx%d format: %d", processedConfig_.GetWidth(), processedConfig_.GetHeight(), processedConfig_.GetVideoformat(), sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), sourceConfig_.GetVideoformat()); return ConvertDone(inputBuffers); @@ -97,7 +97,7 @@ int ScaleConvertProcess::ProcessData(std::vector>& i ImageUnitInfo srcImgInfo {Videoformat::YUVI420, 0, 0, 0, 0, 0, 0, nullptr}; if ((GetImageUnitInfo(srcImgInfo, inputBuffers[0]) != DCAMERA_OK) || !CheckScaleProcessInputInfo(srcImgInfo)) { - DHLOGE("ScaleConvertProcess : srcImgInfo error."); + DCLOGE("ScaleConvertProcess : srcImgInfo error."); return DCAMERA_BAD_VALUE; } @@ -108,7 +108,7 @@ int ScaleConvertProcess::ProcessData(std::vector>& i processedConfig_.GetHeight(), processedConfig_.GetWidth(), processedConfig_.GetHeight(), processedConfig_.GetWidth() * processedConfig_.GetHeight(), dstBuf->Size(), dstBuf }; if (ScaleConvert(srcImgInfo, dstImgInfo) != DCAMERA_OK) { - DHLOGE("ScaleConvertProcess : Scale convert failed."); + DCLOGE("ScaleConvertProcess : Scale convert failed."); return DCAMERA_BAD_OPERATE; } @@ -138,7 +138,7 @@ void ScaleConvertProcess::CalculateBuffSize(size_t& dstBuffSize) int32_t ScaleConvertProcess::GetImageUnitInfo(ImageUnitInfo& imgInfo, const std::shared_ptr& imgBuf) { if (imgBuf == nullptr) { - DHLOGE("GetImageUnitInfo failed, imgBuf is nullptr."); + DCLOGE("GetImageUnitInfo failed, imgBuf is nullptr."); return DCAMERA_BAD_VALUE; } @@ -146,13 +146,13 @@ int32_t ScaleConvertProcess::GetImageUnitInfo(ImageUnitInfo& imgInfo, const std: int32_t colorFormat = 0; findErr = findErr && imgBuf->FindInt32("Videoformat", colorFormat); if (!findErr) { - DHLOGE("GetImageUnitInfo failed, Videoformat is null."); + DCLOGE("GetImageUnitInfo failed, Videoformat is null."); return DCAMERA_NOT_FOUND; } if (colorFormat != static_cast(Videoformat::YUVI420) && colorFormat != static_cast(Videoformat::NV12) && colorFormat != static_cast(Videoformat::NV21)) { - DHLOGE("GetImageUnitInfo failed, colorFormat %d are not supported.", colorFormat); + DCLOGE("GetImageUnitInfo failed, colorFormat %d are not supported.", colorFormat); return DCAMERA_NOT_FOUND; } imgInfo.colorFormat = static_cast(colorFormat); @@ -161,7 +161,7 @@ int32_t ScaleConvertProcess::GetImageUnitInfo(ImageUnitInfo& imgInfo, const std: findErr = findErr && imgBuf->FindInt32("alignedWidth", imgInfo.alignedWidth); findErr = findErr && imgBuf->FindInt32("alignedHeight", imgInfo.alignedHeight); if (!findErr) { - DHLOGE("GetImageUnitInfo failed, width %d, height %d, alignedWidth %d, alignedHeight %d.", + DCLOGE("GetImageUnitInfo failed, width %d, height %d, alignedWidth %d, alignedHeight %d.", imgInfo.width, imgInfo.height, imgInfo.alignedWidth, imgInfo.alignedHeight); return DCAMERA_NOT_FOUND; } @@ -170,7 +170,7 @@ int32_t ScaleConvertProcess::GetImageUnitInfo(ImageUnitInfo& imgInfo, const std: imgInfo.imgSize = imgBuf->Size(); imgInfo.imgData = imgBuf; - DHLOGD("ScaleConvertProcess imgBuf info : Videoformat %d, alignedWidth %d, alignedHeight %d, width %d, height %d" + + DCLOGD("ScaleConvertProcess imgBuf info : Videoformat %d, alignedWidth %d, alignedHeight %d, width %d, height %d" + ", chromaOffset %d, imgSize %d.", imgInfo.colorFormat, imgInfo.alignedWidth, imgInfo.alignedHeight, imgInfo.width, imgInfo.height, imgInfo.chromaOffset, imgInfo.imgSize); return DCAMERA_OK; @@ -187,19 +187,19 @@ bool ScaleConvertProcess::CheckScaleProcessInputInfo(const ImageUnitInfo& srcImg bool ScaleConvertProcess::CheckScaleConvertInfo(const ImageUnitInfo& srcImgInfo, const ImageUnitInfo& dstImgInfo) { if (srcImgInfo.imgData == nullptr || dstImgInfo.imgData == nullptr) { - DHLOGE("The imgData of srcImgInfo or the imgData of dstImgInfo are null!"); + DCLOGE("The imgData of srcImgInfo or the imgData of dstImgInfo are null!"); return false; } if (!IsCorrectImageUnitInfo(srcImgInfo)) { - DHLOGE("srcImginfo fail: width %d, height %d, alignedWidth %d, alignedHeight %d, chromaOffset %lld, " + + DCLOGE("srcImginfo fail: width %d, height %d, alignedWidth %d, alignedHeight %d, chromaOffset %lld, " + "imgSize %lld.", srcImgInfo.width, srcImgInfo.height, srcImgInfo.alignedWidth, srcImgInfo.alignedHeight, srcImgInfo.chromaOffset, srcImgInfo.imgSize); return false; } if (!IsCorrectImageUnitInfo(dstImgInfo)) { - DHLOGE("dstImginfo fail: width %d, height %d, alignedWidth %d, alignedHeight %d, chromaOffset %lld, " + + DCLOGE("dstImginfo fail: width %d, height %d, alignedWidth %d, alignedHeight %d, chromaOffset %lld, " + "imgSize %lld.", dstImgInfo.width, dstImgInfo.height, dstImgInfo.alignedWidth, dstImgInfo.alignedHeight, dstImgInfo.chromaOffset, dstImgInfo.imgSize); return false; @@ -207,7 +207,7 @@ bool ScaleConvertProcess::CheckScaleConvertInfo(const ImageUnitInfo& srcImgInfo, if ((dstImgInfo.width == srcImgInfo.alignedWidth) && (dstImgInfo.height == srcImgInfo.alignedHeight) && (dstImgInfo.colorFormat == srcImgInfo.colorFormat)) { - DHLOGE("Comparison ImgInfo fail: dstwidth %d, dstheight %d, dstColorFormat %d, " + DCLOGE("Comparison ImgInfo fail: dstwidth %d, dstheight %d, dstColorFormat %d, " "srcAlignedWidth %d, srcAlignedHeight %d, srcColorFormat %d.", dstImgInfo.width, dstImgInfo.height, dstImgInfo.colorFormat, srcImgInfo.alignedWidth, srcImgInfo.alignedHeight, srcImgInfo.colorFormat); @@ -228,9 +228,9 @@ bool ScaleConvertProcess::IsCorrectImageUnitInfo(const ImageUnitInfo& imgInfo) int32_t ScaleConvertProcess::ScaleConvert(ImageUnitInfo& srcImgInfo, ImageUnitInfo& dstImgInfo) { - DHLOGD("Scale convert start."); + DCLOGD("Scale convert start."); if (!CheckScaleConvertInfo(srcImgInfo, dstImgInfo)) { - DHLOGE("CheckScaleConvertInfo failed."); + DCLOGE("CheckScaleConvertInfo failed."); return DCAMERA_BAD_VALUE; } @@ -238,7 +238,7 @@ int32_t ScaleConvertProcess::ScaleConvert(ImageUnitInfo& srcImgInfo, ImageUnitIn std::make_shared(dstImgInfo.width * dstImgInfo.height * YUV_BYTES_PER_PIXEL / Y2UV_RATIO); int32_t ret = ConvertResolution(srcImgInfo, dstImgInfo, dstBuf); if (ret != DCAMERA_OK) { - DHLOGE("Convert I420 scale failed."); + DCLOGE("Convert I420 scale failed."); return ret; } @@ -248,11 +248,11 @@ int32_t ScaleConvertProcess::ScaleConvert(ImageUnitInfo& srcImgInfo, ImageUnitIn ret = ConvertFormatToRGBA(srcImgInfo, dstImgInfo, dstBuf); } if (ret != DCAMERA_OK) { - DHLOGE("Convert I420 to format: %d failed.", processedConfig_.GetVideoformat()); + DCLOGE("Convert I420 to format: %d failed.", processedConfig_.GetVideoformat()); return ret; } - DHLOGD("Scale convert end."); + DCLOGD("Scale convert end."); return DCAMERA_OK; } @@ -261,11 +261,11 @@ int32_t ScaleConvertProcess::ConvertResolution(ImageUnitInfo& srcImgInfo, ImageU { if ((srcImgInfo.width == dstImgInfo.width) && (srcImgInfo.height == dstImgInfo.height)) { dstBuf = srcImgInfo.imgData; - DHLOGD("Convert I420 Scale: srcImgInfo is the same as dstImgInfo"); + DCLOGD("Convert I420 Scale: srcImgInfo is the same as dstImgInfo"); return DCAMERA_OK; } - DHLOGD("Convert I420 Scale: format=%d, width=[%d, %d], height=[%d, %d]", srcImgInfo.colorFormat, + DCLOGD("Convert I420 Scale: format=%d, width=[%d, %d], height=[%d, %d]", srcImgInfo.colorFormat, srcImgInfo.width, srcImgInfo.alignedWidth, srcImgInfo.height, srcImgInfo.alignedHeight); int srcSizeY = srcImgInfo.width * srcImgInfo.height; int srcSizeUV = (static_cast(srcImgInfo.width) >> MEMORY_RATIO_UV) * @@ -292,7 +292,7 @@ int32_t ScaleConvertProcess::ConvertResolution(ImageUnitInfo& srcImgInfo, ImageU dstImgInfo.width, dstImgInfo.height, libyuv::FilterMode::kFilterNone); if (ret != DCAMERA_OK) { - DHLOGE("Convert I420 scale failed."); + DCLOGE("Convert I420 scale failed."); return DCAMERA_BAD_VALUE; } @@ -303,7 +303,7 @@ int32_t ScaleConvertProcess::ConvertResolution(ImageUnitInfo& srcImgInfo, ImageU srcImgInfo.chromaOffset = static_cast(srcImgInfo.alignedWidth * srcImgInfo.alignedHeight); srcImgInfo.imgSize = dstBuf->Size(); - DHLOGD("Convert I420 scale success."); + DCLOGD("Convert I420 scale success."); return DCAMERA_OK; } @@ -311,11 +311,11 @@ int32_t ScaleConvertProcess::ConvertFormatToNV21(ImageUnitInfo& srcImgInfo, Imag std::shared_ptr& dstBuf) { if (srcImgInfo.colorFormat == dstImgInfo.colorFormat) { - DHLOGD("Convert format to NV21 srcImgInfo format is the same as dstImgInfo format"); + DCLOGD("Convert format to NV21 srcImgInfo format is the same as dstImgInfo format"); return DCAMERA_OK; } - DHLOGD("Convert I420 to NV21: format=%d, width=[%d, %d], height=[%d, %d]", srcImgInfo.colorFormat, + DCLOGD("Convert I420 to NV21: format=%d, width=[%d, %d], height=[%d, %d]", srcImgInfo.colorFormat, srcImgInfo.width, srcImgInfo.alignedWidth, srcImgInfo.height, srcImgInfo.alignedHeight); int srcSizeY = srcImgInfo.width * srcImgInfo.height; int srcSizeUV = (static_cast(srcImgInfo.width) >> MEMORY_RATIO_UV) * @@ -336,11 +336,11 @@ int32_t ScaleConvertProcess::ConvertFormatToNV21(ImageUnitInfo& srcImgInfo, Imag dstDataUV, dstImgInfo.width, dstImgInfo.width, dstImgInfo.height); if (ret != DCAMERA_OK) { - DHLOGE("Convert I420 to NV21 failed."); + DCLOGE("Convert I420 to NV21 failed."); return DCAMERA_BAD_VALUE; } - DHLOGD("Convert I420 to NV21 success."); + DCLOGD("Convert I420 to NV21 success."); return DCAMERA_OK; } @@ -348,11 +348,11 @@ int32_t ScaleConvertProcess::ConvertFormatToRGBA(ImageUnitInfo& srcImgInfo, Imag std::shared_ptr& dstBuf) { if (srcImgInfo.colorFormat == dstImgInfo.colorFormat) { - DHLOGD("Convert format to RGBA srcImgInfo format is the same as dstImgInfo format"); + DCLOGD("Convert format to RGBA srcImgInfo format is the same as dstImgInfo format"); return DCAMERA_OK; } - DHLOGI("Convert I420 to RGBA: format=%d, width=[%d, %d], height=[%d, %d]", srcImgInfo.colorFormat, + DCLOGI("Convert I420 to RGBA: format=%d, width=[%d, %d], height=[%d, %d]", srcImgInfo.colorFormat, srcImgInfo.width, srcImgInfo.alignedWidth, srcImgInfo.height, srcImgInfo.alignedHeight); int srcSizeY = srcImgInfo.width * srcImgInfo.height; int srcSizeUV = (static_cast(srcImgInfo.width) >> MEMORY_RATIO_UV) * @@ -369,37 +369,37 @@ int32_t ScaleConvertProcess::ConvertFormatToRGBA(ImageUnitInfo& srcImgInfo, Imag dstDataRGBA, dstImgInfo.width * RGB32_MEMORY_COEFFICIENT, dstImgInfo.width, dstImgInfo.height); if (ret != DCAMERA_OK) { - DHLOGE("Convert I420 to RGBA failed."); + DCLOGE("Convert I420 to RGBA failed."); return DCAMERA_BAD_VALUE; } - DHLOGD("Convert I420 to RGBA success."); + DCLOGD("Convert I420 to RGBA success."); return DCAMERA_OK; } int32_t ScaleConvertProcess::ConvertDone(std::vector>& outputBuffers) { int64_t finishScaleTime = GetNowTimeStampUs(); - DHLOGD("ScaleConvertProcess : Convert Done."); + DCLOGD("ScaleConvertProcess : Convert Done."); if (outputBuffers.empty()) { - DHLOGE("The received data buffer is empty."); + DCLOGE("The received data buffer is empty."); return DCAMERA_BAD_VALUE; } outputBuffers[0]->frameInfo_.timePonit.finishScale = finishScaleTime; if (nextDataProcess_ != nullptr) { - DHLOGD("Send to the next node of the scale convert for processing."); + DCLOGD("Send to the next node of the scale convert for processing."); int32_t err = nextDataProcess_->ProcessData(outputBuffers); if (err != DCAMERA_OK) { - DHLOGE("Some node after the scale convert processes failed."); + DCLOGE("Some node after the scale convert processes failed."); } return err; } - DHLOGD("The current node is the last noed, and output the processed video buffer."); + DCLOGD("The current node is the last noed, and output the processed video buffer."); std::shared_ptr targetPipelineSource = callbackPipelineSource_.lock(); if (targetPipelineSource == nullptr) { - DHLOGE("callbackPipelineSource_ is nullptr."); + DCLOGE("callbackPipelineSource_ is nullptr."); return DCAMERA_BAD_VALUE; } targetPipelineSource->OnProcessedVideoBuffer(outputBuffers[0]); diff --git a/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process_common.cpp b/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process_common.cpp index f8a1e0fb618ecc7adcdd2e701702c5b7032e5bb3..f0d4012f434f16e2bdb340ae720301abc5cc9a4b 100644 --- a/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process_common.cpp +++ b/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process_common.cpp @@ -16,7 +16,7 @@ #include "dcamera_utils_tools.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "scale_convert_process.h" #include "dcamera_frame_info.h" @@ -25,7 +25,7 @@ namespace DistributedHardware { ScaleConvertProcess::~ScaleConvertProcess() { if (isScaleConvert_.load()) { - DHLOGI("~ScaleConvertProcess : ReleaseProcessNode"); + DCLOGI("~ScaleConvertProcess : ReleaseProcessNode"); ReleaseProcessNode(); } } @@ -33,7 +33,7 @@ ScaleConvertProcess::~ScaleConvertProcess() int32_t ScaleConvertProcess::InitNode(const VideoConfigParams& sourceConfig, const VideoConfigParams& targetConfig, VideoConfigParams& processedConfig) { - DHLOGI("ScaleConvertProcess : InitNode."); + DCLOGI("ScaleConvertProcess : InitNode."); sourceConfig_ = sourceConfig; targetConfig_ = targetConfig; processedConfig_ = sourceConfig; @@ -42,7 +42,7 @@ int32_t ScaleConvertProcess::InitNode(const VideoConfigParams& sourceConfig, con processedConfig = processedConfig_; if (!IsConvertible(sourceConfig, targetConfig)) { - DHLOGI("sourceConfig: Videoformat %d Width %d, Height %d, targetConfig: Videoformat %d Width %d, Height %d.", + DCLOGI("sourceConfig: Videoformat %d Width %d, Height %d, targetConfig: Videoformat %d Width %d, Height %d.", sourceConfig.GetVideoformat(), sourceConfig.GetWidth(), sourceConfig.GetHeight(), targetConfig.GetVideoformat(), targetConfig.GetWidth(), targetConfig.GetHeight()); isScaleConvert_.store(true); @@ -52,14 +52,14 @@ int32_t ScaleConvertProcess::InitNode(const VideoConfigParams& sourceConfig, con int32_t ret = av_image_alloc(srcData_, srcLineSize_, sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), GetAVPixelFormat(sourceConfig_.GetVideoformat()), SOURCE_ALIGN); if (ret < DCAMERA_OK) { - DHLOGE("Could not allocate source image."); + DCLOGE("Could not allocate source image."); return DCAMERA_BAD_VALUE; } dstBuffSize_ = av_image_alloc(dstData_, dstLineSize_, processedConfig_.GetWidth(), processedConfig_.GetHeight(), GetAVPixelFormat(processedConfig_.GetVideoformat()), TARGET_ALIGN); if (dstBuffSize_ < DCAMERA_OK) { - DHLOGE("Could not allocate destination image."); + DCLOGE("Could not allocate destination image."); return DCAMERA_BAD_VALUE; } @@ -67,7 +67,7 @@ int32_t ScaleConvertProcess::InitNode(const VideoConfigParams& sourceConfig, con GetAVPixelFormat(sourceConfig_.GetVideoformat()), processedConfig_.GetWidth(), processedConfig_.GetHeight(), GetAVPixelFormat(processedConfig_.GetVideoformat()), SWS_FAST_BILINEAR, nullptr, nullptr, nullptr); if (swsContext_ == nullptr) { - DHLOGE("Create SwsContext failed."); + DCLOGE("Create SwsContext failed."); return DCAMERA_BAD_VALUE; } @@ -84,7 +84,7 @@ bool ScaleConvertProcess::IsConvertible(const VideoConfigParams& sourceConfig, c void ScaleConvertProcess::ReleaseProcessNode() { - DHLOGI("Start release [%d] node : ScaleConvertNode.", nodeRank_); + DCLOGI("Start release [%d] node : ScaleConvertNode.", nodeRank_); isScaleConvert_.store(false); { @@ -101,26 +101,26 @@ void ScaleConvertProcess::ReleaseProcessNode() nextDataProcess_->ReleaseProcessNode(); nextDataProcess_ = nullptr; } - DHLOGI("Release [%d] node : ScaleConvertNode end.", nodeRank_); + DCLOGI("Release [%d] node : ScaleConvertNode end.", nodeRank_); } int ScaleConvertProcess::ProcessData(std::vector>& inputBuffers) { int64_t startScaleTime = GetNowTimeStampUs(); - DHLOGD("Process data in ScaleConvertProcess."); + DCLOGD("Process data in ScaleConvertProcess."); if (!isScaleConvert_.load()) { - DHLOGE("Scale Convert node occurred error or start release."); + DCLOGE("Scale Convert node occurred error or start release."); return DCAMERA_DISABLE_PROCESS; } if (inputBuffers.empty() || inputBuffers[0] == nullptr) { - DHLOGE("The input data buffers is empty."); + DCLOGE("The input data buffers is empty."); return DCAMERA_BAD_VALUE; } inputBuffers[0]->frameInfo_.timePonit.startScale = startScaleTime; if (!IsConvertible(sourceConfig_, processedConfig_)) { - DHLOGD("The target resolution: %dx%d format: %d is the same as the source resolution: %dx%d format: %d", + DCLOGD("The target resolution: %dx%d format: %d is the same as the source resolution: %dx%d format: %d", processedConfig_.GetWidth(), processedConfig_.GetHeight(), processedConfig_.GetVideoformat(), sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), sourceConfig_.GetVideoformat()); return ConvertDone(inputBuffers); @@ -128,7 +128,7 @@ int ScaleConvertProcess::ProcessData(std::vector>& i ImageUnitInfo srcImgInfo {Videoformat::YUVI420, 0, 0, 0, 0, 0, 0, nullptr}; if ((GetImageUnitInfo(srcImgInfo, inputBuffers[0]) != DCAMERA_OK) || !CheckScaleProcessInputInfo(srcImgInfo)) { - DHLOGE("ScaleConvertProcess : srcImgInfo error."); + DCLOGE("ScaleConvertProcess : srcImgInfo error."); return DCAMERA_BAD_VALUE; } @@ -137,7 +137,7 @@ int ScaleConvertProcess::ProcessData(std::vector>& i processedConfig_.GetHeight(), processedConfig_.GetWidth(), processedConfig_.GetHeight(), processedConfig_.GetWidth() * processedConfig_.GetHeight(), dstBuf->Size(), dstBuf }; if (ScaleConvert(srcImgInfo, dstImgInfo) != DCAMERA_OK) { - DHLOGE("ScaleConvertProcess : Scale convert failed."); + DCLOGE("ScaleConvertProcess : Scale convert failed."); return DCAMERA_BAD_OPERATE; } @@ -156,7 +156,7 @@ int ScaleConvertProcess::ProcessData(std::vector>& i int32_t ScaleConvertProcess::GetImageUnitInfo(ImageUnitInfo& imgInfo, const std::shared_ptr& imgBuf) { if (imgBuf == nullptr) { - DHLOGE("GetImageUnitInfo failed, imgBuf is nullptr."); + DCLOGE("GetImageUnitInfo failed, imgBuf is nullptr."); return DCAMERA_BAD_VALUE; } @@ -164,14 +164,14 @@ int32_t ScaleConvertProcess::GetImageUnitInfo(ImageUnitInfo& imgInfo, const std: int32_t colorFormat = 0; findErr = findErr && imgBuf->FindInt32("Videoformat", colorFormat); if (!findErr) { - DHLOGE("GetImageUnitInfo failed, Videoformat is null."); + DCLOGE("GetImageUnitInfo failed, Videoformat is null."); return DCAMERA_NOT_FOUND; } if (colorFormat != static_cast(Videoformat::YUVI420) && colorFormat != static_cast(Videoformat::NV12) && colorFormat != static_cast(Videoformat::NV21)) { - DHLOGE("GetImageUnitInfo failed, colorFormat %d are not supported.", colorFormat); + DCLOGE("GetImageUnitInfo failed, colorFormat %d are not supported.", colorFormat); return DCAMERA_NOT_FOUND; } imgInfo.colorFormat = static_cast(colorFormat); @@ -180,7 +180,7 @@ int32_t ScaleConvertProcess::GetImageUnitInfo(ImageUnitInfo& imgInfo, const std: findErr = findErr && imgBuf->FindInt32("alignedWidth", imgInfo.alignedWidth); findErr = findErr && imgBuf->FindInt32("alignedHeight", imgInfo.alignedHeight); if (!findErr) { - DHLOGE("GetImageUnitInfo failed, width %d, height %d, alignedWidth %d, alignedHeight %d.", + DCLOGE("GetImageUnitInfo failed, width %d, height %d, alignedWidth %d, alignedHeight %d.", imgInfo.width, imgInfo.height, imgInfo.alignedWidth, imgInfo.alignedHeight); return DCAMERA_NOT_FOUND; } @@ -189,10 +189,10 @@ int32_t ScaleConvertProcess::GetImageUnitInfo(ImageUnitInfo& imgInfo, const std: imgInfo.imgSize = imgBuf->Size(); imgInfo.imgData = imgBuf; if (imgInfo.imgData == nullptr) { - DHLOGE("Get the imgData of the imgBuf failed."); + DCLOGE("Get the imgData of the imgBuf failed."); return DCAMERA_BAD_VALUE; } - DHLOGD("ScaleConvertProcess imgBuf info : Videoformat %d, alignedWidth %d, alignedHeight %d, width %d, height %d" + + DCLOGD("ScaleConvertProcess imgBuf info : Videoformat %d, alignedWidth %d, alignedHeight %d, width %d, height %d" + ", chromaOffset %d, imgSize %d.", imgInfo.colorFormat, imgInfo.alignedWidth, imgInfo.alignedHeight, imgInfo.width, imgInfo.height, imgInfo.chromaOffset, imgInfo.imgSize); return DCAMERA_OK; @@ -209,19 +209,19 @@ bool ScaleConvertProcess::CheckScaleProcessInputInfo(const ImageUnitInfo& srcImg bool ScaleConvertProcess::CheckScaleConvertInfo(const ImageUnitInfo& srcImgInfo, const ImageUnitInfo& dstImgInfo) { if (srcImgInfo.imgData == nullptr || dstImgInfo.imgData == nullptr) { - DHLOGE("The imgData of srcImgInfo or the imgData of dstImgInfo are null!"); + DCLOGE("The imgData of srcImgInfo or the imgData of dstImgInfo are null!"); return false; } if (!IsCorrectImageUnitInfo(srcImgInfo)) { - DHLOGE("srcImginfo fail: width %d, height %d, alignedWidth %d, alignedHeight %d, chromaOffset %lld, " + + DCLOGE("srcImginfo fail: width %d, height %d, alignedWidth %d, alignedHeight %d, chromaOffset %lld, " + "imgSize %lld.", srcImgInfo.width, srcImgInfo.height, srcImgInfo.alignedWidth, srcImgInfo.alignedHeight, srcImgInfo.chromaOffset, srcImgInfo.imgSize); return false; } if (!IsCorrectImageUnitInfo(dstImgInfo)) { - DHLOGE("dstImginfo fail: width %d, height %d, alignedWidth %d, alignedHeight %d, chromaOffset %lld, " + + DCLOGE("dstImginfo fail: width %d, height %d, alignedWidth %d, alignedHeight %d, chromaOffset %lld, " + "imgSize %lld.", dstImgInfo.width, dstImgInfo.height, dstImgInfo.alignedWidth, dstImgInfo.alignedHeight, dstImgInfo.chromaOffset, dstImgInfo.imgSize); return false; @@ -229,7 +229,7 @@ bool ScaleConvertProcess::CheckScaleConvertInfo(const ImageUnitInfo& srcImgInfo, if ((dstImgInfo.width == srcImgInfo.alignedWidth) && (dstImgInfo.height == srcImgInfo.alignedHeight) && (dstImgInfo.colorFormat == srcImgInfo.colorFormat)) { - DHLOGE("Comparison ImgInfo fail: dstwidth %d, dstheight %d, srcAlignedWidth %d, srcAlignedHeight %d.", + DCLOGE("Comparison ImgInfo fail: dstwidth %d, dstheight %d, srcAlignedWidth %d, srcAlignedHeight %d.", dstImgInfo.width, dstImgInfo.height, srcImgInfo.alignedWidth, srcImgInfo.alignedHeight); return false; } @@ -248,9 +248,9 @@ bool ScaleConvertProcess::IsCorrectImageUnitInfo(const ImageUnitInfo& imgInfo) int32_t ScaleConvertProcess::ScaleConvert(ImageUnitInfo& srcImgInfo, ImageUnitInfo& dstImgInfo) { - DHLOGD("ScaleConvertProcess : Scale convert start."); + DCLOGD("ScaleConvertProcess : Scale convert start."); if (!CheckScaleConvertInfo(srcImgInfo, dstImgInfo)) { - DHLOGE("ScaleConvertProcess : CheckScaleConvertInfo failed."); + DCLOGE("ScaleConvertProcess : CheckScaleConvertInfo failed."); return DCAMERA_BAD_VALUE; } @@ -259,7 +259,7 @@ int32_t ScaleConvertProcess::ScaleConvert(ImageUnitInfo& srcImgInfo, ImageUnitIn case AV_PIX_FMT_YUV420P: { int32_t ret = CopyYUV420SrcData(srcImgInfo); if (ret != DCAMERA_OK) { - DHLOGE("ScaleConvertProcess::ScaleConvert copy yuv420p src data failed."); + DCLOGE("ScaleConvertProcess::ScaleConvert copy yuv420p src data failed."); return ret; } break; @@ -267,7 +267,7 @@ int32_t ScaleConvertProcess::ScaleConvert(ImageUnitInfo& srcImgInfo, ImageUnitIn case AV_PIX_FMT_NV12: { int32_t ret = CopyNV12SrcData(srcImgInfo); if (ret != DCAMERA_OK) { - DHLOGE("ScaleConvertProcess::ScaleConvert copy nv12 src data failed."); + DCLOGE("ScaleConvertProcess::ScaleConvert copy nv12 src data failed."); return ret; } break; @@ -275,13 +275,13 @@ int32_t ScaleConvertProcess::ScaleConvert(ImageUnitInfo& srcImgInfo, ImageUnitIn case AV_PIX_FMT_NV21: { int32_t ret = CopyNV21SrcData(srcImgInfo); if (ret != DCAMERA_OK) { - DHLOGE("ScaleConvertProcess::ScaleConvert copy nv21 src data failed."); + DCLOGE("ScaleConvertProcess::ScaleConvert copy nv21 src data failed."); return ret; } break; } default: - DHLOGE("Unknown pixel format not support."); + DCLOGE("Unknown pixel format not support."); return DCAMERA_BAD_VALUE; } @@ -289,7 +289,7 @@ int32_t ScaleConvertProcess::ScaleConvert(ImageUnitInfo& srcImgInfo, ImageUnitIn dstData_, dstLineSize_); int32_t ret = memcpy_s(dstImgInfo.imgData->Data(), dstImgInfo.imgSize, dstData_[0], dstBuffSize_); if (ret != EOK) { - DHLOGE("ScaleConvertProcess::ScaleConvert copy dst image info failed, ret = %d", ret); + DCLOGE("ScaleConvertProcess::ScaleConvert copy dst image info failed, ret = %d", ret); return DCAMERA_MEMORY_OPT_ERROR; } return DCAMERA_OK; @@ -300,7 +300,7 @@ int32_t ScaleConvertProcess::CopyYUV420SrcData(const ImageUnitInfo& srcImgInfo) int32_t ret = memcpy_s(srcData_[0], srcImgInfo.width * srcImgInfo.height, srcImgInfo.imgData->Data(), srcImgInfo.width * srcImgInfo.height); if (ret != EOK) { - DHLOGE("ScaleConvertProcess::CopyYUV420SrcData memory copy failed, ret = %d", ret); + DCLOGE("ScaleConvertProcess::CopyYUV420SrcData memory copy failed, ret = %d", ret); return DCAMERA_MEMORY_OPT_ERROR; } @@ -308,7 +308,7 @@ int32_t ScaleConvertProcess::CopyYUV420SrcData(const ImageUnitInfo& srcImgInfo) srcImgInfo.imgData->Data() + srcImgInfo.alignedWidth * srcImgInfo.alignedHeight, srcImgInfo.width * srcImgInfo.height / MEMORY_RATIO_YUV); if (ret != EOK) { - DHLOGE("ScaleConvertProcess::CopyYUV420SrcData memory copy failed, ret = %d", ret); + DCLOGE("ScaleConvertProcess::CopyYUV420SrcData memory copy failed, ret = %d", ret); return DCAMERA_MEMORY_OPT_ERROR; } @@ -317,7 +317,7 @@ int32_t ScaleConvertProcess::CopyYUV420SrcData(const ImageUnitInfo& srcImgInfo) srcImgInfo.alignedWidth * srcImgInfo.alignedHeight / MEMORY_RATIO_YUV, srcImgInfo.width * srcImgInfo.height / MEMORY_RATIO_YUV); if (ret != EOK) { - DHLOGE("ScaleConvertProcess::CopyYUV420SrcData memory copy failed, ret = %d", ret); + DCLOGE("ScaleConvertProcess::CopyYUV420SrcData memory copy failed, ret = %d", ret); return DCAMERA_MEMORY_OPT_ERROR; } return DCAMERA_OK; @@ -328,7 +328,7 @@ int32_t ScaleConvertProcess::CopyNV12SrcData(const ImageUnitInfo& srcImgInfo) int32_t ret = memcpy_s(srcData_[0], srcImgInfo.width * srcImgInfo.height, srcImgInfo.imgData->Data(), srcImgInfo.width * srcImgInfo.height); if (ret != EOK) { - DHLOGE("ScaleConvertProcess::CopyNV12SrcData memory copy failed, ret = %d", ret); + DCLOGE("ScaleConvertProcess::CopyNV12SrcData memory copy failed, ret = %d", ret); return DCAMERA_MEMORY_OPT_ERROR; } @@ -336,7 +336,7 @@ int32_t ScaleConvertProcess::CopyNV12SrcData(const ImageUnitInfo& srcImgInfo) srcImgInfo.imgData->Data() + srcImgInfo.alignedWidth * srcImgInfo.alignedHeight, srcImgInfo.width * srcImgInfo.height / MEMORY_RATIO_NV); if (ret != EOK) { - DHLOGE("ScaleConvertProcess::CopyNV12SrcData memory copy failed, ret = %d", ret); + DCLOGE("ScaleConvertProcess::CopyNV12SrcData memory copy failed, ret = %d", ret); return DCAMERA_MEMORY_OPT_ERROR; } return DCAMERA_OK; @@ -347,7 +347,7 @@ int32_t ScaleConvertProcess::CopyNV21SrcData(const ImageUnitInfo& srcImgInfo) int32_t ret = memcpy_s(srcData_[0], srcImgInfo.width * srcImgInfo.height, srcImgInfo.imgData->Data(), srcImgInfo.width * srcImgInfo.height); if (ret != EOK) { - DHLOGE("ScaleConvertProcess::CopyNV21SrcData memory copy failed, ret = %d", ret); + DCLOGE("ScaleConvertProcess::CopyNV21SrcData memory copy failed, ret = %d", ret); return DCAMERA_MEMORY_OPT_ERROR; } @@ -355,7 +355,7 @@ int32_t ScaleConvertProcess::CopyNV21SrcData(const ImageUnitInfo& srcImgInfo) srcImgInfo.imgData->Data() + srcImgInfo.alignedWidth * srcImgInfo.alignedHeight, srcImgInfo.width * srcImgInfo.height / MEMORY_RATIO_NV); if (ret != EOK) { - DHLOGE("ScaleConvertProcess::CopyNV21SrcData memory copy failed, ret = %d", ret); + DCLOGE("ScaleConvertProcess::CopyNV21SrcData memory copy failed, ret = %d", ret); return DCAMERA_MEMORY_OPT_ERROR; } return DCAMERA_OK; @@ -364,26 +364,26 @@ int32_t ScaleConvertProcess::CopyNV21SrcData(const ImageUnitInfo& srcImgInfo) int32_t ScaleConvertProcess::ConvertDone(std::vector>& outputBuffers) { int64_t finishScaleTime = GetNowTimeStampUs(); - DHLOGD("ScaleConvertProcess : Convert Done."); + DCLOGD("ScaleConvertProcess : Convert Done."); if (outputBuffers.empty()) { - DHLOGE("The received data buffer is empty."); + DCLOGE("The received data buffer is empty."); return DCAMERA_BAD_VALUE; } outputBuffers[0]->frameInfo_.timePonit.finishScale = finishScaleTime; if (nextDataProcess_ != nullptr) { - DHLOGD("Send to the next node of the scale convert for processing."); + DCLOGD("Send to the next node of the scale convert for processing."); int32_t err = nextDataProcess_->ProcessData(outputBuffers); if (err != DCAMERA_OK) { - DHLOGE("Some node after the scale convert processes failed."); + DCLOGE("Some node after the scale convert processes failed."); } return err; } - DHLOGD("The current node is the last noed, and output the processed video buffer."); + DCLOGD("The current node is the last noed, and output the processed video buffer."); std::shared_ptr targetPipelineSource = callbackPipelineSource_.lock(); if (targetPipelineSource == nullptr) { - DHLOGE("callbackPipelineSource_ is nullptr."); + DCLOGE("callbackPipelineSource_ is nullptr."); return DCAMERA_BAD_VALUE; } targetPipelineSource->OnProcessedVideoBuffer(outputBuffers[0]); diff --git a/services/data_process/src/utils/property_carrier.cpp b/services/data_process/src/utils/property_carrier.cpp index 69462e67c25e8552a7655e82a3b0b64fe1d3c1cd..ce77d77306f56205045ed271bd618ccc62b09a36 100644 --- a/services/data_process/src/utils/property_carrier.cpp +++ b/services/data_process/src/utils/property_carrier.cpp @@ -26,11 +26,11 @@ PropertyCarrier::~PropertyCarrier() int32_t PropertyCarrier::CarrySurfaceProperty(sptr& surface) { if (surface == nullptr) { - DHLOGD("PropertyCarrier::CarrySurfaceProperty: carry surface fail, input surface is nullptr."); + DCLOGD("PropertyCarrier::CarrySurfaceProperty: carry surface fail, input surface is nullptr."); return DCAMERA_BAD_VALUE; } surface_ = surface; - DHLOGD("PropertyCarrier::CarrySurfaceProperty: carry surface success."); + DCLOGD("PropertyCarrier::CarrySurfaceProperty: carry surface success."); return DCAMERA_OK; } } // namespace DistributedHardware diff --git a/services/data_process/test/unittest/common/pipeline/BUILD.gn b/services/data_process/test/unittest/common/pipeline/BUILD.gn index a88bef7df95c124889dcd14ca06e5bb847870ee4..98ca5fa0180446468a2f525ced27af362167b310 100644 --- a/services/data_process/test/unittest/common/pipeline/BUILD.gn +++ b/services/data_process/test/unittest/common/pipeline/BUILD.gn @@ -32,8 +32,10 @@ config("module_private_config") { "${common_path}/include/constants", "${common_path}/include/utils", "${innerkits_path}/native_cpp/camera_source/include", + "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/eventbus", + "${fwk_utils_path}/include/log", "${feeding_smoother_path}/base", "${services_path}/cameraservice/base/include", ] @@ -57,6 +59,7 @@ ohos_unittest("DCameraDataProcessPipelineTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "eventhandler:libeventhandler", "graphic_2d:surface", "hitrace:hitrace_meter", @@ -65,7 +68,7 @@ ohos_unittest("DCameraDataProcessPipelineTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DCameraDataProcessPipelineTest\"", + "DC_LOG_TAG=\"DCameraDataProcessPipelineTest\"", "LOG_DOMAIN=0xD004100", ] } diff --git a/services/data_process/test/unittest/common/pipeline_node/BUILD.gn b/services/data_process/test/unittest/common/pipeline_node/BUILD.gn index c30a98e2e13befa35a698dbf8fe73508193be1e3..9d3d5a6de8fe82ba5af9d810fa16f6d850ffcf65 100644 --- a/services/data_process/test/unittest/common/pipeline_node/BUILD.gn +++ b/services/data_process/test/unittest/common/pipeline_node/BUILD.gn @@ -32,8 +32,10 @@ config("module_private_config") { "${common_path}/include/constants", "${common_path}/include/utils", "${innerkits_path}/native_cpp/camera_source/include", + "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/eventbus", + "${fwk_utils_path}/include/log", "//third_party/ffmpeg/", "${feeding_smoother_path}/base", "${services_path}/cameraservice/base/include", @@ -69,6 +71,7 @@ ohos_unittest("DCameraDataProcessPipelineNodeTest") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_display:libdisplay_composer_proxy_1.0", "eventhandler:libeventhandler", "graphic_2d:surface", @@ -78,7 +81,7 @@ ohos_unittest("DCameraDataProcessPipelineNodeTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DCameraDataProcessPipelineNodeTest\"", + "DC_LOG_TAG=\"DCameraDataProcessPipelineNodeTest\"", "LOG_DOMAIN=0xD004100", ] } diff --git a/services/data_process/test/unittest/common/pipeline_node/decode_data_process_test.cpp b/services/data_process/test/unittest/common/pipeline_node/decode_data_process_test.cpp index 7e03668a33440fa1f168c2872e24685ed403f670..589a3cf38ea158e150cdae7c99784ae9d9d9abaa 100644 --- a/services/data_process/test/unittest/common/pipeline_node/decode_data_process_test.cpp +++ b/services/data_process/test/unittest/common/pipeline_node/decode_data_process_test.cpp @@ -20,7 +20,7 @@ #undef private #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" using namespace testing::ext; @@ -48,17 +48,17 @@ const int32_t SLEEP_TIME = 200000; void DecodeDataProcessTest::SetUpTestCase(void) { - DHLOGI("DecodeDataProcessTest SetUpTestCase"); + DCLOGI("DecodeDataProcessTest SetUpTestCase"); } void DecodeDataProcessTest::TearDownTestCase(void) { - DHLOGI("DecodeDataProcessTest TearDownTestCase"); + DCLOGI("DecodeDataProcessTest TearDownTestCase"); } void DecodeDataProcessTest::SetUp(void) { - DHLOGI("DecodeDataProcessTest SetUp"); + DCLOGI("DecodeDataProcessTest SetUp"); sourcePipeline_ = std::make_shared(); eventBusPipeline_ = std::make_shared("TestDecodeHandler"); testDecodeDataProcess_ = std::make_shared(eventBusPipeline_, sourcePipeline_); @@ -66,7 +66,7 @@ void DecodeDataProcessTest::SetUp(void) void DecodeDataProcessTest::TearDown(void) { - DHLOGI("DecodeDataProcessTest TearDown"); + DCLOGI("DecodeDataProcessTest TearDown"); usleep(SLEEP_TIME); sourcePipeline_ = nullptr; eventBusPipeline_ = nullptr; @@ -81,7 +81,7 @@ void DecodeDataProcessTest::TearDown(void) */ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_001, TestSize.Level1) { - DHLOGI("DecodeDataProcessTest decode_data_process_test_001"); + DCLOGI("DecodeDataProcessTest decode_data_process_test_001"); EXPECT_EQ(false, testDecodeDataProcess_ == nullptr); int32_t frameRate = 50; @@ -108,7 +108,7 @@ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_001, TestSize.Level1) */ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_002, TestSize.Level1) { - DHLOGI("DecodeDataProcessTest decode_data_process_test_002"); + DCLOGI("DecodeDataProcessTest decode_data_process_test_002"); EXPECT_EQ(false, testDecodeDataProcess_ == nullptr); VideoConfigParams srcParams(VideoCodecType::CODEC_H264, @@ -134,7 +134,7 @@ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_002, TestSize.Level1) */ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_003, TestSize.Level1) { - DHLOGI("DecodeDataProcessTest decode_data_process_test_003"); + DCLOGI("DecodeDataProcessTest decode_data_process_test_003"); EXPECT_EQ(false, testDecodeDataProcess_ == nullptr); VideoConfigParams srcParams(VideoCodecType::CODEC_H264, @@ -160,7 +160,7 @@ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_003, TestSize.Level1) */ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_004, TestSize.Level1) { - DHLOGI("DecodeDataProcessTest decode_data_process_test_004"); + DCLOGI("DecodeDataProcessTest decode_data_process_test_004"); EXPECT_EQ(false, testDecodeDataProcess_ == nullptr); VideoConfigParams srcParams(VideoCodecType::CODEC_H264, @@ -186,7 +186,7 @@ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_004, TestSize.Level1) */ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_005, TestSize.Level1) { - DHLOGI("DecodeDataProcessTest decode_data_process_test_005"); + DCLOGI("DecodeDataProcessTest decode_data_process_test_005"); EXPECT_EQ(false, testDecodeDataProcess_ == nullptr); std::vector> inputBuffers; @@ -202,7 +202,7 @@ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_005, TestSize.Level1) */ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_006, TestSize.Level1) { - DHLOGI("DecodeDataProcessTest decode_data_process_test_006"); + DCLOGI("DecodeDataProcessTest decode_data_process_test_006"); EXPECT_EQ(false, testDecodeDataProcess_ == nullptr); VideoConfigParams srcParams(VideoCodecType::CODEC_H264, @@ -235,7 +235,7 @@ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_006, TestSize.Level1) */ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_007, TestSize.Level1) { - DHLOGI("DecodeDataProcessTest decode_data_process_test_007"); + DCLOGI("DecodeDataProcessTest decode_data_process_test_007"); EXPECT_EQ(false, testDecodeDataProcess_ == nullptr); VideoConfigParams srcParams(VideoCodecType::CODEC_H264, @@ -268,7 +268,7 @@ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_007, TestSize.Level1) */ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_008, TestSize.Level1) { - DHLOGI("DecodeDataProcessTest::decode_data_process_test_008."); + DCLOGI("DecodeDataProcessTest::decode_data_process_test_008."); EXPECT_EQ(false, testDecodeDataProcess_ == nullptr); VideoConfigParams srcParams(VideoCodecType::CODEC_MPEG4_ES, @@ -297,7 +297,7 @@ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_008, TestSize.Level1) */ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_009, TestSize.Level1) { - DHLOGI("DecodeDataProcessTest decode_data_process_test_009"); + DCLOGI("DecodeDataProcessTest decode_data_process_test_009"); EXPECT_EQ(false, testDecodeDataProcess_ == nullptr); int32_t rc = testDecodeDataProcess_->SetDecoderOutputSurface(); @@ -327,7 +327,7 @@ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_009, TestSize.Level1) */ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_010, TestSize.Level1) { - DHLOGI("DecodeDataProcessTest decode_data_process_test_010"); + DCLOGI("DecodeDataProcessTest decode_data_process_test_010"); EXPECT_EQ(false, testDecodeDataProcess_ == nullptr); VideoConfigParams srcParams(VideoCodecType::CODEC_H264, @@ -377,7 +377,7 @@ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_010, TestSize.Level1) */ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_011, TestSize.Level1) { - DHLOGI("DecodeDataProcessTest decode_data_process_test_011"); + DCLOGI("DecodeDataProcessTest decode_data_process_test_011"); EXPECT_EQ(false, testDecodeDataProcess_ == nullptr); VideoConfigParams srcParams(VideoCodecType::CODEC_H264, @@ -411,7 +411,7 @@ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_011, TestSize.Level1) */ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_012, TestSize.Level1) { - DHLOGI("DecodeDataProcessTest decode_data_process_test_012"); + DCLOGI("DecodeDataProcessTest decode_data_process_test_012"); EXPECT_EQ(false, testDecodeDataProcess_ == nullptr); VideoConfigParams srcParams(VideoCodecType::CODEC_H264, @@ -456,7 +456,7 @@ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_012, TestSize.Level1) */ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_013, TestSize.Level1) { - DHLOGI("DecodeDataProcessTest decode_data_process_test_013"); + DCLOGI("DecodeDataProcessTest decode_data_process_test_013"); EXPECT_EQ(false, testDecodeDataProcess_ == nullptr); VideoConfigParams srcParams(VideoCodecType::CODEC_H264, @@ -488,7 +488,7 @@ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_013, TestSize.Level1) */ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_014, TestSize.Level1) { - DHLOGI("DecodeDataProcessTest decode_data_process_test_014"); + DCLOGI("DecodeDataProcessTest decode_data_process_test_014"); EXPECT_EQ(false, testDecodeDataProcess_ == nullptr); int32_t rc = DCAMERA_OK; @@ -505,7 +505,7 @@ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_014, TestSize.Level1) */ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_015, TestSize.Level1) { - DHLOGI("DecodeDataProcessTest decode_data_process_test_015"); + DCLOGI("DecodeDataProcessTest decode_data_process_test_015"); EXPECT_EQ(false, testDecodeDataProcess_ == nullptr); VideoConfigParams srcParams(VideoCodecType::CODEC_H264, @@ -545,7 +545,7 @@ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_015, TestSize.Level1) */ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_016, TestSize.Level1) { - DHLOGI("DecodeDataProcessTest decode_data_process_test_016"); + DCLOGI("DecodeDataProcessTest decode_data_process_test_016"); EXPECT_EQ(false, testDecodeDataProcess_ == nullptr); VideoConfigParams srcParams(VideoCodecType::CODEC_H264, diff --git a/test/distributedcameraclienttest/BUILD.gn b/test/distributedcameraclienttest/BUILD.gn index 48fc5d8d8fa06797a84067fbb2852299940176a8..5811c88edd6c05923b1d03ad5fe49f8702659ba8 100644 --- a/test/distributedcameraclienttest/BUILD.gn +++ b/test/distributedcameraclienttest/BUILD.gn @@ -73,7 +73,7 @@ ohos_moduletest_suite("SubDctsdisCameraClientTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"SubDctsdisCameraClientTest\"", + "DC_LOG_TAG=\"SubDctsdisCameraClientTest\"", "LOG_DOMAIN=0xD004100", ] diff --git a/test/distributedcameraclienttest/dcamera_client_automatic_test.cpp b/test/distributedcameraclienttest/dcamera_client_automatic_test.cpp index e706af43878f2c2fa8bbd4dde0ee07859637d998..7879b521532d0d5365235bb3e745d5dd3957f4b1 100644 --- a/test/distributedcameraclienttest/dcamera_client_automatic_test.cpp +++ b/test/distributedcameraclienttest/dcamera_client_automatic_test.cpp @@ -15,7 +15,7 @@ #include #include "dcamera_client_demo.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "access_token.h" #include "accesstoken_kit.h" diff --git a/test/distributedcameraclienttest/dcamera_client_demo.cpp b/test/distributedcameraclienttest/dcamera_client_demo.cpp index 3ac3d3cb9009637ff620865a1dcd8ebde7b4c44f..59dd40901c083146fdfa6b432f9e64b91a64065d 100644 --- a/test/distributedcameraclienttest/dcamera_client_demo.cpp +++ b/test/distributedcameraclienttest/dcamera_client_demo.cpp @@ -65,7 +65,7 @@ int32_t InitCameraStandard(CameraPosition position) int rv = g_cameraManager->CreateCaptureSession(&g_captureSession); if (rv != DCAMERA_OK) { - DHLOGE("InitCameraStandard create captureSession failed, rv: %d", rv); + DCLOGE("InitCameraStandard create captureSession failed, rv: %d", rv); return rv; } std::shared_ptr sessionCallback = std::make_shared(); @@ -74,7 +74,7 @@ int32_t InitCameraStandard(CameraPosition position) std::vector> cameraObjList = g_cameraManager->GetSupportedCameras(); for (auto info : cameraObjList) { - DHLOGI("Camera: %s, position: %d, camera type: %d, connection type: %d", GetAnonyString(info->GetID()).c_str(), + DCLOGI("Camera: %s, position: %d, camera type: %d, connection type: %d", GetAnonyString(info->GetID()).c_str(), info->GetPosition(), info->GetCameraType(), info->GetConnectionType()); // CAMERA_POSITION_BACK or CAMERA_POSITION_FRONT if ((info->GetPosition() == position) && @@ -85,18 +85,18 @@ int32_t InitCameraStandard(CameraPosition position) } if (g_cameraInfo == nullptr) { - DHLOGE("Distributed Camera Demo: have no remote camera"); + DCLOGE("Distributed Camera Demo: have no remote camera"); return DCAMERA_BAD_VALUE; } rv = g_cameraManager->CreateCameraInput(g_cameraInfo, &((sptr &)g_cameraInput)); if (rv != DCAMERA_OK) { - DHLOGE("InitCameraStandard create cameraInput failed, rv: %d", rv); + DCLOGE("InitCameraStandard create cameraInput failed, rv: %d", rv); return rv; } int32_t ret = ((sptr &)g_cameraInput)->Open(); if (ret != DCAMERA_OK) { - DHLOGE("InitCameraStandard g_cameraInput Open failed, ret: %d", ret); + DCLOGE("InitCameraStandard g_cameraInput Open failed, ret: %d", ret); return ret; } std::shared_ptr inputCallback = std::make_shared(); @@ -152,7 +152,7 @@ CameraFormat ConvertToCameraFormat(int32_t format) void InitPhotoOutput(void) { - DHLOGI("Distributed Camera Demo: Create PhotoOutput, width = %d, height = %d, format = %d", + DCLOGI("Distributed Camera Demo: Create PhotoOutput, width = %d, height = %d, format = %d", g_photoInfo->width_, g_photoInfo->height_, g_photoInfo->format_); sptr photoSurface = IConsumerSurface::Create(); sptr photoListener = new DemoDCameraPhotoSurfaceListener(photoSurface); @@ -163,7 +163,7 @@ void InitPhotoOutput(void) sptr photoProducer = photoSurface->GetProducer(); int rv = g_cameraManager->CreatePhotoOutput(photoProfile, photoProducer, &((sptr &)g_photoOutput)); if (rv != DCAMERA_OK) { - DHLOGE("InitPhotoOutput create photoOutput failed, rv: %d", rv); + DCLOGE("InitPhotoOutput create photoOutput failed, rv: %d", rv); return; } ((sptr &)g_photoOutput)->SetCallback(std::make_shared()); @@ -171,7 +171,7 @@ void InitPhotoOutput(void) void InitPreviewOutput(void) { - DHLOGI("Distributed Camera Demo: Create PreviewOutput, width = %d, height = %d, format = %d", + DCLOGI("Distributed Camera Demo: Create PreviewOutput, width = %d, height = %d, format = %d", g_previewInfo->width_, g_previewInfo->height_, g_previewInfo->format_); sptr previewSurface = IConsumerSurface::Create(); sptr previewListener = new DemoDCameraPreviewSurfaceListener(previewSurface); @@ -184,7 +184,7 @@ void InitPreviewOutput(void) int rv = g_cameraManager->CreatePreviewOutput( previewProfile, previewProducerSurface, &((sptr &)g_previewOutput)); if (rv != DCAMERA_OK) { - DHLOGE("InitPhotoOutput create previewOutput failed, rv: %d", rv); + DCLOGE("InitPhotoOutput create previewOutput failed, rv: %d", rv); return; } ((sptr &)g_previewOutput)->SetCallback(std::make_shared()); @@ -192,7 +192,7 @@ void InitPreviewOutput(void) void InitVideoOutput(void) { - DHLOGI("Distributed Camera Demo: Create VideoOutput, width = %d, height = %d, format = %d", + DCLOGI("Distributed Camera Demo: Create VideoOutput, width = %d, height = %d, format = %d", g_videoInfo->width_, g_videoInfo->height_, g_videoInfo->format_); sptr videoSurface = IConsumerSurface::Create(); sptr videoListener = new DemoDCameraVideoSurfaceListener(videoSurface); @@ -205,7 +205,7 @@ void InitVideoOutput(void) sptr pSurface = Surface::CreateSurfaceAsProducer(videoProducer); int rv = g_cameraManager->CreateVideoOutput(videoSettings, pSurface, &((sptr &)g_videoOutput)); if (rv != DCAMERA_OK) { - DHLOGE("InitPhotoOutput create videoOutput failed, rv: %d", rv); + DCLOGE("InitPhotoOutput create videoOutput failed, rv: %d", rv); return; } ((sptr &)g_videoOutput)->SetCallback(std::make_shared()); @@ -223,12 +223,12 @@ void ConfigCaptureSession(void) std::vector stabilizationModes; int32_t rv = g_captureSession->GetSupportedStabilizationMode(stabilizationModes); if (rv != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession get supported stabilization mode failed, rv: %d", rv); + DCLOGE("ConfigCaptureSession get supported stabilization mode failed, rv: %d", rv); return; } if (!stabilizationModes.empty()) { for (auto mode : stabilizationModes) { - DHLOGI("Distributed Camera Demo: video stabilization mode %d", mode); + DCLOGI("Distributed Camera Demo: video stabilization mode %d", mode); } g_captureSession->SetVideoStabilizationMode(stabilizationModes.back()); } @@ -244,11 +244,11 @@ void ConfigFocusFlashAndExposure(bool isVideo) std::vector biasRange; int32_t rv = g_captureSession->GetExposureBiasRange(biasRange); if (rv != DCAMERA_OK) { - DHLOGE("ConfigFocusAndExposure get exposure bias range failed, rv: %d", rv); + DCLOGE("ConfigFocusAndExposure get exposure bias range failed, rv: %d", rv); return; } if (!biasRange.empty()) { - DHLOGI("Distributed Camera Demo: get %d exposure compensation range", biasRange.size()); + DCLOGI("Distributed Camera Demo: get %d exposure compensation range", biasRange.size()); exposureValue = biasRange[0]; } FlashMode flash = FLASH_MODE_OPEN; @@ -316,7 +316,7 @@ int32_t Capture() { int32_t ret = ((sptr &)g_photoOutput)->Capture(ConfigPhotoCaptureSetting()); if (ret != DCAMERA_OK) { - DHLOGE("main g_photoOutput Capture failed, ret: %d", ret); + DCLOGE("main g_photoOutput Capture failed, ret: %d", ret); return ret; } return DCAMERA_OK; @@ -326,7 +326,7 @@ int32_t Video() { int32_t ret = ((sptr &)g_videoOutput)->Start(); if (ret != DCAMERA_OK) { - DHLOGE("main VideoOutput Start failed, ret: %d", ret); + DCLOGE("main VideoOutput Start failed, ret: %d", ret); return ret; } return DCAMERA_OK; @@ -336,14 +336,14 @@ int32_t GetPreviewProfiles(std::vector &previewResolution) { sptr capability = g_cameraManager->GetSupportedOutputCapability(g_cameraInfo); if (capability == nullptr) { - DHLOGI("get supported capability is null"); + DCLOGI("get supported capability is null"); return DCAMERA_BAD_VALUE; } std::vector previewProfiles = capability->GetPreviewProfiles(); - DHLOGI("size: %d", previewProfiles.size()); + DCLOGI("size: %d", previewProfiles.size()); for (auto& profile : previewProfiles) { CameraStandard::Size picSize = profile.GetSize(); - DHLOGI("width: %d, height: %d", picSize.width, picSize.height); + DCLOGI("width: %d, height: %d", picSize.width, picSize.height); if (IsValid(picSize)) { previewResolution.push_back(picSize); } diff --git a/test/distributedcameraclienttest/dcamera_client_demo.h b/test/distributedcameraclienttest/dcamera_client_demo.h index d43c6f45311569f2e0ba0e811471d51a0824b722..82a4b8f196b0124a847f34f3c045ffeed6517d59 100644 --- a/test/distributedcameraclienttest/dcamera_client_demo.h +++ b/test/distributedcameraclienttest/dcamera_client_demo.h @@ -31,7 +31,7 @@ #include "dcamera_utils_tools.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" -#include "distributed_hardware_log.h" +#include "dcamera_sa_log.h" #include "metadata_utils.h" #include "photo_output.h" #include "preview_output.h" @@ -48,9 +48,9 @@ public: void OnBufferAvailable() { - DHLOGI("DemoDCameraBufferConsumerListener::OnBufferAvailable"); + DCLOGI("DemoDCameraBufferConsumerListener::OnBufferAvailable"); if (surface_ == nullptr) { - DHLOGE("DemoDCameraBufferConsumerListener surface is null"); + DCLOGE("DemoDCameraBufferConsumerListener surface is null"); return; } @@ -60,7 +60,7 @@ public: OHOS::sptr buffer = nullptr; surface_->AcquireBuffer(buffer, flushFence, timestamp, damage); if (buffer == nullptr) { - DHLOGE("DemoDCameraBufferConsumerListener AcquireBuffer failed"); + DCLOGE("DemoDCameraBufferConsumerListener AcquireBuffer failed"); return; } @@ -107,10 +107,10 @@ public: protected: void SaveFile() const override { - DHLOGI("DemoDCameraPhotoSurfaceListener::SaveFile width: %d, height: %d, size: %d, dataSize: %d, " + + DCLOGI("DemoDCameraPhotoSurfaceListener::SaveFile width: %d, height: %d, size: %d, dataSize: %d, " + "actualSize: %d", width_, height_, size_, dataSize_, actualSize_); if ((address_ == nullptr) || (dataSize_ <= 0)) { - DHLOGE("DemoDCameraPhotoSurfaceListener invalid params, dataSize: %d", dataSize_); + DCLOGE("DemoDCameraPhotoSurfaceListener invalid params, dataSize: %d", dataSize_); return; } @@ -119,7 +119,7 @@ protected: std::string fileName = "/data/log/dcamera_photo_" + std::to_string(GetNowTimeStampMs()) + ".jpg"; ofs.open(fileName, std::ios::binary | std::ios::out); if (!ofs.is_open()) { - DHLOGE("DemoDCameraPhotoSurfaceListener open file failed"); + DCLOGE("DemoDCameraPhotoSurfaceListener open file failed"); return; } ofs.write(address_, dataSize_); @@ -138,10 +138,10 @@ public: protected: void SaveFile() const override { - DHLOGI("DemoDCameraPreviewSurfaceListener::SaveFile width: %d, height: %d, size: %d, dataSize: %d, " + + DCLOGI("DemoDCameraPreviewSurfaceListener::SaveFile width: %d, height: %d, size: %d, dataSize: %d, " + "actualSize: %d", width_, height_, size_, dataSize_, actualSize_); if ((address_ == nullptr) || (actualSize_ <= 0)) { - DHLOGE("DemoDCameraPreviewSurfaceListener invalid params, actualSize: %d", actualSize_); + DCLOGE("DemoDCameraPreviewSurfaceListener invalid params, actualSize: %d", actualSize_); return; } @@ -151,7 +151,7 @@ protected: std::string fileName = "/data/log/dcamera_preview_" + resolution + ".yuv"; ofs.open(fileName, std::ios::binary | std::ios::out | std::ios::app); if (!ofs.is_open()) { - DHLOGE("DemoDCameraPreviewSurfaceListener open file failed"); + DCLOGE("DemoDCameraPreviewSurfaceListener open file failed"); return; } ofs.write(address_, actualSize_); @@ -170,10 +170,10 @@ public: protected: void SaveFile() const override { - DHLOGI("DemoDCameraVideoSurfaceListener::SaveFile width: %d, height: %d, size: %d, dataSize: %d, " + + DCLOGI("DemoDCameraVideoSurfaceListener::SaveFile width: %d, height: %d, size: %d, dataSize: %d, " + "actualSize: %d", width_, height_, size_, dataSize_, actualSize_); if ((address_ == nullptr) || (actualSize_ <= 0)) { - DHLOGE("DemoDCameraVideoSurfaceListener invalid params, actualSize: %d", actualSize_); + DCLOGE("DemoDCameraVideoSurfaceListener invalid params, actualSize: %d", actualSize_); return; } @@ -183,7 +183,7 @@ protected: std::string fileName = "/data/log/dcamera_video_" + resolution + ".yuv"; ofs.open(fileName, std::ios::binary | std::ios::out | std::ios::app); if (!ofs.is_open()) { - DHLOGE("DemoDCameraVideoSurfaceListener open file failed"); + DCLOGE("DemoDCameraVideoSurfaceListener open file failed"); return; } ofs.write(address_, actualSize_); @@ -196,22 +196,22 @@ class DemoDCameraPhotoCallback : public CameraStandard::PhotoStateCallback { public: void OnCaptureStarted(const int32_t captureID) const { - DHLOGI("DemoDCameraPhotoCallback::OnCaptureStarted captureID: %d", captureID); + DCLOGI("DemoDCameraPhotoCallback::OnCaptureStarted captureID: %d", captureID); } void OnCaptureEnded(const int32_t captureID, int32_t frameCount) const { - DHLOGI("DemoDCameraPhotoCallback::OnCaptureEnded captureID: %d frameCount: %d", captureID, frameCount); + DCLOGI("DemoDCameraPhotoCallback::OnCaptureEnded captureID: %d frameCount: %d", captureID, frameCount); } void OnFrameShutter(const int32_t captureId, const uint64_t timestamp) const { - DHLOGI("DemoDCameraPhotoCallback::OnFrameShutter captureID: %d timestamp: %llu", captureId, timestamp); + DCLOGI("DemoDCameraPhotoCallback::OnFrameShutter captureID: %d timestamp: %llu", captureId, timestamp); } void OnCaptureError(const int32_t captureId, const int32_t errorCode) const { - DHLOGI("DemoDCameraPhotoCallback::OnCaptureError captureID: %d errorCode: %d", captureId, errorCode); + DCLOGI("DemoDCameraPhotoCallback::OnCaptureError captureID: %d errorCode: %d", captureId, errorCode); } }; @@ -219,22 +219,22 @@ class DemoDCameraPreviewCallback : public CameraStandard::PreviewStateCallback { public: void OnFrameStarted() const { - DHLOGI("DemoDCameraPreviewCallback::OnFrameStarted."); + DCLOGI("DemoDCameraPreviewCallback::OnFrameStarted."); } void OnFrameEnded(const int32_t frameCount) const { - DHLOGI("DemoDCameraPreviewCallback::OnFrameEnded frameCount: %d", frameCount); + DCLOGI("DemoDCameraPreviewCallback::OnFrameEnded frameCount: %d", frameCount); } void OnError(const int32_t errorCode) const { - DHLOGI("DemoDCameraPreviewCallback::OnError errorCode: %d", errorCode); + DCLOGI("DemoDCameraPreviewCallback::OnError errorCode: %d", errorCode); } void OnSketchAvailable(CameraStandard::SketchData& sketchData) const { - DHLOGI("DemoDCameraPreviewCallback::OnSketchAvailable."); + DCLOGI("DemoDCameraPreviewCallback::OnSketchAvailable."); } }; @@ -242,17 +242,17 @@ class DemoDCameraVideoCallback : public CameraStandard::VideoStateCallback { public: void OnFrameStarted() const { - DHLOGI("DemoDCameraVideoCallback::OnFrameStarted."); + DCLOGI("DemoDCameraVideoCallback::OnFrameStarted."); } void OnFrameEnded(const int32_t frameCount) const { - DHLOGI("DemoDCameraVideoCallback::OnFrameEnded frameCount: %d", frameCount); + DCLOGI("DemoDCameraVideoCallback::OnFrameEnded frameCount: %d", frameCount); } void OnError(const int32_t errorCode) const { - DHLOGI("DemoDCameraVideoCallback::OnError errorCode: %d", errorCode); + DCLOGI("DemoDCameraVideoCallback::OnError errorCode: %d", errorCode); } }; @@ -260,7 +260,7 @@ class DemoDCameraInputCallback : public CameraStandard::ErrorCallback { public: void OnError(const int32_t errorType, const int32_t errorMsg) const { - DHLOGI("DemoDCameraInputCallback::OnError errorType: %d errorMsg: %d", errorType, errorMsg); + DCLOGI("DemoDCameraInputCallback::OnError errorType: %d errorMsg: %d", errorType, errorMsg); } }; @@ -268,13 +268,13 @@ class DemoDCameraManagerCallback : public CameraStandard::CameraManagerCallback public: void OnCameraStatusChanged(const CameraStandard::CameraStatusInfo &cameraStatusInfo) const { - DHLOGI("DemoDCameraManagerCallback::OnCameraStatusChanged cameraStatus: %d", cameraStatusInfo.cameraStatus); + DCLOGI("DemoDCameraManagerCallback::OnCameraStatusChanged cameraStatus: %d", cameraStatusInfo.cameraStatus); } void OnFlashlightStatusChanged(const std::string &cameraID, const CameraStandard::FlashStatus flashStatus) const { - DHLOGI("DemoDCameraManagerCallback::OnFlashlightStatusChanged cameraID: %s, flashStatus: %d", + DCLOGI("DemoDCameraManagerCallback::OnFlashlightStatusChanged cameraID: %s, flashStatus: %d", GetAnonyString(cameraID).c_str(), flashStatus); } }; @@ -283,12 +283,12 @@ class DemoDCameraSessionCallback : public CameraStandard::SessionCallback, publi public: void OnError(int32_t errorCode) { - DHLOGI("DemoDCameraSessionCallback::OnError errorCode: %d", errorCode); + DCLOGI("DemoDCameraSessionCallback::OnError errorCode: %d", errorCode); } void OnFocusState(FocusState state) { - DHLOGI("DemoDCameraSessionCallback::OnFocusState state: %d", state); + DCLOGI("DemoDCameraSessionCallback::OnFocusState state: %d", state); } };