One bool typedef is already more than enough, two is too many.
Showing the changes to codec/encoder/core/src/svc_encode_slice.cpp (1 of 24 files). Show all
Unified · Split
| @@ -738,10 +738,10 @@ void UpdateMbNeighbourInfoForNextSlice (SSliceCtx* pSliceCtx, · 737 unmodified lines | |||
| 738 | const int32_t kiMbXY = pMb->iMbXY; | 738 | const int32_t kiMbXY = pMb->iMbXY; |
| 739 | const int32_t kiMbX = pMb->iMbX; | 739 | const int32_t kiMbX = pMb->iMbX; |
| 740 | const int32_t kiMbY = pMb->iMbY; | 740 | const int32_t kiMbY = pMb->iMbY; |
| 741 | BOOL_T bLeft; | 741 | bool_t bLeft; |
| 742 | BOOL_T bTop; | 742 | bool_t bTop; |
| 743 | BOOL_T bLeftTop; | 743 | bool_t bLeftTop; |
| 744 | BOOL_T bRightTop; | 744 | bool_t bRightTop; |
| 745 | int32_t iLeftXY, iTopXY, iLeftTopXY, iRightTopXY; | 745 | int32_t iLeftXY, iTopXY, iLeftTopXY, iRightTopXY; |
| 746 | const uint8_t kuiSliceIdc = WelsMbToSliceIdc (pSliceCtx, kiMbXY); | 746 | const uint8_t kuiSliceIdc = WelsMbToSliceIdc (pSliceCtx, kiMbXY); |
| 747 | 747 | ||
| @@ -819,7 +819,7 @@ void AddSliceBoundary (sWelsEncCtx* pEncCtx, SSlice* pCurSlice, SSliceCtx* pSlic · 71 unmodified lines | |||
| 819 | UpdateMbNeighbourInfoForNextSlice (pSliceCtx, pMbList, iFirstMbIdxOfNextSlice, kiLastMbIdxInPartition); | 819 | UpdateMbNeighbourInfoForNextSlice (pSliceCtx, pMbList, iFirstMbIdxOfNextSlice, kiLastMbIdxInPartition); |
| 820 | } | 820 | } |
| 821 | 821 | ||
| 822 | BOOL_T DynSlcJudgeSliceBoundaryStepBack (void* pCtx, void* pSlice, SSliceCtx* pSliceCtx, SMB* pCurMb, | 822 | bool_t DynSlcJudgeSliceBoundaryStepBack (void* pCtx, void* pSlice, SSliceCtx* pSliceCtx, SMB* pCurMb, |
| 823 | SDynamicSlicingStack* pDss) { | 823 | SDynamicSlicingStack* pDss) { |
| 824 | sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pCtx; | 824 | sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pCtx; |
| 825 | SSlice* pCurSlice = (SSlice*)pSlice; | 825 | SSlice* pCurSlice = (SSlice*)pSlice; |
| @@ -830,12 +830,12 @@ BOOL_T DynSlcJudgeSliceBoundaryStepBack (void* pCtx, void* pSlice, SSliceCtx* pS · 4 unmodified lines | |||
| 830 | const int32_t kiPartitaionId = pCurSlice->uiSliceIdx % kiActiveThreadsNum; | 830 | const int32_t kiPartitaionId = pCurSlice->uiSliceIdx % kiActiveThreadsNum; |
| 831 | const int32_t kiLastMbIdxInPartition = pEncCtx->pCurDqLayer->pLastMbIdxOfPartition[kiPartitaionId]; | 831 | const int32_t kiLastMbIdxInPartition = pEncCtx->pCurDqLayer->pLastMbIdxOfPartition[kiPartitaionId]; |
| 832 | 832 | ||
| 833 | const BOOL_T kbCurMbNotFirstMbOfCurSlice = (pSliceCtx->pOverallMbMap[iCurMbIdx] == | 833 | const bool_t kbCurMbNotFirstMbOfCurSlice = (pSliceCtx->pOverallMbMap[iCurMbIdx] == |
| 834 | pSliceCtx->pOverallMbMap[iCurMbIdx - 1]); | 834 | pSliceCtx->pOverallMbMap[iCurMbIdx - 1]); |
| 835 | const BOOL_T kbCurMbNotLastMbOfCurPartition = iCurMbIdx < kiLastMbIdxInPartition; | 835 | const bool_t kbCurMbNotLastMbOfCurPartition = iCurMbIdx < kiLastMbIdxInPartition; |
| 836 | const BOOL_T kbSliceNumNotExceedConstraint = pSliceCtx->iSliceNumInFrame < | 836 | const bool_t kbSliceNumNotExceedConstraint = pSliceCtx->iSliceNumInFrame < |
| 837 | pSliceCtx->iMaxSliceNumConstraint; /*tmp choice to avoid complex memory operation, 100520, to be modify*/ | 837 | pSliceCtx->iMaxSliceNumConstraint; /*tmp choice to avoid complex memory operation, 100520, to be modify*/ |
| 838 | const BOOL_T kbSliceNumReachConstraint = (pSliceCtx->iSliceNumInFrame == | 838 | const bool_t kbSliceNumReachConstraint = (pSliceCtx->iSliceNumInFrame == |
| 839 | pSliceCtx->iMaxSliceNumConstraint); | 839 | pSliceCtx->iMaxSliceNumConstraint); |
| 840 | 840 | ||
| 841 | if (pCurSlice->bDynamicSlicingSliceSizeCtrlFlag) | 841 | if (pCurSlice->bDynamicSlicingSliceSizeCtrlFlag) |