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

misaligned_rc_structure

Browse Source
This commit is contained in:
huili2 2014-06-19 17:59:40 -07:00
parent 0dcb7584b5
commit dc56892d72
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
codec/encoder/core/src/ratectl.cpp
View File

@ -74,6 +74,8 @@ void RcInitLayerMemory (SWelsSvcRc* pWelsSvcRc, CMemoryAlign* pMA, const int32_t
if (NULL == pBaseMem) if (NULL == pBaseMem)
return; return;
pWelsSvcRc->pTemporalOverRc = (SRCTemporal*)pBaseMem;
pBaseMem += sizeof (SRCTemporal) * kiMaxTl;
pWelsSvcRc->pGomComplexity = (double*)pBaseMem; pWelsSvcRc->pGomComplexity = (double*)pBaseMem;
pBaseMem += kiGomSizeD; pBaseMem += kiGomSizeD;
pWelsSvcRc->pGomForegroundBlockNum = (int32_t*)pBaseMem; pWelsSvcRc->pGomForegroundBlockNum = (int32_t*)pBaseMem;
@ -81,8 +83,6 @@ void RcInitLayerMemory (SWelsSvcRc* pWelsSvcRc, CMemoryAlign* pMA, const int32_t
pWelsSvcRc->pCurrentFrameGomSad = (int32_t*)pBaseMem; pWelsSvcRc->pCurrentFrameGomSad = (int32_t*)pBaseMem;
pBaseMem += kiGomSizeI; pBaseMem += kiGomSizeI;
pWelsSvcRc->pGomCost = (int32_t*)pBaseMem; pWelsSvcRc->pGomCost = (int32_t*)pBaseMem;
pBaseMem += kiGomSizeI;
pWelsSvcRc->pTemporalOverRc = (SRCTemporal*)pBaseMem;
pWelsSvcRc->pSlicingOverRc = (SRCSlicing*)pMA->WelsMalloc (sizeof (SRCSlicing) * kiSliceNum, "SlicingOverRC"); pWelsSvcRc->pSlicingOverRc = (SRCSlicing*)pMA->WelsMalloc (sizeof (SRCSlicing) * kiSliceNum, "SlicingOverRC");
} }
@ -92,13 +92,13 @@ void RcFreeLayerMemory (SWelsSvcRc* pWelsSvcRc, CMemoryAlign* pMA) {
pMA->WelsFree (pWelsSvcRc->pSlicingOverRc, "SlicingOverRC"); pMA->WelsFree (pWelsSvcRc->pSlicingOverRc, "SlicingOverRC");
pWelsSvcRc->pSlicingOverRc = NULL; pWelsSvcRc->pSlicingOverRc = NULL;
} }
if (pWelsSvcRc != NULL && pWelsSvcRc->pGomComplexity != NULL) { if (pWelsSvcRc != NULL && pWelsSvcRc->pTemporalOverRc != NULL) {
pMA->WelsFree (pWelsSvcRc->pGomComplexity, "rc_layer_memory"); pMA->WelsFree (pWelsSvcRc->pTemporalOverRc, "rc_layer_memory");
pWelsSvcRc->pTemporalOverRc = NULL;
pWelsSvcRc->pGomComplexity = NULL; pWelsSvcRc->pGomComplexity = NULL;
pWelsSvcRc->pGomForegroundBlockNum = NULL; pWelsSvcRc->pGomForegroundBlockNum = NULL;
pWelsSvcRc->pCurrentFrameGomSad = NULL; pWelsSvcRc->pCurrentFrameGomSad = NULL;
pWelsSvcRc->pGomCost = NULL; pWelsSvcRc->pGomCost = NULL;
pWelsSvcRc->pTemporalOverRc = NULL;
} }
} }