History

fix low memory crash issue

huili2 committed 9 years ago

Commit d1c0a931 parent 48c2fe116 files · +401 −386Browse files

Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 16 files). Show all

Unified · Split

codec/encoder/plus/src/welsEncoderExt.cpp+2−2
@@ -382,8 +382,6 @@ int CWelsH264SVCEncoder::EncodeFrame (const SSourcePicture* kpSrcPic, SFrameBSIn · 381 unmodified lines
382 const int32_t kiEncoderReturn = EncodeFrameInternal (kpSrcPic, pBsInfo);382 const int32_t kiEncoderReturn = EncodeFrameInternal (kpSrcPic, pBsInfo);
383 383
384 if (kiEncoderReturn != cmResultSuccess) {384 if (kiEncoderReturn != cmResultSuccess) {
385 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_DEBUG,
386 "CWelsH264SVCEncoder::EncodeFrame() not succeed, err=%d", kiEncoderReturn);
387 return kiEncoderReturn;385 return kiEncoderReturn;
388 }386 }
389 387
@@ -404,6 +402,8 @@ int CWelsH264SVCEncoder ::EncodeFrameInternal (const SSourcePicture* pSrcPic, S · 14 unmodified lines
404 402
405 if ((kiEncoderReturn == ENC_RETURN_MEMALLOCERR) || (kiEncoderReturn == ENC_RETURN_MEMOVERFLOWFOUND)403 if ((kiEncoderReturn == ENC_RETURN_MEMALLOCERR) || (kiEncoderReturn == ENC_RETURN_MEMOVERFLOWFOUND)
406 || (kiEncoderReturn == ENC_RETURN_VLCOVERFLOWFOUND)) {404 || (kiEncoderReturn == ENC_RETURN_VLCOVERFLOWFOUND)) {
405 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_DEBUG, "CWelsH264SVCEncoder::EncodeFrame() not succeed, err=%d",
406 kiEncoderReturn);
407 WelsUninitEncoderExt (&m_pEncContext);407 WelsUninitEncoderExt (&m_pEncContext);
408 return cmMallocMemeError;408 return cmMallocMemeError;
409 } else if ((kiEncoderReturn != ENC_RETURN_SUCCESS) && (kiEncoderReturn == ENC_RETURN_CORRECTED)) {409 } else if ((kiEncoderReturn != ENC_RETURN_SUCCESS) && (kiEncoderReturn == ENC_RETURN_CORRECTED)) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t