bool is one of the built in, standard types in C++, there's no need for a typedef for it.
Showing the changes to codec/encoder/core/src/svc_encode_slice.cpp (1 of 82 files). Show all
Unified · Split
| @@ -598,7 +598,7 @@ void WelsISliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice) { //pMd + enc · 597 unmodified lines | |||
| 598 | //encapsulate two kinds of reconstruction: | 598 | //encapsulate two kinds of reconstruction: |
| 599 | // first. store base or highest Dependency Layer with only one quality (without CS RS reconstruction) | 599 | // first. store base or highest Dependency Layer with only one quality (without CS RS reconstruction) |
| 600 | // second. lower than highest Dependency Layer, and for every Dependency Layer with one quality layer(single layer) | 600 | // second. lower than highest Dependency Layer, and for every Dependency Layer with one quality layer(single layer) |
| 601 | void WelsPSliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool_t kbIsHighestDlayerFlag) { //pMd + encoding | 601 | void WelsPSliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool kbIsHighestDlayerFlag) { //pMd + encoding |
| 602 | const SSliceHeaderExt* kpShExt = &pSlice->sSliceHeaderExt; | 602 | const SSliceHeaderExt* kpShExt = &pSlice->sSliceHeaderExt; |
| 603 | const SSliceHeader* kpSh = &kpShExt->sSliceHeader; | 603 | const SSliceHeader* kpSh = &kpShExt->sSliceHeader; |
| 604 | const int32_t kiSliceFirstMbXY = kpSh->iFirstMbInSlice; | 604 | const int32_t kiSliceFirstMbXY = kpSh->iFirstMbInSlice; |
| @@ -613,7 +613,7 @@ void WelsPSliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool_t kbIsHi · 8 unmodified lines | |||
| 613 | WelsMdInterMbLoop (pEncCtx, pSlice, &sMd, kiSliceFirstMbXY); | 613 | WelsMdInterMbLoop (pEncCtx, pSlice, &sMd, kiSliceFirstMbXY); |
| 614 | } | 614 | } |
| 615 | 615 | ||
| 616 | void WelsPSliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool_t kbIsHighestDlayerFlag) { | 616 | void WelsPSliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool kbIsHighestDlayerFlag) { |
| 617 | const SSliceHeaderExt* kpShExt = &pSlice->sSliceHeaderExt; | 617 | const SSliceHeaderExt* kpShExt = &pSlice->sSliceHeaderExt; |
| 618 | const SSliceHeader* kpSh = &kpShExt->sSliceHeader; | 618 | const SSliceHeader* kpSh = &kpShExt->sSliceHeader; |
| 619 | const int32_t kiSliceFirstMbXY = kpSh->iFirstMbInSlice; | 619 | const int32_t kiSliceFirstMbXY = kpSh->iFirstMbInSlice; |
| @@ -631,8 +631,8 @@ void WelsPSliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool_t · 11 unmodified lines | |||
| 631 | void WelsCodePSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice) { | 631 | void WelsCodePSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice) { |
| 632 | //pSlice-level init should be outside and before this function | 632 | //pSlice-level init should be outside and before this function |
| 633 | SDqLayer* pCurLayer = pEncCtx->pCurDqLayer; | 633 | SDqLayer* pCurLayer = pEncCtx->pCurDqLayer; |
| 634 | const bool_t kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag; | 634 | const bool kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag; |
| 635 | const bool_t kbHighestSpatial = pEncCtx->pSvcParam->iNumDependencyLayer == | 635 | const bool kbHighestSpatial = pEncCtx->pSvcParam->iNumDependencyLayer == |
| 636 | (pCurLayer->sLayerInfo.sNalHeaderExt.uiDependencyId + 1); | 636 | (pCurLayer->sLayerInfo.sNalHeaderExt.uiDependencyId + 1); |
| 637 | 637 | ||
| 638 | //MD switch | 638 | //MD switch |
| @@ -649,8 +649,8 @@ void WelsCodePSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice) { · 10 unmodified lines | |||
| 649 | void WelsCodePOverDynamicSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice) { | 649 | void WelsCodePOverDynamicSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice) { |
| 650 | //pSlice-level init should be outside and before this function | 650 | //pSlice-level init should be outside and before this function |
| 651 | SDqLayer* pCurLayer = pEncCtx->pCurDqLayer; | 651 | SDqLayer* pCurLayer = pEncCtx->pCurDqLayer; |
| 652 | const bool_t kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag; | 652 | const bool kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag; |
| 653 | const bool_t kbHighestSpatial = pEncCtx->pSvcParam->iNumDependencyLayer == | 653 | const bool kbHighestSpatial = pEncCtx->pSvcParam->iNumDependencyLayer == |
| 654 | (pCurLayer->sLayerInfo.sNalHeaderExt.uiDependencyId + 1); | 654 | (pCurLayer->sLayerInfo.sNalHeaderExt.uiDependencyId + 1); |
| 655 | 655 | ||
| 656 | //MD switch | 656 | //MD switch |
| @@ -738,10 +738,10 @@ void UpdateMbNeighbourInfoForNextSlice (SSliceCtx* pSliceCtx, · 81 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 bLeft; |
| 742 | bool_t bTop; | 742 | bool bTop; |
| 743 | bool_t bLeftTop; | 743 | bool bLeftTop; |
| 744 | bool_t bRightTop; | 744 | bool 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 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 kbCurMbNotFirstMbOfCurSlice = (pSliceCtx->pOverallMbMap[iCurMbIdx] == |
| 834 | pSliceCtx->pOverallMbMap[iCurMbIdx - 1]); | 834 | pSliceCtx->pOverallMbMap[iCurMbIdx - 1]); |
| 835 | const bool_t kbCurMbNotLastMbOfCurPartition = iCurMbIdx < kiLastMbIdxInPartition; | 835 | const bool kbCurMbNotLastMbOfCurPartition = iCurMbIdx < kiLastMbIdxInPartition; |
| 836 | const bool_t kbSliceNumNotExceedConstraint = pSliceCtx->iSliceNumInFrame < | 836 | const bool 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 kbSliceNumReachConstraint = (pSliceCtx->iSliceNumInFrame == |
| 839 | pSliceCtx->iMaxSliceNumConstraint); | 839 | pSliceCtx->iMaxSliceNumConstraint); |
| 840 | 840 | ||
| 841 | if (pCurSlice->bDynamicSlicingSliceSizeCtrlFlag) | 841 | if (pCurSlice->bDynamicSlicingSliceSizeCtrlFlag) |