shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #987 from ganyangbbl/rc_init_bug

fix rc initialize bug

--- a/codec/encoder/core/src/encoder_ext.cpp

+++ b/codec/encoder/core/src/encoder_ext.cpp

@@ -3789,9 +3789,15 @@

   memcpy (pSlcingOverRc, pCtx->pWelsSvcRc->pSlicingOverRc, sizeof (SRCSlicing) * iMaxSliceNumOld);

   uiSliceIdx = iMaxSliceNumOld;

   SRCSlicing* pSORC = &pSlcingOverRc[uiSliceIdx];

+  const int32_t kiBitsPerMb		= WELS_DIV_ROUND(pCtx->pWelsSvcRc->iTargetBits * INT_MULTIPLY, pCtx->pWelsSvcRc->iNumberMbFrame);

   while (uiSliceIdx < iMaxSliceNum) {

     pSORC->iComplexityIndexSlice = 0;

     pSORC->iCalculatedQpSlice = pCtx->iGlobalQp;

+    pSORC->iTotalQpSlice	= 0;

+    pSORC->iTotalMbSlice	= 0;

+    pSORC->iTargetBitsSlice = WELS_DIV_ROUND(kiBitsPerMb * pCurLayer->pSliceEncCtx->pCountMbNumInSlice[uiSliceIdx], INT_MULTIPLY);

+    pSORC->iFrameBitsSlice	= 0;

+    pSORC->iGomBitsSlice	= 0;

     pSORC ++;

     uiSliceIdx ++;

   }

--- a/codec/encoder/core/src/ratectl.cpp

+++ b/codec/encoder/core/src/ratectl.cpp

@@ -515,8 +515,8 @@

   SSliceCtx* pCurSliceCtx	= pEncCtx->pCurDqLayer->pSliceEncCtx;

   SWelsSvcRc* pWelsSvcRc			= &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];

   SRCSlicing* pSOverRc				= &pWelsSvcRc->pSlicingOverRc[0];

-  const int32_t kiSliceNum			= pCurSliceCtx->iSliceNumInFrame;

-  const int32_t kdBitsPerMb		= WELS_DIV_ROUND(pWelsSvcRc->iTargetBits * INT_MULTIPLY, pWelsSvcRc->iNumberMbFrame);

+  const int32_t kiSliceNum			= pWelsSvcRc->iSliceNum;

+  const int32_t kiBitsPerMb		= WELS_DIV_ROUND(pWelsSvcRc->iTargetBits * INT_MULTIPLY, pWelsSvcRc->iNumberMbFrame);

   for (int32_t i = 0; i < kiSliceNum; i++) {

     pSOverRc->iStartMbSlice	=

@@ -524,7 +524,7 @@

     pSOverRc->iEndMbSlice		+= (pCurSliceCtx->pCountMbNumInSlice[i] - 1);

     pSOverRc->iTotalQpSlice	= 0;

     pSOverRc->iTotalMbSlice	= 0;

-    pSOverRc->iTargetBitsSlice = WELS_DIV_ROUND(kdBitsPerMb * pCurSliceCtx->pCountMbNumInSlice[i], INT_MULTIPLY);

+    pSOverRc->iTargetBitsSlice = WELS_DIV_ROUND(kiBitsPerMb * pCurSliceCtx->pCountMbNumInSlice[i], INT_MULTIPLY);

     pSOverRc->iFrameBitsSlice	= 0;

     pSOverRc->iGomBitsSlice	= 0;

     ++ pSOverRc;