use the predict point to do SATD cost instead of colocated MB SATD commit 4b6c833702abdbb504734fe6d7914997b4d22412 Author: ruil2 <ruil2@cisco.com> Date: Mon Oct 30 15:52:29 2017 +0800 refine complexity_mode
Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 7 files). Show all
Unified · Split
| @@ -271,7 +271,7 @@ int32_t ParamValidation (SLogContext* pLogCtx, SWelsSvcCodingParam* pCfg) { · 270 unmodified lines | |||
| 271 | 271 | ||
| 272 | assert (pCfg != NULL); | 272 | assert (pCfg != NULL); |
| 273 | 273 | ||
| 274 | if (!(pCfg->iUsageType < INPUT_CONTENT_TYPE_ALL)) { | 274 | if (! (pCfg->iUsageType < INPUT_CONTENT_TYPE_ALL)) { |
| 275 | WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidation(),Invalid usage type = %d", pCfg->iUsageType); | 275 | WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidation(),Invalid usage type = %d", pCfg->iUsageType); |
| 276 | return ENC_RETURN_UNSUPPORTED_PARA; | 276 | return ENC_RETURN_UNSUPPORTED_PARA; |
| 277 | } | 277 | } |
| @@ -2639,9 +2639,7 @@ bool SetMeMethod (const uint8_t uiMethod, PSearchMethodFunc& pSearchMethodFunc) · 2361 unmodified lines | |||
| 2639 | void PreprocessSliceCoding (sWelsEncCtx* pCtx) { | 2639 | void PreprocessSliceCoding (sWelsEncCtx* pCtx) { |
| 2640 | SDqLayer* pCurLayer = pCtx->pCurDqLayer; | 2640 | SDqLayer* pCurLayer = pCtx->pCurDqLayer; |
| 2641 | //const bool kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag; | 2641 | //const bool kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag; |
| 2642 | const bool kbHighestSpatialLayer = | 2642 | bool bFastMode = (pCtx->pSvcParam->iComplexityMode == LOW_COMPLEXITY); |
| 2643 | (pCtx->pSvcParam->iSpatialLayerNum == (pCurLayer->sLayerInfo.sNalHeaderExt.uiDependencyId + 1)); | ||
| 2644 | bool bFastMode = kbHighestSpatialLayer && (pCtx->pSvcParam->iComplexityMode == LOW_COMPLEXITY); | ||
| 2645 | SWelsFuncPtrList* pFuncList = pCtx->pFuncList; | 2643 | SWelsFuncPtrList* pFuncList = pCtx->pFuncList; |
| 2646 | SLogContext* pLogCtx = & (pCtx->sLogCtx); | 2644 | SLogContext* pLogCtx = & (pCtx->sLogCtx); |
| 2647 | /* function pointers conditional assignment under sWelsEncCtx, layer_mb_enc_rec (in stack) is exclusive */ | 2645 | /* function pointers conditional assignment under sWelsEncCtx, layer_mb_enc_rec (in stack) is exclusive */ |