shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #2096 from ruil2/rc0

use individual iDecompositionStages for each spatial layer

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

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

@@ -3865,7 +3865,7 @@

   while (iSpatialIdx < iSpatialNum) {

     const int32_t iDidIdx       = (pSpatialIndexMap + iSpatialIdx)->iDid;       // get iDid

     SSpatialLayerConfig* pParam = &pSvcParam->sSpatialLayers[iDidIdx];

-

+    int32_t  iDecompositionStages = pSvcParam->sDependencyLayers[iSpatialIdx].iDecompositionStages;

     pCtx->uiDependencyId        = iCurDid = (int8_t)iDidIdx;

     pCtx->pVpp->AnalyzeSpatialPic (pCtx, iDidIdx);

@@ -3923,9 +3923,9 @@

     }

     if (iCurTid == 0 || pCtx->eSliceType == I_SLICE)

       eNalRefIdc = NRI_PRI_HIGHEST;

-    else if (iCurTid == pSvcParam->iDecompStages)

+    else if (iCurTid == iDecompositionStages)

       eNalRefIdc = NRI_PRI_LOWEST;

-    else if (1 + iCurTid == pSvcParam->iDecompStages)

+    else if (1 + iCurTid == iDecompositionStages)

       eNalRefIdc = NRI_PRI_LOW;

     else // more details for other temporal layers?

       eNalRefIdc = NRI_PRI_HIGHEST;