generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #194 from volvet/remove_MEMORY_REQUEST_ALIGN_BYTES

Browse Source 
remove MEMORY_REQUEST_ALIGN_BYTES
This commit is contained in:
Ethan Hugg 2014-01-23 10:25:27 -08:00
commit 63c03b10b4
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codec/encoder/core/inc/memory_align.h
View File

@ -41,8 +41,6 @@
namespace WelsSVCEnc { namespace WelsSVCEnc {
#define MEMORY_REQUEST_ALIGN_BYTES 0 // or (1^n), i.e, 0x04
class CMemoryAlign { class CMemoryAlign {
public: public:
CMemoryAlign (const uint32_t kuiCacheLineSize); CMemoryAlign (const uint32_t kuiCacheLineSize);

7
codec/encoder/core/src/memory_align.cpp
View File

@ -83,15 +83,8 @@ void* CMemoryAlign::WelsMalloc (const uint32_t kuiSize, const str_t* kpTag) {
const int32_t kiSizeOfInt = sizeof (int32_t); const int32_t kiSizeOfInt = sizeof (int32_t);
const int32_t kiAlignedBytes = m_nCacheLineSize - 1; const int32_t kiAlignedBytes = m_nCacheLineSize - 1;
const int32_t kiTrialRequestedSize = kuiSize + kiAlignedBytes + kiSizeOfVoidPointer + kiSizeOfInt; const int32_t kiTrialRequestedSize = kuiSize + kiAlignedBytes + kiSizeOfVoidPointer + kiSizeOfInt;
#if MEMORY_REQUEST_ALIGN_BYTES
// ensure 4 bytes boundary aligned memory request, unused extra bytes padding in pData payload
const int32_t kiActualRequestedSize = WELS_ALIGN (kiTrialRequestedSize, MEMORY_REQUEST_ALIGN_BYTES);
const uint32_t kiPayloadSize = kuiSize + MEMORY_REQUEST_ALIGN_BYTES - (kiTrialRequestedSize &
(MEMORY_REQUEST_ALIGN_BYTES - 1));
#else
const int32_t kiActualRequestedSize = kiTrialRequestedSize; const int32_t kiActualRequestedSize = kiTrialRequestedSize;
const uint32_t kiPayloadSize = kuiSize; const uint32_t kiPayloadSize = kuiSize;
#endif//MEMORY_REQUEST_ALIGN_BYTES
uint8_t* pBuf = (uint8_t*) malloc (kiActualRequestedSize); uint8_t* pBuf = (uint8_t*) malloc (kiActualRequestedSize);
#ifdef MEMORY_CHECK #ifdef MEMORY_CHECK