History

slice buffer variable rename:sSliceBufferInfo[iThreadIdx] replaced by sSliceBufferInfo[iSlcBuffIdx]

Huade Shi (huashi) committed 9 years ago

Commit 90b070f1 parent ffb65792 files · +39 −40Browse files

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

Unified · Split

codec/encoder/core/src/svc_encode_slice.cpp+34−34
@@ -974,7 +974,7 @@ int32_t InitSliceList (SSlice*& pSliceList, · 973 unmodified lines
974974 int32_t InitAllSlicesInThread (sWelsEncCtx* pCtx) {
975975 SDqLayer* pCurDqLayer = pCtx->pCurDqLayer;
976976 int32_t iSliceIdx = 0;
977− int32_t iTheadIdx = 0;
977+ int32_t iSlcBuffIdx = 0;
978978
979979 for( ; iSliceIdx < pCurDqLayer->iMaxSliceNum; iSliceIdx++) {
980980 if(NULL == pCurDqLayer->ppSliceInLayer[iSliceIdx]) {
@@ -984,8 +984,8 @@ int32_t InitAllSlicesInThread (sWelsEncCtx* pCtx) { · 3 unmodified lines
984984 pCurDqLayer->ppSliceInLayer[iSliceIdx]->iSliceIdx = -1;
985985 }
986986
987− for( ; iTheadIdx < pCtx->iActiveThreadsNum; iTheadIdx++ ) {
988− pCurDqLayer->sSliceBufferInfo[iTheadIdx].iCodedSliceNum = 0;
987+ for( ; iSlcBuffIdx < pCtx->iActiveThreadsNum; iSlcBuffIdx++ ) {
988+ pCurDqLayer->sSliceBufferInfo[iSlcBuffIdx].iCodedSliceNum = 0;
989989 }
990990
991991 return ENC_RETURN_SUCCESS;
@@ -993,24 +993,24 @@ int32_t InitAllSlicesInThread (sWelsEncCtx* pCtx) { · 1 unmodified line
993993
994994 int32_t InitOneSliceInThread (sWelsEncCtx* pCtx,
995995 SSlice*& pSlice,
996− const int32_t kiThreadIdx,
996+ const int32_t kiSlcBuffIdx,
997997 const int32_t kiDlayerIdx,
998998 const int32_t kiSliceIdx) {
999999
10001000 if (pCtx->pCurDqLayer->bThreadSlcBufferFlag) {
1001− const int32_t kiCodedNumInThread = pCtx->pCurDqLayer->sSliceBufferInfo[kiThreadIdx].iCodedSliceNum;
1002− assert(kiCodedNumInThread <= pCtx->pCurDqLayer->sSliceBufferInfo[kiThreadIdx].iMaxSliceNum -1 );
1003− pSlice = &pCtx->pCurDqLayer->sSliceBufferInfo [kiThreadIdx].pSliceBuffer[kiCodedNumInThread];
1001+ const int32_t kiCodedNumInThread = pCtx->pCurDqLayer->sSliceBufferInfo[kiSlcBuffIdx].iCodedSliceNum;
1002+ assert(kiCodedNumInThread <= pCtx->pCurDqLayer->sSliceBufferInfo[kiSlcBuffIdx].iMaxSliceNum -1 );
1003+ pSlice = &pCtx->pCurDqLayer->sSliceBufferInfo [kiSlcBuffIdx].pSliceBuffer[kiCodedNumInThread];
10041004 } else {
10051005 pSlice = &pCtx->pCurDqLayer->sSliceBufferInfo [0].pSliceBuffer[kiSliceIdx];
10061006 }
10071007 pSlice->iSliceIdx = kiSliceIdx;
1008− pSlice->uiThreadIdx = kiThreadIdx;
1008+ pSlice->uiThreadIdx = kiSlcBuffIdx;
10091009
10101010 // Initialize slice bs buffer info
10111011 pSlice->sSliceBs.uiBsPos = 0;
10121012 pSlice->sSliceBs.iNalIndex = 0;
1013− pSlice->sSliceBs.pBsBuffer = pCtx->pSliceThreading->pThreadBsBuffer[kiThreadIdx];
1013+ pSlice->sSliceBs.pBsBuffer = pCtx->pSliceThreading->pThreadBsBuffer[kiSlcBuffIdx];
10141014
10151015 return ENC_RETURN_SUCCESS;
10161016 }
@@ -1072,7 +1072,7 @@ int32_t InitSliceInLayer (sWelsEncCtx* pCtx, · 55 unmodified lines
10721072 CMemoryAlign* pMa) {
10731073 int32_t iRet = 0;
10741074 int32_t iSliceIdx = 0;
1075− int32_t iThreadIdx = 0;
1075+ int32_t iSlcBuffIdx = 0;
10761076 int32_t iStartIdx = 0;
10771077 int32_t iMaxSliceNum = pDqLayer->iMaxSliceNum;
10781078 SSliceArgument* pSliceArgument = & pCtx->pSvcParam->sSpatialLayers[kiDlayerIndex].sSliceArgument;
@@ -1094,8 +1094,8 @@ int32_t InitSliceInLayer (sWelsEncCtx* pCtx, · 15 unmodified lines
10941094 }
10951095
10961096 pDqLayer->iMaxSliceNum = 0;
1097− for(iThreadIdx = 0; iThreadIdx < pCtx->iActiveThreadsNum; iThreadIdx++ ) {
1098− pDqLayer->iMaxSliceNum += pDqLayer->sSliceBufferInfo[iThreadIdx].iMaxSliceNum;
1097+ for(iSlcBuffIdx = 0; iSlcBuffIdx < pCtx->iActiveThreadsNum; iSlcBuffIdx++ ) {
1098+ pDqLayer->iMaxSliceNum += pDqLayer->sSliceBufferInfo[iSlcBuffIdx].iMaxSliceNum;
10991099 }
11001100
11011101 pDqLayer->ppSliceInLayer = (SSlice**)pMa->WelsMallocz (sizeof (SSlice*) * pDqLayer->iMaxSliceNum, "ppSliceInLayer");
@@ -1122,12 +1122,12 @@ int32_t InitSliceInLayer (sWelsEncCtx* pCtx, · 20 unmodified lines
11221122 }
11231123
11241124 iStartIdx = 0;
1125− for(iThreadIdx = 0; iThreadIdx < pCtx->iActiveThreadsNum; iThreadIdx++ ) {
1126− for (iSliceIdx = 0; iSliceIdx < pDqLayer->sSliceBufferInfo[iThreadIdx].iMaxSliceNum; iSliceIdx++ ) {
1127− pDqLayer->ppSliceInLayer[iStartIdx + iSliceIdx] = pDqLayer->sSliceBufferInfo[iThreadIdx].pSliceBuffer+ iSliceIdx;
1125+ for(iSlcBuffIdx = 0; iSlcBuffIdx < pCtx->iActiveThreadsNum; iSlcBuffIdx++ ) {
1126+ for (iSliceIdx = 0; iSliceIdx < pDqLayer->sSliceBufferInfo[iSlcBuffIdx].iMaxSliceNum; iSliceIdx++ ) {
1127+ pDqLayer->ppSliceInLayer[iStartIdx + iSliceIdx] = pDqLayer->sSliceBufferInfo[iSlcBuffIdx].pSliceBuffer+ iSliceIdx;
11281128 }
11291129
1130− iStartIdx += pDqLayer->sSliceBufferInfo[iThreadIdx].iMaxSliceNum;
1130+ iStartIdx += pDqLayer->sSliceBufferInfo[iSlcBuffIdx].iMaxSliceNum;
11311131 }
11321132
11331133 return ENC_RETURN_SUCCESS;
@@ -1300,11 +1300,11 @@ int32_t CalculateNewSliceNum (sWelsEncCtx* pCtx, · 166 unmodified lines
13001300 int32_t ReallocateSliceInThread (sWelsEncCtx* pCtx,
13011301 SDqLayer* pDqLayer,
13021302 const int32_t kiDlayerIdx,
1303− const int32_t kiThreadIndex) {
1304− int32_t iMaxSliceNum = pDqLayer->sSliceBufferInfo[kiThreadIndex].iMaxSliceNum;
1303+ const int32_t KiSlcBuffIdx) {
1304+ int32_t iMaxSliceNum = pDqLayer->sSliceBufferInfo[KiSlcBuffIdx].iMaxSliceNum;
13051305 int32_t iMaxSliceNumNew = 0;
13061306 int32_t iRet = 0;
1307− SSlice* pLastCodedSlice = &pDqLayer->sSliceBufferInfo[kiThreadIndex].pSliceBuffer [iMaxSliceNum - 1];
1307+ SSlice* pLastCodedSlice = &pDqLayer->sSliceBufferInfo[KiSlcBuffIdx].pSliceBuffer [iMaxSliceNum - 1];
13081308 SSliceArgument* pSliceArgument = & pCtx->pSvcParam->sSpatialLayers[kiDlayerIdx].sSliceArgument;
13091309
13101310 iRet = CalculateNewSliceNum (pCtx,
@@ -1317,14 +1317,14 @@ int32_t ReallocateSliceInThread (sWelsEncCtx* pCtx, · 6 unmodified lines
13171317
13181318 iRet = ReallocateSliceList (pCtx,
13191319 pSliceArgument,
1320− pDqLayer->sSliceBufferInfo[kiThreadIndex].pSliceBuffer,
1320+ pDqLayer->sSliceBufferInfo[KiSlcBuffIdx].pSliceBuffer,
13211321 iMaxSliceNum,
13221322 iMaxSliceNumNew);
13231323 if (ENC_RETURN_SUCCESS != iRet) {
13241324 return iRet;
13251325 }
13261326
1327− pDqLayer->sSliceBufferInfo[kiThreadIndex].iMaxSliceNum = iMaxSliceNumNew;
1327+ pDqLayer->sSliceBufferInfo[KiSlcBuffIdx].iMaxSliceNum = iMaxSliceNumNew;
13281328
13291329 return ENC_RETURN_SUCCESS;
13301330 }
@@ -1379,7 +1379,7 @@ int32_t ReallocSliceBuffer (sWelsEncCtx* pCtx) { · 48 unmodified lines
13791379 int32_t iMaxSliceNumNew = 0;
13801380 int32_t iRet = 0;
13811381 int32_t iSliceIdx = 0;
1382− int32_t iThreadIdx = 0;
1382+ int32_t iSlcBuffIdx = 0;
13831383 int32_t iStartIdx = 0;
13841384 const int32_t kiCurDid = pCtx->uiDependencyId;
13851385 SSlice* pLastCodedSlice = pCurLayer->sSliceBufferInfo[0].pSliceBuffer + (iMaxSliceNumOld - 1);
@@ -1405,8 +1405,8 @@ int32_t ReallocSliceBuffer (sWelsEncCtx* pCtx) { · 19 unmodified lines
14051405 pCurLayer->sSliceBufferInfo[0].iMaxSliceNum = iMaxSliceNumNew;
14061406
14071407 iMaxSliceNumNew = 0;
1408− for(iThreadIdx = 0; iThreadIdx < pCtx->iActiveThreadsNum; iThreadIdx++ ) {
1409− iMaxSliceNumNew += pCurLayer->sSliceBufferInfo[iThreadIdx].iMaxSliceNum;
1408+ for(iSlcBuffIdx = 0; iSlcBuffIdx < pCtx->iActiveThreadsNum; iSlcBuffIdx++ ) {
1409+ iMaxSliceNumNew += pCurLayer->sSliceBufferInfo[iSlcBuffIdx].iMaxSliceNum;
14101410 }
14111411
14121412 iRet = ExtendLayerBuffer(pCtx, pCurLayer->iMaxSliceNum, iMaxSliceNumNew);
@@ -1414,11 +1414,11 @@ int32_t ReallocSliceBuffer (sWelsEncCtx* pCtx) { · 1 unmodified line
14141414 return iRet;
14151415 }
14161416
1417− for(iThreadIdx = 0; iThreadIdx < pCtx->iActiveThreadsNum; iThreadIdx++ ) {
1418− for (iSliceIdx = 0; iSliceIdx < pCurLayer->sSliceBufferInfo[iThreadIdx].iMaxSliceNum; iSliceIdx++) {
1419− pCurLayer->ppSliceInLayer[iStartIdx + iSliceIdx] = pCurLayer->sSliceBufferInfo[iThreadIdx].pSliceBuffer + iSliceIdx;
1417+ for(iSlcBuffIdx = 0; iSlcBuffIdx < pCtx->iActiveThreadsNum; iSlcBuffIdx++ ) {
1418+ for (iSliceIdx = 0; iSliceIdx < pCurLayer->sSliceBufferInfo[iSlcBuffIdx].iMaxSliceNum; iSliceIdx++) {
1419+ pCurLayer->ppSliceInLayer[iStartIdx + iSliceIdx] = pCurLayer->sSliceBufferInfo[iSlcBuffIdx].pSliceBuffer + iSliceIdx;
14201420 }
1421− iStartIdx += pCurLayer->sSliceBufferInfo[iThreadIdx].iMaxSliceNum;
1421+ iStartIdx += pCurLayer->sSliceBufferInfo[iSlcBuffIdx].iMaxSliceNum;
14221422 }
14231423
14241424 pCurLayer->iMaxSliceNum = iMaxSliceNumNew;
@@ -1446,7 +1446,7 @@ int32_t ReOrderSliceInLayer (sWelsEncCtx* pCtx, · 21 unmodified lines
14461446 const int32_t kiThreadNum) {
14471447 SDqLayer* pCurLayer = pCtx->pCurDqLayer;
14481448 SSlice* pSliceBuffer = NULL;
1449− int32_t iThreadIdx = 0;
1449+ int32_t iSlcBuffIdx = 0;
14501450 int32_t iPartitionIdx = 0;
14511451 int32_t iPartitionID = 0;
14521452 int32_t iSliceIdx = 0;
@@ -1476,11 +1476,11 @@ int32_t ReOrderSliceInLayer (sWelsEncCtx* pCtx, · 23 unmodified lines
14761476
14771477 //before encode all slices in layer, slices' index are init with -1
14781478 //pSliceBuffer->iSliceIdx will be set to actual slice index when encode one slice
1479− for (iThreadIdx = 0; iThreadIdx < kiThreadNum; iThreadIdx++) {
1480− iSliceNumInThread = pCurLayer->sSliceBufferInfo[iThreadIdx].iMaxSliceNum;
1479+ for (iSlcBuffIdx = 0; iSlcBuffIdx < kiThreadNum; iSlcBuffIdx++) {
1480+ iSliceNumInThread = pCurLayer->sSliceBufferInfo[iSlcBuffIdx].iMaxSliceNum;
14811481
14821482 for(iSliceIdx =0; iSliceIdx < iSliceNumInThread; iSliceIdx++) {
1483− pSliceBuffer = pCurLayer->sSliceBufferInfo[iThreadIdx].pSliceBuffer + iSliceIdx;
1483+ pSliceBuffer = pCurLayer->sSliceBufferInfo[iSlcBuffIdx].pSliceBuffer + iSliceIdx;
14841484 if (NULL == pSliceBuffer) {
14851485 return ENC_RETURN_UNEXPECTED;
14861486 }
@@ -1581,8 +1581,8 @@ int32_t SliceLayerInfoUpdate (sWelsEncCtx* pCtx, · 94 unmodified lines
15811581 int32_t iCodedNalCount = 0;
15821582 int32_t iRet = 0;
15831583
1584− for ( int32_t iThreadIdx = 0; iThreadIdx < pCtx->iActiveThreadsNum; iThreadIdx++) {
1585− iMaxSliceNum += pCtx->pCurDqLayer->sSliceBufferInfo[iThreadIdx].iMaxSliceNum;
1584+ for ( int32_t iSlcBuffIdx = 0; iSlcBuffIdx < pCtx->iActiveThreadsNum; iSlcBuffIdx++) {
1585+ iMaxSliceNum += pCtx->pCurDqLayer->sSliceBufferInfo[iSlcBuffIdx].iMaxSliceNum;
15861586 }
15871587
15881588 //reallocate ppSliceInLayer if total encoded slice num exceed max slice num

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