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

Merge pull request #2074 from HaiboZhu/Bugfix_max_ref_pic_count_error

Browse Source 
Bug fix about RefList size memory access violation
This commit is contained in:
zhilwang 2015-08-14 15:44:21 +08:00
commit 8a96d06fa2
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
codec/decoder/core/inc/decoder_context.h
View File

@ -143,9 +143,9 @@ typedef void (*PGetIntraPred8x8Func) (uint8_t* pPred, const int32_t kiLumaStride
/**/ /**/
typedef struct TagRefPic { typedef struct TagRefPic {
PPicture pRefList[LIST_A][MAX_REF_PIC_COUNT]; // reference picture marking plus FIFO scheme PPicture pRefList[LIST_A][MAX_DPB_COUNT]; // reference picture marking plus FIFO scheme
PPicture pShortRefList[LIST_A][MAX_SHORT_REF_COUNT]; PPicture pShortRefList[LIST_A][MAX_DPB_COUNT];
PPicture pLongRefList[LIST_A][MAX_LONG_REF_COUNT]; PPicture pLongRefList[LIST_A][MAX_DPB_COUNT];
uint8_t uiRefCount[LIST_A]; uint8_t uiRefCount[LIST_A];
uint8_t uiShortRefCount[LIST_A]; uint8_t uiShortRefCount[LIST_A];
uint8_t uiLongRefCount[LIST_A]; // dependend on ref pic module uint8_t uiLongRefCount[LIST_A]; // dependend on ref pic module

1
codec/decoder/core/inc/wels_const.h
View File

@ -46,6 +46,7 @@
#define MIN_REF_PIC_COUNT 1 // minimal count number of reference pictures, 1 short + 2 key reference based? #define MIN_REF_PIC_COUNT 1 // minimal count number of reference pictures, 1 short + 2 key reference based?
#define MAX_SHORT_REF_COUNT 16 // maximal count number of short reference pictures #define MAX_SHORT_REF_COUNT 16 // maximal count number of short reference pictures
#define MAX_LONG_REF_COUNT 16 // maximal count number of long reference pictures #define MAX_LONG_REF_COUNT 16 // maximal count number of long reference pictures
#define MAX_DPB_COUNT (MAX_REF_PIC_COUNT + 1) // 1 additional position for re-order and other process
#define MAX_MMCO_COUNT 66 #define MAX_MMCO_COUNT 66

10
codec/decoder/core/src/manage_dec_ref.cpp
View File

@ -89,7 +89,7 @@ void WelsResetRefPic (PWelsDecoderContext pCtx) {
pRefPic->uiRefCount[LIST_0] = 0; pRefPic->uiRefCount[LIST_0] = 0;
for (i = 0; i < MAX_SHORT_REF_COUNT; i++) { for (i = 0; i < MAX_DPB_COUNT; i++) {
if (pRefPic->pShortRefList[LIST_0][i] != NULL) { if (pRefPic->pShortRefList[LIST_0][i] != NULL) {
SetUnRef (pRefPic->pShortRefList[LIST_0][i]); SetUnRef (pRefPic->pShortRefList[LIST_0][i]);
pRefPic->pShortRefList[LIST_0][i] = NULL; pRefPic->pShortRefList[LIST_0][i] = NULL;
@ -97,7 +97,7 @@ void WelsResetRefPic (PWelsDecoderContext pCtx) {
} }
pRefPic->uiShortRefCount[LIST_0] = 0; pRefPic->uiShortRefCount[LIST_0] = 0;
for (i = 0; i < MAX_LONG_REF_COUNT; i++) { for (i = 0; i < MAX_DPB_COUNT; i++) {
if (pRefPic->pLongRefList[LIST_0][i] != NULL) { if (pRefPic->pLongRefList[LIST_0][i] != NULL) {
SetUnRef (pRefPic->pLongRefList[LIST_0][i]); SetUnRef (pRefPic->pLongRefList[LIST_0][i]);
pRefPic->pLongRefList[LIST_0][i] = NULL; pRefPic->pLongRefList[LIST_0][i] = NULL;
@ -158,7 +158,7 @@ int32_t WelsInitRefList (PWelsDecoderContext pCtx, int32_t iPoc) {
PPicture* ppShoreRefList = pCtx->sRefPic.pShortRefList[LIST_0]; PPicture* ppShoreRefList = pCtx->sRefPic.pShortRefList[LIST_0];
PPicture* ppLongRefList = pCtx->sRefPic.pLongRefList[LIST_0]; PPicture* ppLongRefList = pCtx->sRefPic.pLongRefList[LIST_0];
memset (pCtx->sRefPic.pRefList[LIST_0], 0, MAX_REF_PIC_COUNT * sizeof (PPicture)); memset (pCtx->sRefPic.pRefList[LIST_0], 0, MAX_DPB_COUNT * sizeof (PPicture));
//short //short
for (i = 0; i < pCtx->sRefPic.uiShortRefCount[LIST_0]; ++i) { for (i = 0; i < pCtx->sRefPic.uiShortRefCount[LIST_0]; ++i) {
pCtx->sRefPic.pRefList[LIST_0][iCount++ ] = ppShoreRefList[i]; pCtx->sRefPic.pRefList[LIST_0][iCount++ ] = ppShoreRefList[i];
@ -179,7 +179,7 @@ int32_t WelsReorderRefList (PWelsDecoderContext pCtx) {
PSliceHeader pSliceHeader = &pCtx->pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader; PSliceHeader pSliceHeader = &pCtx->pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader;
PPicture pPic = NULL; PPicture pPic = NULL;
PPicture* ppRefList = pCtx->sRefPic.pRefList[LIST_0]; PPicture* ppRefList = pCtx->sRefPic.pRefList[LIST_0];
int32_t iMaxRefIdx = pCtx->pSps->iNumRefFrames + 1; int32_t iMaxRefIdx = pCtx->pSps->iNumRefFrames;
int32_t iRefCount = pCtx->sRefPic.uiRefCount[LIST_0]; int32_t iRefCount = pCtx->sRefPic.uiRefCount[LIST_0];
int32_t iPredFrameNum = pSliceHeader->iFrameNum; int32_t iPredFrameNum = pSliceHeader->iFrameNum;
int32_t iMaxPicNum = 1 << pSliceHeader->pSps->uiLog2MaxFrameNum; int32_t iMaxPicNum = 1 << pSliceHeader->pSps->uiLog2MaxFrameNum;
@ -251,7 +251,7 @@ int32_t WelsReorderRefList (PWelsDecoderContext pCtx) {
(i - iReorderingIndex)*sizeof (PPicture)); //confirmed_safe_unsafe_usage (i - iReorderingIndex)*sizeof (PPicture)); //confirmed_safe_unsafe_usage
} else if (i < iReorderingIndex) { } else if (i < iReorderingIndex) {
memmove (&ppRefList[1 + iReorderingIndex], &ppRefList[iReorderingIndex], memmove (&ppRefList[1 + iReorderingIndex], &ppRefList[iReorderingIndex],
(iMaxRefIdx - 1 - iReorderingIndex)*sizeof (PPicture)); (iMaxRefIdx - iReorderingIndex)*sizeof (PPicture));
} }
ppRefList[iReorderingIndex] = pPic; ppRefList[iReorderingIndex] = pPic;
iReorderingIndex++; iReorderingIndex++;