Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 2 files). Show all
Unified · Split
| @@ -1772,7 +1772,7 @@ void FreeMemorySvc (sWelsEncCtx** ppCtx) { · 1771 unmodified lines | ||
| 1772 | 1772 | |
| 1773 | 1773 | #if defined(MEMORY_MONITOR) |
| 1774 | 1774 | assert (pMa->WelsGetMemoryUsage() == 0); // ensure all memory free well |
| 1775 | −#endif//MEMORY_MONITOR | |
| 1775 | +#endif//MEMORY_MONITOR | |
| 1776 | 1776 | |
| 1777 | 1777 | if ((*ppCtx)->pMemAlign != NULL) { |
| 1778 | 1778 | WelsLog (NULL, WELS_LOG_INFO, "FreeMemorySvc(), verify memory usage (%d bytes) after free..\n", |
| @@ -2030,7 +2030,7 @@ int32_t WelsInitEncoderExt (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPar · 251 unmodified lines | ||
| 2030 | 2030 | |
| 2031 | 2031 | uiCpuCores = pCodingParam->iMultipleThreadIdc; // assigned uiCpuCores from iMultipleThreadIdc from SGE testing |
| 2032 | 2032 | |
| 2033 | −#endif//WELS_TESTBED | |
| 2033 | +#endif//WELS_TESTBED | |
| 2034 | 2034 | |
| 2035 | 2035 | uiCpuCores = WELS_CLIP3 (uiCpuCores, 1, MAX_THREADS_NUM); |
| 2036 | 2036 | |
| @@ -2123,9 +2123,9 @@ int32_t WelsInitEncoderExt (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPar · 86 unmodified lines | ||
| 2123 | 2123 | } |
| 2124 | 2124 | |
| 2125 | 2125 | #if defined(MEMORY_MONITOR) |
| 2126 | − WelsLog (pCtx, WELS_LOG_INFO, "WelsInitEncoderExt() exit, overall memory usage: %lu bytes\n", | |
| 2127 | − sizeof (sWelsEncCtx) /* requested size from malloc() or new operator */ | |
| 2128 | − + pCtx->pMemAlign->WelsGetMemoryUsage() /* requested size from CMemoryAlign::WelsMalloc() */ | |
| 2126 | + WelsLog (pCtx, WELS_LOG_INFO, "WelsInitEncoderExt() exit, overall memory usage: %u bytes\n", | |
| 2127 | + (unsigned int) (sizeof (sWelsEncCtx) /* requested size from malloc() or new operator */ | |
| 2128 | + + pCtx->pMemAlign->WelsGetMemoryUsage()) /* requested size from CMemoryAlign::WelsMalloc() */ | |
| 2129 | 2129 | ); |
| 2130 | 2130 | #endif//MEMORY_MONITOR |
| 2131 | 2131 | |
| @@ -3522,7 +3522,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, void* pDst, const SSourcePictur · 1390 unmodified lines | ||
| 3522 | 3522 | (pCtx->eSliceType == P_SLICE ? 'P' : 'I'), |
| 3523 | 3523 | eNalRefIdc, |
| 3524 | 3524 | iSliceSize); |
| 3525 | −#endif//SLICE_INFO_OUTPUT | |
| 3525 | +#endif//SLICE_INFO_OUTPUT | |
| 3526 | 3526 | ++ iNalIdxInLayer; |
| 3527 | 3527 | ++ iSliceIdx; |
| 3528 | 3528 | } |
| @@ -3758,7 +3758,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, void* pDst, const SSourcePictur · 229 unmodified lines | ||
| 3758 | 3758 | |
| 3759 | 3759 | #if defined(X86_ASM) |
| 3760 | 3760 | WelsEmms(); |
| 3761 | −#endif //X86_ASM | |
| 3761 | +#endif //X86_ASM | |
| 3762 | 3762 | |
| 3763 | 3763 | return eFrameType; |
| 3764 | 3764 | } |