Showing the changes to codec/encoder/core/src/ratectl.cpp (1 of 20 files). Show all
Unified · Split
| @@ -114,7 +114,7 @@ void RcInitSequenceParameter (sWelsEncCtx* pEncCtx) { · 113 unmodified lines | ||
| 114 | 114 | fp_test_rc = fopen ("testRC.dat", "w"); |
| 115 | 115 | fp_vgop = fopen ("vgop.dat", "w"); |
| 116 | 116 | #endif |
| 117 | − for (j = 0; j < pEncCtx->pSvcParam->iNumDependencyLayer; j++) { | |
| 117 | + for (j = 0; j < pEncCtx->pSvcParam->iSpatialLayerNum; j++) { | |
| 118 | 118 | SSliceCtx* pSliceCtx = &pEncCtx->pSliceCtxList[j]; |
| 119 | 119 | pWelsSvcRc = &pEncCtx->pWelsSvcRc[j]; |
| 120 | 120 | pDLayerParam = &pEncCtx->pSvcParam->sDependencyLayers[j]; |
| @@ -167,9 +167,9 @@ void RcInitSequenceParameter (sWelsEncCtx* pEncCtx) { · 46 unmodified lines | ||
| 167 | 167 | |
| 168 | 168 | RcInitLayerMemory (pWelsSvcRc, pEncCtx->pMemAlign, 1 + pDLayerParam->iHighestTemporalId); |
| 169 | 169 | |
| 170 | − bMultiSliceMode = ((SM_RASTER_SLICE == pDLayerParam->sMso.uiSliceMode) || | |
| 171 | − (SM_ROWMB_SLICE == pDLayerParam->sMso.uiSliceMode) || | |
| 172 | − (SM_DYN_SLICE == pDLayerParam->sMso.uiSliceMode)); | |
| 170 | + bMultiSliceMode = ((SM_RASTER_SLICE == pDLayerParam->sSliceCfg.uiSliceMode) || | |
| 171 | + (SM_ROWMB_SLICE == pDLayerParam->sSliceCfg.uiSliceMode) || | |
| 172 | + (SM_DYN_SLICE == pDLayerParam->sSliceCfg.uiSliceMode)); | |
| 173 | 173 | if (bMultiSliceMode) |
| 174 | 174 | pWelsSvcRc->iNumberMbGom = pWelsSvcRc->iNumberMbFrame; |
| 175 | 175 | } |
| @@ -810,7 +810,7 @@ void WelsRcPictureInfoUpdateGom (void* pCtx, int32_t layer_size) { · 634 unmodified lines | ||
| 810 | 810 | |
| 811 | 811 | |
| 812 | 812 | if (pEncCtx->pSvcParam->bEnableFrameSkip && |
| 813 | − pEncCtx->uiDependencyId == pEncCtx->pSvcParam->iNumDependencyLayer - 1) { | |
| 813 | + pEncCtx->uiDependencyId == pEncCtx->pSvcParam->iSpatialLayerNum - 1) { | |
| 814 | 814 | RcVBufferCalculationSkip (pEncCtx); |
| 815 | 815 | } |
| 816 | 816 | |
| @@ -939,7 +939,7 @@ void WelsRcFreeMemory (void* pCtx) { · 122 unmodified lines | ||
| 939 | 939 | fclose (fp_vgop); |
| 940 | 940 | fp_vgop = NULL; |
| 941 | 941 | #endif |
| 942 | − for (i = 0; i < pEncCtx->pSvcParam->iNumDependencyLayer; i++) { | |
| 942 | + for (i = 0; i < pEncCtx->pSvcParam->iSpatialLayerNum; i++) { | |
| 943 | 943 | pWelsSvcRc = &pEncCtx->pWelsSvcRc[i]; |
| 944 | 944 | RcFreeLayerMemory (pWelsSvcRc, pEncCtx->pMemAlign); |
| 945 | 945 | } |