shithub: openh264

Download patch

ref: 32669bc9417a701f563967f2c24d3f4a10302ea8
parent: 1a7a3e246272b9c0a478e27f32951059f24a85c0
author: Sijia Chen <sijchen@cisco.com>
date: Wed Oct 28 09:54:36 EDT 2015 

change an improper setting of max_slice_count


--- a/codec/encoder/core/src/encoder_ext.cpp
+++ b/codec/encoder/core/src/encoder_ext.cpp
@@ -2286,11 +2286,11 @@
         iMaxSliceCount = iSliceNum;
       break;
     case SM_AUTO_SLICE:
-      iMaxSliceCount = MAX_SLICES_NUM;
       pDlp->sSliceCfg.sSliceArgument.uiSliceNum = kiCpuCores;
-      if (pDlp->sSliceCfg.sSliceArgument.uiSliceNum > iMaxSliceCount) {
-        pDlp->sSliceCfg.sSliceArgument.uiSliceNum = iMaxSliceCount;
+      if (pDlp->sSliceCfg.sSliceArgument.uiSliceNum > MAX_SLICES_NUM) {
+        pDlp->sSliceCfg.sSliceArgument.uiSliceNum = MAX_SLICES_NUM;
       }
+      iMaxSliceCount = WELS_MAX(iMaxSliceCount, pDlp->sSliceCfg.sSliceArgument.uiSliceNum);
       if (pDlp->sSliceCfg.sSliceArgument.uiSliceNum == 1) {
         WelsLog (pLogCtx, WELS_LOG_DEBUG,
                  "InitSliceSettings(), uiSliceNum(%d) you set for SM_AUTO_SLICE, now turn to SM_SINGLE_SLICE type!",