Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 38 files). Show all
Unified · Split
| @@ -54,6 +54,7 @@ · 53 unmodified lines | |||
| 54 | #include "crt_util_safe_x.h" // Safe CRT routines like utils for cross platforms | 54 | #include "crt_util_safe_x.h" // Safe CRT routines like utils for cross platforms |
| 55 | #include "slice_multi_threading.h" | 55 | #include "slice_multi_threading.h" |
| 56 | #include "measure_time.h" | 56 | #include "measure_time.h" |
| 57 | #include "svc_set_mb_syn.h" | ||
| 57 | 58 | ||
| 58 | namespace WelsEnc { | 59 | namespace WelsEnc { |
| 59 | 60 | ||
| @@ -947,7 +948,7 @@ static inline int32_t InitDqLayers (sWelsEncCtx** ppCtx) { · 887 unmodified lines | |||
| 947 | } | 948 | } |
| 948 | 949 | ||
| 949 | // initialize pPps | 950 | // initialize pPps |
| 950 | WelsInitPps (pPps, pSps, pSubsetSps, iPpsId, true, bUseSubsetSps); | 951 | WelsInitPps (pPps, pSps, pSubsetSps, iPpsId, true, bUseSubsetSps,pParam->iEntropyCodingModeFlag); |
| 951 | 952 | ||
| 952 | // Not using FMO in SVC coding so far, come back if need FMO | 953 | // Not using FMO in SVC coding so far, come back if need FMO |
| 953 | { | 954 | { |
| @@ -2053,7 +2054,7 @@ int32_t WelsInitEncoderExt (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPar · 1099 unmodified lines | |||
| 2053 | FreeMemorySvc (&pCtx); | 2054 | FreeMemorySvc (&pCtx); |
| 2054 | return 1; | 2055 | return 1; |
| 2055 | } | 2056 | } |
| 2056 | InitFunctionPointers (pCtx->pFuncList, pCtx->pSvcParam, uiCpuFeatureFlags); | 2057 | InitFunctionPointers (pCtx, pCtx->pSvcParam, uiCpuFeatureFlags); |
| 2057 | 2058 | ||
| 2058 | pCtx->iActiveThreadsNum = pCodingParam->iCountThreadsNum; | 2059 | pCtx->iActiveThreadsNum = pCodingParam->iCountThreadsNum; |
| 2059 | pCtx->iMaxSliceCount = iSliceNum; | 2060 | pCtx->iMaxSliceCount = iSliceNum; |
| @@ -2067,6 +2068,8 @@ int32_t WelsInitEncoderExt (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPar · 7 unmodified lines | |||
| 2067 | if (pCodingParam->iMultipleThreadIdc > 1) | 2068 | if (pCodingParam->iMultipleThreadIdc > 1) |
| 2068 | iRet = CreateSliceThreads (pCtx); | 2069 | iRet = CreateSliceThreads (pCtx); |
| 2069 | 2070 | ||
| 2071 | if(pCodingParam->iEntropyCodingModeFlag) | ||
| 2072 | WelsCabacInit (pCtx); | ||
| 2070 | WelsRcInitModule (pCtx, pCtx->pSvcParam->iRCMode); | 2073 | WelsRcInitModule (pCtx, pCtx->pSvcParam->iRCMode); |
| 2071 | 2074 | ||
| 2072 | pCtx->pVpp = new CWelsPreProcess (pCtx); | 2075 | pCtx->pVpp = new CWelsPreProcess (pCtx); |