shithub: openh264

Info  •  Files  •  Log  •  Branches

Multi-thread-fixed:RBC#1689:refactoring for RcCalculateGomQp etc. functions

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

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

@@ -3786,6 +3786,9 @@

         //TO DO: add update ppSliceInLayer module based on pSliceInThread[ThreadNum]

         // UpdateSliceInLayerInfo(); // reordering

+        //TO DO: add update ppSliceInLayer module based on pSliceInThread[ThreadNum]

+        // UpdateSliceInLayerInfo(); // reordering

+

         iLayerSize = AppendSliceToFrameBs (pCtx, pLayerBsInfo, kiPartitionCnt);

       } else { // for non-dynamic-slicing mode single threading branch..

         const bool bNeedPrefix = pCtx->bNeedPrefixNalFlag;

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

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

@@ -626,10 +626,9 @@

   memset (pWelsSvcRc->pGomCost, 0, pWelsSvcRc->iGomSize * sizeof (int32_t));

 }

-void RcCalculateMbQp (sWelsEncCtx* pEncCtx, SMB* pCurMb, const int32_t kiSliceId) {

-  SSlice** ppSliceInLayer       = pEncCtx->pCurDqLayer->ppSliceInLayer;

+void RcCalculateMbQp (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb) {

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

-  SRCSlicing* pSOverRc          = &ppSliceInLayer[kiSliceId]->sSlicingOverRc;

+  SRCSlicing* pSOverRc          = &pSlice->sSlicingOverRc;

   int32_t iLumaQp               = pSOverRc->iCalculatedQpSlice;

   SDqLayer* pCurLayer           = pEncCtx->pCurDqLayer;

@@ -666,11 +665,10 @@

     return NULL;

 }

-void RcGomTargetBits (sWelsEncCtx* pEncCtx, const int32_t kiSliceId) {

-  SSlice** ppSliceInLayer       = pEncCtx->pCurDqLayer->ppSliceInLayer;

+void RcGomTargetBits (sWelsEncCtx* pEncCtx, SSlice* pSlice) {

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

   SWelsSvcRc* pWelsSvcRc_Base   = NULL;

-  SRCSlicing* pSOverRc          = &ppSliceInLayer[kiSliceId]->sSlicingOverRc;

+  SRCSlicing* pSOverRc          = &pSlice->sSlicingOverRc;

   int32_t iAllocateBits = 0;

   int32_t iSumSad = 0;

@@ -702,12 +700,9 @@

   pSOverRc->iGomTargetBits = iAllocateBits;

 }

-

-

-void RcCalculateGomQp (sWelsEncCtx* pEncCtx, SMB* pCurMb, int32_t iSliceId) {

-  SSlice** ppSliceInLayer   = pEncCtx->pCurDqLayer->ppSliceInLayer;

+void RcCalculateGomQp (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb) {

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

-  SRCSlicing* pSOverRc      = &ppSliceInLayer[iSliceId]->sSlicingOverRc;

+  SRCSlicing* pSOverRc      = &pSlice->sSlicingOverRc;

   int64_t iBitsRatio        = 1;

   int64_t iLeftBits         = pSOverRc->iTargetBitsSlice - pSOverRc->iFrameBitsSlice;

@@ -1204,12 +1199,12 @@

     if (0 == (pCurMb->iMbXY % pWelsSvcRc->iNumberMbGom)) {

       if (pCurMb->iMbXY != pSOverRc->iStartMbSlice) {

         pSOverRc->iComplexityIndexSlice++;

-        RcCalculateGomQp (pEncCtx, pCurMb, kiSliceId);

+        RcCalculateGomQp (pEncCtx, pSlice, pCurMb);

       }

-      RcGomTargetBits (pEncCtx, kiSliceId);

+      RcGomTargetBits (pEncCtx, pSlice);

     }

-    RcCalculateMbQp (pEncCtx, pCurMb, kiSliceId);

+    RcCalculateMbQp (pEncCtx, pSlice, pCurMb);

   } else {

     pCurMb->uiLumaQp   = pEncCtx->iGlobalQp;

     pCurMb->uiChromaQp = g_kuiChromaQpTable[CLIP3_QP_0_51 (pCurMb->uiLumaQp + kuiChromaQpIndexOffset)];

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

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

@@ -1112,6 +1112,7 @@

   memcpy (&pSHExt->sSliceHeader.sRefMarking, &pBaseSHExt->sSliceHeader.sRefMarking, sizeof (SRefPicMarking));

   memcpy (&pSHExt->sSliceHeader.sRefReordering, &pBaseSHExt->sSliceHeader.sRefReordering,

           sizeof (SRefPicListReorderSyntax));

+

 }

 static inline int32_t InitSliceRC (SSlice* pSlice, const int32_t kiGlobalQp, const int32_t kiBitsPerMb) {