diff --git a/low_power_player/src/low_power_player_factory.cpp b/low_power_player/src/low_power_player_factory.cpp index 71c2c71ae7885fe2e9f57e9c9d9b647747d92e33..c351a4cce0d2d8bd04d0688e273c352f72adf6e9 100644 --- a/low_power_player/src/low_power_player_factory.cpp +++ b/low_power_player/src/low_power_player_factory.cpp @@ -15,8 +15,8 @@ #include #include "lpp_log.h" -#include "low_power_player_factory.h" #include "lpp_sync_manager_adapter.h" +#include "low_power_player_factory.h" namespace OHOS { namespace HDI { namespace LowPowerPlayer { @@ -55,12 +55,12 @@ int32_t LowPowerPlayerFactory::GetAVCapability(LppAVCap& avCap) std::lock_guard lock(mutex_); if (libHandle_ == nullptr) { void *handle = dlopen(LOW_POWER_PLAYER_VDI_LIBRARY, RTLD_LAZY); - CHECK_TRUE_RETURN_RET_LOG(handle == NULL, HDF_FAILURE, "dlopen failed, %{public}s", dlerror()); + CHECK_TRUE_RETURN_RET_LOG(handle == nullptr, HDF_FAILURE, "dlopen failed, %{public}s", dlerror()); libHandle_ = std::shared_ptr(handle, dlclose); // use smart pointer to manage library handle } if (capVdi_ == nullptr) { capVdi_ = reinterpret_cast(dlsym(libHandle_.get(), "GetAVCapabilityVdi")); - CHECK_TRUE_RETURN_RET_LOG(capVdi_ == NULL, HDF_FAILURE, "createVdi_ dlsym failed, %{public}s", dlerror()); + CHECK_TRUE_RETURN_RET_LOG(capVdi_ == nullptr, HDF_FAILURE, "createVdi_ dlsym failed, %{public}s", dlerror()); } int32_t ret = capVdi_(avCap); CHECK_TRUE_RETURN_RET_LOG(ret != HDF_SUCCESS, HDF_FAILURE, "GetAVCapability failed, %{public}s", strerror(errno)); diff --git a/low_power_player/src/lpp_sync_manager_adapter.cpp b/low_power_player/src/lpp_sync_manager_adapter.cpp index cfab0b70ac2fb8784d02700b9be7c6c46cfd5c04..5dda49f47115398b73549c1ac78f6fd36e97ccc7 100644 --- a/low_power_player/src/lpp_sync_manager_adapter.cpp +++ b/low_power_player/src/lpp_sync_manager_adapter.cpp @@ -40,19 +40,20 @@ int32_t LppSyncManagerAdapter::LoadVendorLib() { if (libHandle_ == nullptr) { void* handle = dlopen(LOW_POWER_PLAYER_VDI_LIBRARY, RTLD_LAZY); - CHECK_TRUE_RETURN_RET_LOG(handle == NULL, HDF_FAILURE, "dlopen failed, %{public}s", dlerror()); + CHECK_TRUE_RETURN_RET_LOG(handle == nullptr, HDF_FAILURE, "dlopen failed, %{public}s", dlerror()); libHandle_ = std::shared_ptr(handle, dlclose); } if (createVdi_ == nullptr) { createVdi_ = reinterpret_cast(dlsym(libHandle_.get(), "CreateLowPowerPlayerVdi")); - CHECK_TRUE_RETURN_RET_LOG(createVdi_ == NULL, HDF_FAILURE, "createVdi_ dlsym failed, %{public}s", dlerror()); + CHECK_TRUE_RETURN_RET_LOG(createVdi_ == nullptr, HDF_FAILURE, "createVdi_ dlsym failed, %{public}s", dlerror()); } if (destroyVdi_ == nullptr) { destroyVdi_ = reinterpret_cast(dlsym(libHandle_.get(), "DestroyLowPowerPlayerVdi")); - CHECK_TRUE_RETURN_RET_LOG(destroyVdi_ == NULL, HDF_FAILURE, "destroyVdi_ dlsym failed, %{public}s", dlerror()); + CHECK_TRUE_RETURN_RET_LOG( + destroyVdi_ == nullptr, HDF_FAILURE, "destroyVdi_ dlsym failed, %{public}s", dlerror()); } return HDF_SUCCESS; } @@ -64,7 +65,7 @@ int32_t LppSyncManagerAdapter::Init() CHECK_TRUE_RETURN_RET_LOG(ret != HDF_SUCCESS, HDF_FAILURE, "load vdi failed"); vdiImpl_ = createVdi_(); - CHECK_TRUE_RETURN_RET_LOG(vdiImpl_ == NULL, HDF_FAILURE, "createVdi_ failed"); + CHECK_TRUE_RETURN_RET_LOG(vdiImpl_ == nullptr, HDF_FAILURE, "createVdi_ failed"); ret = vdiImpl_->Init(); CHECK_TRUE_RETURN_RET_LOG(ret != HDF_SUCCESS, HDF_FAILURE, "Init failed");