Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 4 files). Show all
Unified · Split
| @@ -2123,9 +2123,9 @@ int32_t WelsInitEncoderExt (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPar · 2122 unmodified lines | |||
| 2123 | } | 2123 | } |
| 2124 | 2124 | ||
| 2125 | #if defined(MEMORY_MONITOR) | 2125 | #if defined(MEMORY_MONITOR) |
| 2126 | WelsLog (pCtx, WELS_LOG_INFO, "WelsInitEncoderExt() exit, overall memory usage: %u bytes\n", | 2126 | WelsLog (pCtx, WELS_LOG_INFO, "WelsInitEncoderExt() exit, overall memory usage: %zu bytes\n", |
| 2127 | (unsigned int) (sizeof (sWelsEncCtx) /* requested size from malloc() or new operator */ | 2127 | sizeof (sWelsEncCtx) /* requested size from malloc() or new operator */ |
| 2128 | + pCtx->pMemAlign->WelsGetMemoryUsage()) /* requested size from CMemoryAlign::WelsMalloc() */ | 2128 | + pCtx->pMemAlign->WelsGetMemoryUsage() /* requested size from CMemoryAlign::WelsMalloc() */ |
| 2129 | ); | 2129 | ); |
| 2130 | #endif//MEMORY_MONITOR | 2130 | #endif//MEMORY_MONITOR |
| 2131 | 2131 | ||
| @@ -2944,7 +2944,7 @@ int32_t WritePadding (sWelsEncCtx* pCtx, int32_t iLen) { · 812 unmodified lines | |||
| 2944 | #if GOM_TRACE_FLAG | 2944 | #if GOM_TRACE_FLAG |
| 2945 | WelsLog (pCtx, WELS_LOG_ERROR, | 2945 | WelsLog (pCtx, WELS_LOG_ERROR, |
| 2946 | "[RC] paddingcal pBuffer overflow, bufferlen=%d, paddinglen=%d, iNalIdx= %d, iCountNals= %d\n", | 2946 | "[RC] paddingcal pBuffer overflow, bufferlen=%d, paddinglen=%d, iNalIdx= %d, iCountNals= %d\n", |
| 2947 | (pBs->pBufEnd - pBs->pBufPtr), iLen, iNal, pCtx->pOut->iCountNals); | 2947 | static_cast<int>(pBs->pBufEnd - pBs->pBufPtr), iLen, iNal, pCtx->pOut->iCountNals); |
| 2948 | #endif | 2948 | #endif |
| 2949 | return 0; | 2949 | return 0; |
| 2950 | } | 2950 | } |