At 6ff4ef3b38 all the (stray, mixed) tabs had been cleaned out from the source code; remove newly added tabs and convert to spaces.
Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 4 files). Show all
Unified · Split
| @@ -3670,16 +3670,16 @@ int32_t WriteSavcParaset_Listing (sWelsEncCtx* pCtx, const int32_t kiSpatialNum, · 3669 unmodified lines | |||
| 3670 | void StackBackEncoderStatus (sWelsEncCtx* pEncCtx, | 3670 | void StackBackEncoderStatus (sWelsEncCtx* pEncCtx, |
| 3671 | EVideoFrameType keFrameType) { | 3671 | EVideoFrameType keFrameType) { |
| 3672 | // for bitstream writing | 3672 | // for bitstream writing |
| 3673 | pEncCtx->iPosBsBuffer = 0; // reset bs pBuffer position | 3673 | pEncCtx->iPosBsBuffer = 0; // reset bs pBuffer position |
| 3674 | pEncCtx->pOut->iNalIndex = 0; // reset NAL index | 3674 | pEncCtx->pOut->iNalIndex = 0; // reset NAL index |
| 3675 | 3675 | ||
| 3676 | InitBits (&pEncCtx->pOut->sBsWrite, pEncCtx->pOut->pBsBuffer, pEncCtx->pOut->uiSize); | 3676 | InitBits (&pEncCtx->pOut->sBsWrite, pEncCtx->pOut->pBsBuffer, pEncCtx->pOut->uiSize); |
| 3677 | if ((keFrameType == videoFrameTypeP) || (keFrameType == videoFrameTypeI)) { | 3677 | if ((keFrameType == videoFrameTypeP) || (keFrameType == videoFrameTypeI)) { |
| 3678 | pEncCtx->iFrameIndex --; | 3678 | pEncCtx->iFrameIndex --; |
| 3679 | if (pEncCtx->iPOC != 0) { | 3679 | if (pEncCtx->iPOC != 0) { |
| 3680 | pEncCtx->iPOC -= 2; | 3680 | pEncCtx->iPOC -= 2; |
| 3681 | } else { | 3681 | } else { |
| 3682 | pEncCtx->iPOC = (1 << pEncCtx->pSps->iLog2MaxPocLsb) - 2; | 3682 | pEncCtx->iPOC = (1 << pEncCtx->pSps->iLog2MaxPocLsb) - 2; |
| 3683 | } | 3683 | } |
| 3684 | 3684 | ||
| 3685 | if (pEncCtx->eLastNalPriority != 0) { | 3685 | if (pEncCtx->eLastNalPriority != 0) { |
| @@ -3690,15 +3690,15 @@ void StackBackEncoderStatus (sWelsEncCtx* pEncCtx, · 4 unmodified lines | |||
| 3690 | } | 3690 | } |
| 3691 | } | 3691 | } |
| 3692 | 3692 | ||
| 3693 | pEncCtx->eNalType = NAL_UNIT_CODED_SLICE; | 3693 | pEncCtx->eNalType = NAL_UNIT_CODED_SLICE; |
| 3694 | pEncCtx->eSliceType = P_SLICE; | 3694 | pEncCtx->eSliceType = P_SLICE; |
| 3695 | pEncCtx->eNalPriority = pEncCtx->eLastNalPriority; | 3695 | pEncCtx->eNalPriority = pEncCtx->eLastNalPriority; |
| 3696 | } else if (keFrameType == videoFrameTypeIDR) { | 3696 | } else if (keFrameType == videoFrameTypeIDR) { |
| 3697 | pEncCtx->uiIdrPicId --; | 3697 | pEncCtx->uiIdrPicId --; |
| 3698 | 3698 | ||
| 3699 | //set the next frame to be IDR | 3699 | //set the next frame to be IDR |
| 3700 | ForceCodingIDR (pEncCtx); | 3700 | ForceCodingIDR (pEncCtx); |
| 3701 | } else { // B pictures are not supported now, any else? | 3701 | } else { // B pictures are not supported now, any else? |
| 3702 | assert (0); | 3702 | assert (0); |
| 3703 | } | 3703 | } |
| 3704 | 3704 | ||
| @@ -3707,7 +3707,7 @@ void StackBackEncoderStatus (sWelsEncCtx* pEncCtx, · 2 unmodified lines | |||
| 3707 | } | 3707 | } |
| 3708 | 3708 | ||
| 3709 | void ClearFrameBsInfo (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi) { | 3709 | void ClearFrameBsInfo (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi) { |
| 3710 | pFbi->sLayerInfo[0].pBsBuf = pCtx->pFrameBs; | 3710 | pFbi->sLayerInfo[0].pBsBuf = pCtx->pFrameBs; |
| 3711 | pFbi->sLayerInfo[0].pNalLengthInByte = pCtx->pOut->pNalLen; | 3711 | pFbi->sLayerInfo[0].pNalLengthInByte = pCtx->pOut->pNalLen; |
| 3712 | 3712 | ||
| 3713 | for (int i = 0; i < pFbi->iLayerNum; i++) { | 3713 | for (int i = 0; i < pFbi->iLayerNum; i++) { |