[Encoder] change an improper setting of max_slice_count
Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 1 file). Show all
Unified · Split
| @@ -2286,11 +2286,11 @@ int32_t InitSliceSettings (SLogContext* pLogCtx, SWelsSvcCodingParam* pCodingPar · 2285 unmodified lines | |||
| 2286 | iMaxSliceCount = iSliceNum; | 2286 | iMaxSliceCount = iSliceNum; |
| 2287 | break; | 2287 | break; |
| 2288 | case SM_AUTO_SLICE: | 2288 | case SM_AUTO_SLICE: |
| 2289 | iMaxSliceCount = MAX_SLICES_NUM; | ||
| 2290 | pDlp->sSliceCfg.sSliceArgument.uiSliceNum = kiCpuCores; | 2289 | pDlp->sSliceCfg.sSliceArgument.uiSliceNum = kiCpuCores; |
| 2291 | if (pDlp->sSliceCfg.sSliceArgument.uiSliceNum > iMaxSliceCount) { | 2290 | if (pDlp->sSliceCfg.sSliceArgument.uiSliceNum > MAX_SLICES_NUM) { |
| 2292 | pDlp->sSliceCfg.sSliceArgument.uiSliceNum = iMaxSliceCount; | 2291 | pDlp->sSliceCfg.sSliceArgument.uiSliceNum = MAX_SLICES_NUM; |
| 2293 | } | 2292 | } |
| 2293 | iMaxSliceCount = WELS_MAX(iMaxSliceCount, pDlp->sSliceCfg.sSliceArgument.uiSliceNum); | ||
| 2294 | if (pDlp->sSliceCfg.sSliceArgument.uiSliceNum == 1) { | 2294 | if (pDlp->sSliceCfg.sSliceArgument.uiSliceNum == 1) { |
| 2295 | WelsLog (pLogCtx, WELS_LOG_DEBUG, | 2295 | WelsLog (pLogCtx, WELS_LOG_DEBUG, |
| 2296 | "InitSliceSettings(), uiSliceNum(%d) you set for SM_AUTO_SLICE, now turn to SM_SINGLE_SLICE type!", | 2296 | "InitSliceSettings(), uiSliceNum(%d) you set for SM_AUTO_SLICE, now turn to SM_SINGLE_SLICE type!", |