generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2192 from sijchen/fix_slc

Browse Source 
[Encoder] change an improper setting of max_slice_count
This commit is contained in:
HaiboZhu 2015-10-29 14:17:26 +08:00
commit 17934b9843
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
codec/encoder/core/src/encoder_ext.cpp
View File

@ -2286,11 +2286,11 @@ int32_t InitSliceSettings (SLogContext* pLogCtx, SWelsSvcCodingParam* pCodingPar
iMaxSliceCount = iSliceNum; iMaxSliceCount = iSliceNum;
break; break;
case SM_AUTO_SLICE: case SM_AUTO_SLICE:
iMaxSliceCount = MAX_SLICES_NUM;
pDlp->sSliceCfg.sSliceArgument.uiSliceNum = kiCpuCores; pDlp->sSliceCfg.sSliceArgument.uiSliceNum = kiCpuCores;
if (pDlp->sSliceCfg.sSliceArgument.uiSliceNum > iMaxSliceCount) { if (pDlp->sSliceCfg.sSliceArgument.uiSliceNum > MAX_SLICES_NUM) {
pDlp->sSliceCfg.sSliceArgument.uiSliceNum = iMaxSliceCount; pDlp->sSliceCfg.sSliceArgument.uiSliceNum = MAX_SLICES_NUM;
} }
iMaxSliceCount = WELS_MAX(iMaxSliceCount, pDlp->sSliceCfg.sSliceArgument.uiSliceNum);
if (pDlp->sSliceCfg.sSliceArgument.uiSliceNum == 1) { if (pDlp->sSliceCfg.sSliceArgument.uiSliceNum == 1) {
WelsLog (pLogCtx, WELS_LOG_DEBUG, WelsLog (pLogCtx, WELS_LOG_DEBUG,
"InitSliceSettings(), uiSliceNum(%d) you set for SM_AUTO_SLICE, now turn to SM_SINGLE_SLICE type!", "InitSliceSettings(), uiSliceNum(%d) you set for SM_AUTO_SLICE, now turn to SM_SINGLE_SLICE type!",