diff --git a/frameworks/native/effect/manager/memory_manager/effect_memory_manager.cpp b/frameworks/native/effect/manager/memory_manager/effect_memory_manager.cpp index 02e1b171763641d3abcedabde62c0a8a4e12df6b..57330d67379c14f3beed6756060dd258cdf2aae9 100644 --- a/frameworks/native/effect/manager/memory_manager/effect_memory_manager.cpp +++ b/frameworks/native/effect/manager/memory_manager/effect_memory_manager.cpp @@ -106,9 +106,9 @@ MemoryData *EffectMemoryManager::AllocMemory(void *srcAddr, MemoryInfo &allocMem if (bufferInfo.width_ == allocBufInfo.width_ && bufferInfo.height_ == allocBufInfo.height_ && (allocMemInfo.bufferType == BufferType::DEFAULT || allocMemInfo.bufferType == memInfo.bufferType) && bufferInfo.formatType_ == allocBufInfo.formatType_ && bufferInfo.colorSpace_ == allocBufInfo.colorSpace_) { - EFFECT_LOGD("reuse memory. width=%{public}d, height=%{public}d, addr=%{public}p, format=%{public}d, " + EFFECT_LOGD("reuse memory. width=%{public}d, height=%{public}d, format=%{public}d, " "bufferType=%{public}d, allocBufType=%{public}d", bufferInfo.width_, bufferInfo.height_, - memory->memoryData_->data, bufferInfo.formatType_, memInfo.bufferType, allocMemInfo.bufferType); + bufferInfo.formatType_, memInfo.bufferType, allocMemInfo.bufferType); return memory->memoryData_.get(); } } @@ -135,8 +135,6 @@ void EffectMemoryManager::AddMemory(std::shared_ptr &memory) "memory data is null!"); if (std::find(memorys_.begin(), memorys_.end(), memory) == memorys_.end()) { memorys_.emplace_back(memory); - } else { - EFFECT_LOGW("memory is already add! memory=%{public}p", memory.get()); } } @@ -148,8 +146,6 @@ std::shared_ptr EffectMemoryManager::GetAllocMemoryByAddr(void *addr) } if (memory->memoryData_->data == addr) { - EFFECT_LOGD("addr is find! addr=%{public}p, bufferType=%{public}d", - addr, memory->memoryData_->memoryInfo.bufferType); return memory; } } diff --git a/frameworks/native/efilter/filterimpl/crop/crop_efilter.cpp b/frameworks/native/efilter/filterimpl/crop/crop_efilter.cpp index a8eaad0591936ae6be2e88884ff13db3796279f4..630270c6011d89cfb13b330d20107d4dc542a0bf 100644 --- a/frameworks/native/efilter/filterimpl/crop/crop_efilter.cpp +++ b/frameworks/native/efilter/filterimpl/crop/crop_efilter.cpp @@ -99,9 +99,8 @@ void Crop(EffectBuffer *src, EffectBuffer *dst, Region *region) uint32_t srcRowStride = src->bufferInfo_->rowStride_; uint32_t dstRowStride = dst->bufferInfo_->rowStride_; char *srcStart = srcBuffer + cropTop * static_cast(srcRowStride) + cropLeft * PIXEL_BYTES; - EFFECT_LOGD("Crop: srcBuffer=%{public}p, dstBuffer=%{public}p, srcStart=%{public}p, srcRowStride=%{public}d, " - "dstRowStride=%{public}d, rowCount=%{public}d, count=%{public}d", - srcBuffer, dstBuffer, srcStart, srcRowStride, dstRowStride, rowCount, count); + EFFECT_LOGD("Crop: srcRowStride=%{public}d, dstRowStride=%{public}d, rowCount=%{public}d, count=%{public}d", + srcRowStride, dstRowStride, rowCount, count); for (int32_t i = 0; i < rowCount; ++i) { errno_t ret = memcpy_s(dstBuffer + i * dstRowStride, dstRowStride, srcStart + i * srcRowStride, count); if (ret != 0) { diff --git a/frameworks/native/utils/common/memcpy_helper.cpp b/frameworks/native/utils/common/memcpy_helper.cpp index cfcc2f19b0328c34bb9bca0b7c76ebe835062ee0..797e4fae404b4f5e63dd59aa0bf347e98371de10 100644 --- a/frameworks/native/utils/common/memcpy_helper.cpp +++ b/frameworks/native/utils/common/memcpy_helper.cpp @@ -34,10 +34,10 @@ void MemcpyHelper::CopyData(CopyInfo &src, CopyInfo &dst) BufferInfo &srcInfo = src.bufferInfo; BufferInfo &dstInfo = dst.bufferInfo; - EFFECT_LOGD("CopyData: srcAddr=%{public}p, srcH=%{public}d, srcFormat=%{public}d, srcStride=%{public}d, " - "srcLen=%{public}d, dstAddr=%{public}p, dstH=%{public}d, dstFormat=%{public}d, dstStride=%{public}d, " - "dstLen=%{public}d", src.data, srcInfo.height_, srcInfo.formatType_, srcInfo.rowStride_, srcInfo.len_, - dst.data, dstInfo.height_, dstInfo.formatType_, dstInfo.rowStride_, dstInfo.len_); + EFFECT_LOGD("CopyData: srcH=%{public}d, srcFormat=%{public}d, srcStride=%{public}d, " + "srcLen=%{public}d, dstH=%{public}d, dstFormat=%{public}d, dstStride=%{public}d, " + "dstLen=%{public}d", srcInfo.height_, srcInfo.formatType_, srcInfo.rowStride_, srcInfo.len_, + dstInfo.height_, dstInfo.formatType_, dstInfo.rowStride_, dstInfo.len_); uint32_t srcRowStride = srcInfo.rowStride_; uint32_t dstRowStride = dstInfo.rowStride_; uint32_t srcBufferLen = srcInfo.len_;