save memory usage and improve error return logic under VLCOVERFLOW

Sijia Chen committed 11 years ago

Commit e70621c1 parent a8ae1347 files · +63 −45Browse files

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

Unified · Split

codec/encoder/plus/src/welsEncoderExt.cpp+1−1

@@ -402,7 +402,7 @@ int CWelsH264SVCEncoder ::EncodeFrameInternal (const SSourcePicture* pSrcPic, S · 401 unmodified lines
402	402	const int32_t kiEncoderReturn = WelsEncoderEncodeExt (m_pEncContext, pBsInfo, pSrcPic);
403	403	const int64_t kiCurrentFrameMs = (WelsTime() - kiBeforeFrameUs) / 1000;
404	404
405		− if (kiEncoderReturn == ENC_RETURN_MEMALLOCERR) {
	405	+ if ((kiEncoderReturn == ENC_RETURN_MEMALLOCERR) \|\| (kiEncoderReturn == ENC_RETURN_MEMOVERFLOWFOUND) \|\| (kiEncoderReturn == ENC_RETURN_VLCOVERFLOWFOUND)) {
406	406	WelsUninitEncoderExt (&m_pEncContext);
407	407	return cmMallocMemeError;
408	408	} else if ((kiEncoderReturn != ENC_RETURN_SUCCESS) && (kiEncoderReturn == ENC_RETURN_CORRECTED)) {