One bool typedef is already more than enough, two is too many.
Showing the changes to codec/encoder/core/src/slice_multi_threading.cpp (1 of 24 files). Show all
Unified · Split
| @@ -81,10 +81,10 @@ void UpdateMbListNeighborParallel (SSliceCtx* pSliceCtx, · 80 unmodified lines | |||
| 81 | const int32_t kiMbXY = pMb->iMbXY; | 81 | const int32_t kiMbXY = pMb->iMbXY; |
| 82 | const int32_t kiMbX = pMb->iMbX; | 82 | const int32_t kiMbX = pMb->iMbX; |
| 83 | const int32_t kiMbY = pMb->iMbY; | 83 | const int32_t kiMbY = pMb->iMbY; |
| 84 | BOOL_T bLeft; | 84 | bool_t bLeft; |
| 85 | BOOL_T bTop; | 85 | bool_t bTop; |
| 86 | BOOL_T bLeftTop; | 86 | bool_t bLeftTop; |
| 87 | BOOL_T bRightTop; | 87 | bool_t bRightTop; |
| 88 | int32_t iLeftXY, iTopXY, iLeftTopXY, iRightTopXY; | 88 | int32_t iLeftXY, iTopXY, iLeftTopXY, iRightTopXY; |
| 89 | 89 | ||
| 90 | iLeftXY = kiMbXY - 1; | 90 | iLeftXY = kiMbXY - 1; |
| @@ -688,7 +688,7 @@ int32_t AppendSliceToFrameBs (sWelsEncCtx* pCtx, SLayerBSInfo* pLbi, const int32 · 597 unmodified lines | |||
| 688 | SWelsSvcCodingParam* pCodingParam = pCtx->pSvcParam; | 688 | SWelsSvcCodingParam* pCodingParam = pCtx->pSvcParam; |
| 689 | SDLayerParam* pDlp = &pCodingParam->sDependencyLayers[pCtx->uiDependencyId]; | 689 | SDLayerParam* pDlp = &pCodingParam->sDependencyLayers[pCtx->uiDependencyId]; |
| 690 | SWelsSliceBs* pSliceBs = NULL; | 690 | SWelsSliceBs* pSliceBs = NULL; |
| 691 | const BOOL_T kbIsDynamicSlicingMode = (pDlp->sMso.uiSliceMode == SM_DYN_SLICE); | 691 | const bool_t kbIsDynamicSlicingMode = (pDlp->sMso.uiSliceMode == SM_DYN_SLICE); |
| 692 | int32_t iLayerSize = 0; | 692 | int32_t iLayerSize = 0; |
| 693 | int32_t iNalIdxBase = pLbi->iNalCount; | 693 | int32_t iNalIdxBase = pLbi->iNalCount; |
| 694 | int32_t iSliceIdx = 0; | 694 | int32_t iSliceIdx = 0; |
| @@ -1252,10 +1252,10 @@ void ResetCountBsSizeInPartitions (uint32_t* pCountBsSizeList, const int32_t iPa · 557 unmodified lines | |||
| 1252 | 1252 | ||
| 1253 | #ifdef _WIN32 | 1253 | #ifdef _WIN32 |
| 1254 | int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT* pEventsList, SLayerBSInfo* pLbi, | 1254 | int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT* pEventsList, SLayerBSInfo* pLbi, |
| 1255 | const uint32_t uiNumThreads, SSliceCtx* pSliceCtx, const BOOL_T bIsDynamicSlicingMode) | 1255 | const uint32_t uiNumThreads, SSliceCtx* pSliceCtx, const bool_t bIsDynamicSlicingMode) |
| 1256 | #else | 1256 | #else |
| 1257 | int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT** pEventsList, SLayerBSInfo* pLbi, | 1257 | int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT** pEventsList, SLayerBSInfo* pLbi, |
| 1258 | const uint32_t uiNumThreads, SSliceCtx* pSliceCtx, const BOOL_T bIsDynamicSlicingMode) | 1258 | const uint32_t uiNumThreads, SSliceCtx* pSliceCtx, const bool_t bIsDynamicSlicingMode) |
| 1259 | #endif//WIN32 | 1259 | #endif//WIN32 |
| 1260 | { | 1260 | { |
| 1261 | int32_t iEndMbIdx = 0; | 1261 | int32_t iEndMbIdx = 0; |
| @@ -1376,7 +1376,7 @@ int32_t AdjustEnhanceLayer (sWelsEncCtx* pCtx, int32_t iCurDid) { · 114 unmodified lines | |||
| 1376 | int32_t iNeedAdj = 1; | 1376 | int32_t iNeedAdj = 1; |
| 1377 | // uiSliceMode of referencing spatial should be SM_FIXEDSLCNUM_SLICE | 1377 | // uiSliceMode of referencing spatial should be SM_FIXEDSLCNUM_SLICE |
| 1378 | // if using spatial base layer for complexity estimation | 1378 | // if using spatial base layer for complexity estimation |
| 1379 | const BOOL_T kbModelingFromSpatial = (pCtx->pCurDqLayer->pRefLayer != NULL && iCurDid > 0) | 1379 | const bool_t kbModelingFromSpatial = (pCtx->pCurDqLayer->pRefLayer != NULL && iCurDid > 0) |
| 1380 | && (pCtx->pSvcParam->sDependencyLayers[iCurDid - 1].sMso.uiSliceMode == SM_FIXEDSLCNUM_SLICE | 1380 | && (pCtx->pSvcParam->sDependencyLayers[iCurDid - 1].sMso.uiSliceMode == SM_FIXEDSLCNUM_SLICE |
| 1381 | && pCtx->pSvcParam->iMultipleThreadIdc >= pCtx->pSvcParam->sDependencyLayers[iCurDid - | 1381 | && pCtx->pSvcParam->iMultipleThreadIdc >= pCtx->pSvcParam->sDependencyLayers[iCurDid - |
| 1382 | 1].sMso.sSliceArgument.iSliceNum); | 1382 | 1].sMso.sSliceArgument.iSliceNum); |