At 6ff4ef3b38 all the (stray, mixed) tabs had been cleaned out from the source code; remove newly added tabs and convert to spaces.
Unified · Split
| @@ -272,7 +272,7 @@ PWelsCheckFrameSkipBasedMaxbrFunc pfWelsCheckSkipBasedMaxbr; · 271 unmodified lines | |||
| 272 | PWelsUpdateBufferWhenFrameSkippedFunc pfWelsUpdateBufferWhenSkip; | 272 | PWelsUpdateBufferWhenFrameSkippedFunc pfWelsUpdateBufferWhenSkip; |
| 273 | PWelsUpdateMaxBrCheckWindowStatusFunc pfWelsUpdateMaxBrWindowStatus; | 273 | PWelsUpdateMaxBrCheckWindowStatusFunc pfWelsUpdateMaxBrWindowStatus; |
| 274 | 274 | ||
| 275 | PWelsRCPostFrameSkippingFunc pfWelsRcPostFrameSkipping; | 275 | PWelsRCPostFrameSkippingFunc pfWelsRcPostFrameSkipping; |
| 276 | } SWelsRcFunc; | 276 | } SWelsRcFunc; |
| 277 | 277 | ||
| 278 | bool CheckFrameSkipBasedMaxbr (sWelsEncCtx* pCtx, int32_t iSpatialNum, EVideoFrameType eFrameType, | 278 | bool CheckFrameSkipBasedMaxbr (sWelsEncCtx* pCtx, int32_t iSpatialNum, EVideoFrameType eFrameType, |
| @@ -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++) { |
| @@ -305,8 +305,8 @@ void UpdateP8x8MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPart · 304 unmodified lines | |||
| 305 | void UpdateP4x4MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPartIdx, const int8_t kiRef, | 305 | void UpdateP4x4MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPartIdx, const int8_t kiRef, |
| 306 | SMVUnitXY* pMv) { | 306 | SMVUnitXY* pMv) { |
| 307 | SMVComponentUnit* pMvComp = &pMbCache->sMvComponents; | 307 | SMVComponentUnit* pMvComp = &pMbCache->sMvComponents; |
| 308 | const int16_t kiScan4Idx = g_kuiMbCountScan4Idx[kiPartIdx]; | 308 | const int16_t kiScan4Idx = g_kuiMbCountScan4Idx[kiPartIdx]; |
| 309 | const int16_t kiCacheIdx = g_kuiCache30ScanIdx[kiPartIdx]; | 309 | const int16_t kiCacheIdx = g_kuiCache30ScanIdx[kiPartIdx]; |
| 310 | 310 | ||
| 311 | //mb | 311 | //mb |
| 312 | pCurMb->sMv[kiScan4Idx] = *pMv; | 312 | pCurMb->sMv[kiScan4Idx] = *pMv; |
| @@ -318,8 +318,8 @@ void UpdateP4x4MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPart · 5 unmodified lines | |||
| 318 | void UpdateP8x4MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPartIdx, const int8_t kiRef, | 318 | void UpdateP8x4MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPartIdx, const int8_t kiRef, |
| 319 | SMVUnitXY* pMv) { | 319 | SMVUnitXY* pMv) { |
| 320 | SMVComponentUnit* pMvComp = &pMbCache->sMvComponents; | 320 | SMVComponentUnit* pMvComp = &pMbCache->sMvComponents; |
| 321 | const int16_t kiScan4Idx = g_kuiMbCountScan4Idx[kiPartIdx]; | 321 | const int16_t kiScan4Idx = g_kuiMbCountScan4Idx[kiPartIdx]; |
| 322 | const int16_t kiCacheIdx = g_kuiCache30ScanIdx[kiPartIdx]; | 322 | const int16_t kiCacheIdx = g_kuiCache30ScanIdx[kiPartIdx]; |
| 323 | 323 | ||
| 324 | //mb | 324 | //mb |
| 325 | pCurMb->sMv[ kiScan4Idx] = *pMv; | 325 | pCurMb->sMv[ kiScan4Idx] = *pMv; |
| @@ -334,8 +334,8 @@ void UpdateP8x4MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPart · 8 unmodified lines | |||
| 334 | void UpdateP4x8MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPartIdx, const int8_t kiRef, | 334 | void UpdateP4x8MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPartIdx, const int8_t kiRef, |
| 335 | SMVUnitXY* pMv) { | 335 | SMVUnitXY* pMv) { |
| 336 | SMVComponentUnit* pMvComp = &pMbCache->sMvComponents; | 336 | SMVComponentUnit* pMvComp = &pMbCache->sMvComponents; |
| 337 | const int16_t kiScan4Idx = g_kuiMbCountScan4Idx[kiPartIdx]; | 337 | const int16_t kiScan4Idx = g_kuiMbCountScan4Idx[kiPartIdx]; |
| 338 | const int16_t kiCacheIdx = g_kuiCache30ScanIdx[kiPartIdx]; | 338 | const int16_t kiCacheIdx = g_kuiCache30ScanIdx[kiPartIdx]; |
| 339 | 339 | ||
| 340 | //mb | 340 | //mb |
| 341 | pCurMb->sMv[ kiScan4Idx] = *pMv; | 341 | pCurMb->sMv[ kiScan4Idx] = *pMv; |
| @@ -1127,9 +1127,9 @@ void WelsRcPictureInfoUpdateDisable (sWelsEncCtx* pEncCtx, int32_t iLayerSize) · 1126 unmodified lines | |||
| 1127 | } | 1127 | } |
| 1128 | 1128 | ||
| 1129 | void WelsRcMbInitDisable (sWelsEncCtx* pEncCtx, SMB* pCurMb, SSlice* pSlice) { | 1129 | void WelsRcMbInitDisable (sWelsEncCtx* pEncCtx, SMB* pCurMb, SSlice* pSlice) { |
| 1130 | int32_t iLumaQp = pEncCtx->iGlobalQp; | 1130 | int32_t iLumaQp = pEncCtx->iGlobalQp; |
| 1131 | SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId]; | 1131 | SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId]; |
| 1132 | SDqLayer* pCurLayer = pEncCtx->pCurDqLayer; | 1132 | SDqLayer* pCurLayer = pEncCtx->pCurDqLayer; |
| 1133 | 1133 | ||
| 1134 | const uint8_t kuiChromaQpIndexOffset = pCurLayer->sLayerInfo.pPpsP->uiChromaQpIndexOffset; | 1134 | const uint8_t kuiChromaQpIndexOffset = pCurLayer->sLayerInfo.pPpsP->uiChromaQpIndexOffset; |
| 1135 | 1135 | ||
| @@ -1149,7 +1149,7 @@ void WelsRcMbInfoUpdateDisable (sWelsEncCtx* pEncCtx, SMB* pCurMb, int32_t iCos · 13 unmodified lines | |||
| 1149 | 1149 | ||
| 1150 | void WelRcPictureInitBufferBasedQp (sWelsEncCtx* pEncCtx, long long uiTimeStamp) { | 1150 | void WelRcPictureInitBufferBasedQp (sWelsEncCtx* pEncCtx, long long uiTimeStamp) { |
| 1151 | 1151 | ||
| 1152 | SVAAFrameInfo* pVaa = static_cast<SVAAFrameInfo*> (pEncCtx->pVaa); | 1152 | SVAAFrameInfo* pVaa = static_cast<SVAAFrameInfo*> (pEncCtx->pVaa); |
| 1153 | SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId]; | 1153 | SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId]; |
| 1154 | 1154 | ||
| 1155 | int32_t iMinQp = MIN_SCREEN_QP; | 1155 | int32_t iMinQp = MIN_SCREEN_QP; |