History

Remove tabs where a simple space is just enough

Martin Storsjö committed 11 years ago

Commit ca51ee01 parent 51efa5754 files · +769 −772Browse files

Showing the changes to codec/encoder/core/src/svc_encode_slice.cpp (1 of 54 files). Show all

Unified · Split

codec/encoder/core/src/svc_encode_slice.cpp+36−36
@@ -67,10 +67,10 @@ void UpdateNonZeroCountCache (SMB* pMb, SMbCache* pMbCache) { · 66 unmodified lines
6767 }
6868
6969 void WelsSliceHeaderScalExtInit (SDqLayer* pCurLayer, SSlice* pSlice) {
70− SSliceHeaderExt* pSliceHeadExt = &pSlice->sSliceHeaderExt;
70+ SSliceHeaderExt* pSliceHeadExt = &pSlice->sSliceHeaderExt;
7171 SNalUnitHeaderExt* pNalHeadExt = &pCurLayer->sLayerInfo.sNalHeaderExt;
7272
73− uint8_t uiDependencyId = pNalHeadExt->uiDependencyId;
73+ uint8_t uiDependencyId = pNalHeadExt->uiDependencyId;
7474
7575 pSliceHeadExt->bSliceSkipFlag = false;
7676
@@ -90,7 +90,7 @@ void WelsSliceHeaderExtInit (sWelsEncCtx* pEncCtx, SDqLayer* pCurLayer, SSlice* · 13 unmodified lines
9090 SSliceHeaderExt* pCurSliceExt = &pSlice->sSliceHeaderExt;
9191 SSliceHeader* pCurSliceHeader = &pCurSliceExt->sSliceHeader;
9292
93− pCurSliceHeader->eSliceType = pEncCtx->eSliceType;
93+ pCurSliceHeader->eSliceType = pEncCtx->eSliceType;
9494
9595 pCurSliceExt->bStoreRefBasePicFlag = false;
9696
@@ -99,14 +99,14 @@ void WelsSliceHeaderExtInit (sWelsEncCtx* pEncCtx, SDqLayer* pCurLayer, SSlice* · 2 unmodified lines
9999 pCurSliceHeader->iFrameNum = pEncCtx->iFrameNum;
100100 pCurSliceHeader->uiIdrPicId = pEncCtx->uiIdrPicId;
101101
102− pCurSliceHeader->iPicOrderCntLsb = pEncCtx->pEncPic->iFramePoc; // 0
102+ pCurSliceHeader->iPicOrderCntLsb = pEncCtx->pEncPic->iFramePoc; // 0
103103
104104 if (P_SLICE == pEncCtx->eSliceType) {
105− pCurSliceHeader->uiNumRefIdxL0Active = 1;
105+ pCurSliceHeader->uiNumRefIdxL0Active = 1;
106106 if (pCurSliceHeader->uiRefCount > 0 &&
107107 pCurSliceHeader->uiRefCount < pCurLayer->sLayerInfo.pSpsP->iNumRefFrames) {
108108 pCurSliceHeader->bNumRefIdxActiveOverrideFlag = true;
109− pCurSliceHeader->uiNumRefIdxL0Active = pCurSliceHeader->uiRefCount;
109+ pCurSliceHeader->uiNumRefIdxL0Active = pCurSliceHeader->uiRefCount;
110110 }
111111 //to solve mismatch between debug&release
112112 else {
@@ -117,23 +117,23 @@ void WelsSliceHeaderExtInit (sWelsEncCtx* pEncCtx, SDqLayer* pCurLayer, SSlice* · 4 unmodified lines
117117 pCurSliceHeader->iSliceQpDelta = pEncCtx->iGlobalQp - pCurLayer->sLayerInfo.pPpsP->iPicInitQp;
118118
119119 //for deblocking initial
120− pCurSliceHeader->uiDisableDeblockingFilterIdc = pCurLayer->iLoopFilterDisableIdc;
121− pCurSliceHeader->iSliceAlphaC0Offset =
122− pCurLayer->iLoopFilterAlphaC0Offset; // need update iSliceAlphaC0Offset & iSliceBetaOffset for pSlice-header if loop_filter_idc != 1
123− pCurSliceHeader->iSliceBetaOffset = pCurLayer->iLoopFilterBetaOffset;
120+ pCurSliceHeader->uiDisableDeblockingFilterIdc = pCurLayer->iLoopFilterDisableIdc;
121+ pCurSliceHeader->iSliceAlphaC0Offset =
122+ pCurLayer->iLoopFilterAlphaC0Offset; // need update iSliceAlphaC0Offset & iSliceBetaOffset for pSlice-header if loop_filter_idc != 1
123+ pCurSliceHeader->iSliceBetaOffset = pCurLayer->iLoopFilterBetaOffset;
124124 pCurSliceExt->uiDisableInterLayerDeblockingFilterIdc = pCurLayer->uiDisableInterLayerDeblockingFilterIdc;
125125
126126 if (pSlice->bSliceHeaderExtFlag) {
127127 WelsSliceHeaderScalExtInit (pCurLayer, pSlice);
128128 } else {
129129 //both adaptive and default flags should equal to 0.
130− pCurSliceExt->bAdaptiveBaseModeFlag =
131− pCurSliceExt->bAdaptiveMotionPredFlag =
132− pCurSliceExt->bAdaptiveResidualPredFlag = false;
130+ pCurSliceExt->bAdaptiveBaseModeFlag =
131+ pCurSliceExt->bAdaptiveMotionPredFlag =
132+ pCurSliceExt->bAdaptiveResidualPredFlag = false;
133133
134− pCurSliceExt->bDefaultBaseModeFlag =
135− pCurSliceExt->bDefaultMotionPredFlag =
136− pCurSliceExt->bDefaultResidualPredFlag = false;
134+ pCurSliceExt->bDefaultBaseModeFlag =
135+ pCurSliceExt->bDefaultMotionPredFlag =
136+ pCurSliceExt->bDefaultResidualPredFlag = false;
137137 }
138138 }
139139
@@ -204,7 +204,7 @@ void WriteReferenceReorder (SBitStringAux* pBs, SSliceHeader* sSliceHeader) { · 64 unmodified lines
204204 * \brief write reference picture marking syntax in pSlice header
205205 */
206206 void WriteRefPicMarking (SBitStringAux* pBs, SSliceHeader* pSliceHeader, SNalUnitHeaderExt* pNalHdrExt) {
207− SRefPicMarking* sRefMarking = &pSliceHeader->sRefMarking;
207+ SRefPicMarking* sRefMarking = &pSliceHeader->sRefMarking;
208208 int16_t n = 0;
209209
210210 if (pNalHdrExt->bIdrFlag) {
@@ -503,7 +503,7 @@ int32_t WelsISliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice) { //pMd + encodin · 292 unmodified lines
503503 }
504504 for (; ;) {
505505 pEncCtx->pFuncList->pfStashMBStatus (&sDss, pSlice, 0);
506− iCurMbIdx = iNextMbIdx;
506+ iCurMbIdx = iNextMbIdx;
507507 pCurMb = &pMbList[ iCurMbIdx ];
508508
509509 pEncCtx->pFuncList->pfRc.pfWelsRcMbInit (pEncCtx, pCurMb, pSlice);
@@ -567,7 +567,7 @@ int32_t WelsISliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice) { //pMd + · 57 unmodified lines
567567 WelsInitSliceCabac (pEncCtx, pSlice);
568568 }
569569 for (; ;) {
570− iCurMbIdx = iNextMbIdx;
570+ iCurMbIdx = iNextMbIdx;
571571 pCurMb = &pMbList[ iCurMbIdx ];
572572
573573 pEncCtx->pFuncList->pfStashMBStatus (&sDss, pSlice, 0);
@@ -618,7 +618,7 @@ TRY_REENCODING: · 44 unmodified lines
618618 iNextMbIdx = WelsGetNextMbOfSlice (pSliceCtx, iCurMbIdx);
619619 //whether all of MB in current pSlice encoded or not
620620 if (iNextMbIdx == -1 || iNextMbIdx >= kiTotalNumMb || iNumMbCoded >= kiTotalNumMb) {
621− pSliceCtx->pCountMbNumInSlice[kiSliceIdx] = iCurMbIdx - pCurLayer->pLastCodedMbIdxOfPartition[kiPartitionId];
621+ pSliceCtx->pCountMbNumInSlice[kiSliceIdx] = iCurMbIdx - pCurLayer->pLastCodedMbIdxOfPartition[kiPartitionId];
622622 pCurLayer->pLastCodedMbIdxOfPartition[kiPartitionId] =
623623 iCurMbIdx; // update pLastCodedMbIdxOfPartition, finish coding, use iCurMbIdx directly
624624 break;
@@ -662,38 +662,38 @@ int32_t WelsPSliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool · 37 unmodified lines
662662
663663 int32_t WelsCodePSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice) {
664664 //pSlice-level init should be outside and before this function
665− SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
665+ SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
666666
667− const bool kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag;
667+ const bool kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag;
668668 const bool kbHighestSpatial = pEncCtx->pSvcParam->iSpatialLayerNum ==
669669 (pCurLayer->sLayerInfo.sNalHeaderExt.uiDependencyId + 1);
670670
671671 //MD switch
672672 if (kbBaseAvail && kbHighestSpatial) {
673673 //initial pMd pointer
674− pEncCtx->pFuncList->pfInterMd = WelsMdInterMbEnhancelayer;
674+ pEncCtx->pFuncList->pfInterMd = WelsMdInterMbEnhancelayer;
675675 } else {
676676 //initial pMd pointer
677− pEncCtx->pFuncList->pfInterMd = WelsMdInterMb;
677+ pEncCtx->pFuncList->pfInterMd = WelsMdInterMb;
678678 }
679679 return WelsPSliceMdEnc (pEncCtx, pSlice, kbHighestSpatial);
680680 }
681681
682682 int32_t WelsCodePOverDynamicSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice) {
683683 //pSlice-level init should be outside and before this function
684− SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
684+ SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
685685
686− const bool kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag;
686+ const bool kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag;
687687 const bool kbHighestSpatial = pEncCtx->pSvcParam->iSpatialLayerNum ==
688688 (pCurLayer->sLayerInfo.sNalHeaderExt.uiDependencyId + 1);
689689
690690 //MD switch
691691 if (kbBaseAvail && kbHighestSpatial) {
692692 //initial pMd pointer
693− pEncCtx->pFuncList->pfInterMd = WelsMdInterMbEnhancelayer;
693+ pEncCtx->pFuncList->pfInterMd = WelsMdInterMbEnhancelayer;
694694 } else {
695695 //initial pMd pointer
696− pEncCtx->pFuncList->pfInterMd = WelsMdInterMb;
696+ pEncCtx->pFuncList->pfInterMd = WelsMdInterMb;
697697 }
698698 return WelsPSliceMdEncDynamic (pEncCtx, pSlice, kbHighestSpatial);
699699 }
@@ -781,9 +781,9 @@ void UpdateMbNeighbourInfoForNextSlice (SSliceCtx* pSliceCtx, · 81 unmodified lines
781781 bool bLeftTop;
782782 bool bRightTop;
783783 int32_t iLeftXY, iTopXY, iLeftTopXY, iRightTopXY;
784− const uint16_t kuiSliceIdc = WelsMbToSliceIdc (pSliceCtx, kiMbXY);
784+ const uint16_t kuiSliceIdc = WelsMbToSliceIdc (pSliceCtx, kiMbXY);
785785
786− pMb->uiSliceIdc = kuiSliceIdc;
786+ pMb->uiSliceIdc = kuiSliceIdc;
787787 iLeftXY = kiMbXY - 1;
788788 iTopXY = kiMbXY - kiMbWidth;
789789 iLeftTopXY = iTopXY - 1;
@@ -806,7 +806,7 @@ void UpdateMbNeighbourInfoForNextSlice (SSliceCtx* pSliceCtx, · 16 unmodified lines
806806 if (bRightTop) {
807807 uiNeighborAvailFlag |= TOPRIGHT_MB_POS;
808808 }
809− pMb->uiNeighborAvail = (uint8_t)uiNeighborAvailFlag;
809+ pMb->uiNeighborAvail = (uint8_t)uiNeighborAvailFlag;
810810
811811 ++ pMb;
812812 ++ iIdx;
@@ -824,10 +824,10 @@ void AddSliceBoundary (sWelsEncCtx* pEncCtx, SSlice* pCurSlice, SSliceCtx* pSlic · 11 unmodified lines
824824 uint16_t iNextSliceIdc = iCurSliceIdc + kiSliceIdxStep;
825825 SSlice* pNextSlice = NULL;
826826
827− SMB* pMbList = pCurLayer->sMbDataP;
827+ SMB* pMbList = pCurLayer->sMbDataP;
828828
829829 //update cur pSlice info
830− pCurSlice->sSliceHeaderExt.uiNumMbsInSlice = 1 + iCurMbIdx - pCurSlice->sSliceHeaderExt.sSliceHeader.iFirstMbInSlice;
830+ pCurSlice->sSliceHeaderExt.uiNumMbsInSlice = 1 + iCurMbIdx - pCurSlice->sSliceHeaderExt.sSliceHeader.iFirstMbInSlice;
831831
832832 //pNextSlice pointer/initialization
833833 pNextSlice = & (pCurLayer->sLayerInfo.pSliceInLayer[ iNextSliceIdc ]);
@@ -860,7 +860,7 @@ bool DynSlcJudgeSliceBoundaryStepBack (void* pCtx, void* pSlice, SSliceCtx* pSli · 26 unmodified lines
860860 int32_t iPosBitOffset = 0;
861861 const int32_t kiActiveThreadsNum = pEncCtx->iActiveThreadsNum;
862862 const int32_t kiPartitaionId = pCurSlice->uiSliceIdx % kiActiveThreadsNum;
863− const int32_t kiLastMbIdxInPartition = pEncCtx->pCurDqLayer->pLastMbIdxOfPartition[kiPartitaionId];
863+ const int32_t kiLastMbIdxInPartition = pEncCtx->pCurDqLayer->pLastMbIdxOfPartition[kiPartitaionId];
864864
865865 const bool kbCurMbNotFirstMbOfCurSlice = (pSliceCtx->pOverallMbMap[iCurMbIdx] ==
866866 pSliceCtx->pOverallMbMap[iCurMbIdx - 1]);
@@ -963,7 +963,7 @@ int32_t WelsMdInterMbLoop (sWelsEncCtx* pEncCtx, SSlice* pSlice, void* pWelsMd, · 96 unmodified lines
963963 for (;;) {
964964 pEncCtx->pFuncList->pfStashMBStatus (&sDss, pSlice, pSlice->iMbSkipRun);
965965 //point to current pMb
966− iCurMbIdx = iNextMbIdx;
966+ iCurMbIdx = iNextMbIdx;
967967 pCurMb = &pMbList[ iCurMbIdx ];
968968
969969
@@ -1060,7 +1060,7 @@ int32_t WelsMdInterMbLoopOverDynamicSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice, · 90 unmodified lines
10601060 pEncCtx->pFuncList->pfStashMBStatus (&sDss, pSlice, pSlice->iMbSkipRun);
10611061
10621062 //point to current pMb
1063− iCurMbIdx = iNextMbIdx;
1063+ iCurMbIdx = iNextMbIdx;
10641064 pCurMb = &pMbList[ iCurMbIdx ];
10651065
10661066 //step(1): set QP for the current MB

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t