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

add dec memory check

Browse Source
This commit is contained in:
huili2
2015-06-16 10:27:07 +08:00
parent 9ecc671fc3
commit 3cb417f14a
12 changed files with 196 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
codec/decoder/core/src/pic_queue.cpp
View File

@@ -44,7 +44,7 @@
namespace WelsDec {
void FreePicture (PPicture pPic);
void FreePicture (PPicture pPic, CMemoryAlign* pMa);
///////////////////////////////////Recycled queue management for pictures///////////////////////////////////
@@ -68,8 +68,9 @@ PPicture AllocPicture (PWelsDecoderContext pCtx, const int32_t kiPicWidth, const
int32_t iPicChromaHeight = 0;
int32_t iLumaSize = 0;
int32_t iChromaSize = 0;
CMemoryAlign* pMa = pCtx->pMemAlign;
pPic = (PPicture) WelsMallocz (sizeof (SPicture), "PPicture");
pPic = (PPicture) pMa->WelsMallocz (sizeof (SPicture), "PPicture");
WELS_VERIFY_RETURN_IF (NULL, NULL == pPic);
memset (pPic, 0, sizeof (SPicture));
@@ -88,9 +89,9 @@ PPicture AllocPicture (PWelsDecoderContext pCtx, const int32_t kiPicWidth, const
pPic->iLinesize[0] = iPicWidth;
pPic->iLinesize[1] = pPic->iLinesize[2] = iPicChromaWidth;
} else {
pPic->pBuffer[0] = static_cast<uint8_t*> (WelsMallocz (iLumaSize /* luma */
+ (iChromaSize << 1) /* Cb,Cr */, "_pic->buffer[0]"));
WELS_VERIFY_RETURN_PROC_IF (NULL, NULL == pPic->pBuffer[0], FreePicture (pPic));
pPic->pBuffer[0] = static_cast<uint8_t*> (pMa->WelsMallocz (iLumaSize /* luma */
+ (iChromaSize << 1) /* Cb,Cr */, "_pic->buffer[0]"));
WELS_VERIFY_RETURN_PROC_IF (NULL, NULL == pPic->pBuffer[0], FreePicture (pPic, pMa));
memset (pPic->pBuffer[0], 128, (iLumaSize + (iChromaSize << 1)));
pPic->iLinesize[0] = iPicWidth;
@@ -110,14 +111,14 @@ PPicture AllocPicture (PWelsDecoderContext pCtx, const int32_t kiPicWidth, const
return pPic;
}
void FreePicture (PPicture pPic) {
void FreePicture (PPicture pPic, CMemoryAlign* pMa) {
if (NULL != pPic) {
if (pPic->pBuffer[0]) {
WelsFree (pPic->pBuffer[0], "pPic->pBuffer[0]");
pMa->WelsFree (pPic->pBuffer[0], "pPic->pBuffer[0]");
}
WelsFree (pPic, "pPic");
pMa->WelsFree (pPic, "pPic");
pPic = NULL;
}