Showing the changes to codec/encoder/core/src/memory_align.cpp (1 of 2 files). Show all
Unified · Split
| @@ -83,15 +83,8 @@ void* CMemoryAlign::WelsMalloc (const uint32_t kuiSize, const str_t* kpTag) { · 82 unmodified lines | ||
| 83 | 83 | const int32_t kiSizeOfInt = sizeof (int32_t); |
| 84 | 84 | const int32_t kiAlignedBytes = m_nCacheLineSize - 1; |
| 85 | 85 | const int32_t kiTrialRequestedSize = kuiSize + kiAlignedBytes + kiSizeOfVoidPointer + kiSizeOfInt; |
| 86 | −#if MEMORY_REQUEST_ALIGN_BYTES | |
| 87 | − // ensure 4 bytes boundary aligned memory request, unused extra bytes padding in pData payload | |
| 88 | − const int32_t kiActualRequestedSize = WELS_ALIGN (kiTrialRequestedSize, MEMORY_REQUEST_ALIGN_BYTES); | |
| 89 | − const uint32_t kiPayloadSize = kuiSize + MEMORY_REQUEST_ALIGN_BYTES - (kiTrialRequestedSize & | |
| 90 | − (MEMORY_REQUEST_ALIGN_BYTES - 1)); | |
| 91 | −#else | |
| 92 | 86 | const int32_t kiActualRequestedSize = kiTrialRequestedSize; |
| 93 | 87 | const uint32_t kiPayloadSize = kuiSize; |
| 94 | −#endif//MEMORY_REQUEST_ALIGN_BYTES | |
| 95 | 88 | |
| 96 | 89 | uint8_t* pBuf = (uint8_t*) malloc (kiActualRequestedSize); |
| 97 | 90 | #ifdef MEMORY_CHECK |