Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 5 files). Show all
Unified · Split
| @@ -3150,7 +3150,6 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 3149 unmodified lines | |||
| 3150 | pFbi->uiTimeStamp = pSrcPic->uiTimeStamp; | 3150 | pFbi->uiTimeStamp = pSrcPic->uiTimeStamp; |
| 3151 | // perform csc/denoise/downsample/padding, generate spatial layers | 3151 | // perform csc/denoise/downsample/padding, generate spatial layers |
| 3152 | iSpatialNum = pCtx->pVpp->BuildSpatialPicList (pCtx, pSrcPic); | 3152 | iSpatialNum = pCtx->pVpp->BuildSpatialPicList (pCtx, pSrcPic); |
| 3153 | |||
| 3154 | if (pCtx->pFuncList->pfRc.pfWelsUpdateMaxBrWindowStatus) { | 3153 | if (pCtx->pFuncList->pfRc.pfWelsUpdateMaxBrWindowStatus) { |
| 3155 | pCtx->pFuncList->pfRc.pfWelsUpdateMaxBrWindowStatus (pCtx, iSpatialNum, pSrcPic->uiTimeStamp); | 3154 | pCtx->pFuncList->pfRc.pfWelsUpdateMaxBrWindowStatus (pCtx, iSpatialNum, pSrcPic->uiTimeStamp); |
| 3156 | } | 3155 | } |
| @@ -3319,15 +3318,16 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 162 unmodified lines | |||
| 3319 | #ifdef LONG_TERM_REF_DUMP | 3318 | #ifdef LONG_TERM_REF_DUMP |
| 3320 | DumpRef (pCtx); | 3319 | DumpRef (pCtx); |
| 3321 | #endif | 3320 | #endif |
| 3322 | if ((pSvcParam->iRCMode != RC_OFF_MODE)) | 3321 | |
| 3322 | if (pSvcParam->iRCMode != RC_OFF_MODE) | ||
| 3323 | pCtx->pVpp->AnalyzePictureComplexity (pCtx, pCtx->pEncPic, ((pCtx->eSliceType == P_SLICE) | 3323 | pCtx->pVpp->AnalyzePictureComplexity (pCtx, pCtx->pEncPic, ((pCtx->eSliceType == P_SLICE) |
| 3324 | && (pCtx->iNumRef0 > 0)) ? pCtx->pRefList0[0] : NULL, | 3324 | && (pCtx->iNumRef0 > 0)) ? pCtx->pRefList0[0] : NULL, |
| 3325 | iCurDid, (pCtx->eSliceType == P_SLICE) && (pSvcParam->bEnableBackgroundDetection)); | 3325 | iCurDid, (pCtx->eSliceType == P_SLICE) && pSvcParam->bEnableBackgroundDetection); |
| 3326 | WelsUpdateRefSyntax (pCtx, pCtx->iPOC, | 3326 | WelsUpdateRefSyntax (pCtx, pCtx->iPOC, |
| 3327 | eFrameType); //get reordering syntax used for writing slice header and transmit to encoder. | 3327 | eFrameType); //get reordering syntax used for writing slice header and transmit to encoder. |
| 3328 | PrefetchReferencePicture (pCtx, eFrameType); // update reference picture for current pDq layer | 3328 | PrefetchReferencePicture (pCtx, eFrameType); // update reference picture for current pDq layer |
| 3329 | 3329 | ||
| 3330 | pCtx->pFuncList->pfRc.pfWelsRcPictureInit (pCtx); | 3330 | pCtx->pFuncList->pfRc.pfWelsRcPictureInit (pCtx, pSrcPic->uiTimeStamp); |
| 3331 | PreprocessSliceCoding (pCtx); // MUST be called after pfWelsRcPictureInit() and WelsInitCurrentLayer() | 3331 | PreprocessSliceCoding (pCtx); // MUST be called after pfWelsRcPictureInit() and WelsInitCurrentLayer() |
| 3332 | 3332 | ||
| 3333 | //TODO Complexity Calculation here for screen content | 3333 | //TODO Complexity Calculation here for screen content |