Showing the changes to codec/encoder/core/src/memory_align.cpp (1 of 34 files). Show all
Unified · Split
| @@ -66,7 +66,7 @@ CMemoryAlign::~CMemoryAlign() { · 65 unmodified lines | |||
| 66 | #endif//MEMORY_CHECK | 66 | #endif//MEMORY_CHECK |
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | void* CMemoryAlign::WelsMallocz (const uint32_t kuiSize, const str_t* kpTag) { | 69 | void* CMemoryAlign::WelsMallocz (const uint32_t kuiSize, const char* kpTag) { |
| 70 | void* pPointer = WelsMalloc (kuiSize, kpTag); | 70 | void* pPointer = WelsMalloc (kuiSize, kpTag); |
| 71 | if (NULL == pPointer) { | 71 | if (NULL == pPointer) { |
| 72 | return NULL; | 72 | return NULL; |
| @@ -77,7 +77,7 @@ void* CMemoryAlign::WelsMallocz (const uint32_t kuiSize, const str_t* kpTag) { · 4 unmodified lines | |||
| 77 | return pPointer; | 77 | return pPointer; |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | void* CMemoryAlign::WelsMalloc (const uint32_t kuiSize, const str_t* kpTag) { | 80 | void* CMemoryAlign::WelsMalloc (const uint32_t kuiSize, const char* kpTag) { |
| 81 | const int32_t kiSizeOfVoidPointer = sizeof (void**); | 81 | const int32_t kiSizeOfVoidPointer = sizeof (void**); |
| 82 | const int32_t kiSizeOfInt = sizeof (int32_t); | 82 | const int32_t kiSizeOfInt = sizeof (int32_t); |
| 83 | const int32_t kiAlignedBytes = m_nCacheLineSize - 1; | 83 | const int32_t kiAlignedBytes = m_nCacheLineSize - 1; |
| @@ -114,7 +114,7 @@ void* CMemoryAlign::WelsMalloc (const uint32_t kuiSize, const str_t* kpTag) { · 30 unmodified lines | |||
| 114 | return pAlignedBuffer; | 114 | return pAlignedBuffer; |
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | void CMemoryAlign::WelsFree (void* pPointer, const str_t* kpTag) { | 117 | void CMemoryAlign::WelsFree (void* pPointer, const char* kpTag) { |
| 118 | if (pPointer) { | 118 | if (pPointer) { |
| 119 | #ifdef MEMORY_MONITOR | 119 | #ifdef MEMORY_MONITOR |
| 120 | const int32_t kiMemoryLength = * ((int32_t*) ((uint8_t*)pPointer - sizeof (void**) - sizeof ( | 120 | const int32_t kiMemoryLength = * ((int32_t*) ((uint8_t*)pPointer - sizeof (void**) - sizeof ( |