History

Multi-thread-fixed:RBC#1752:change sSliceThreadInfo structure

huade committed 9 years ago

Commit b8ba4181 parent 095f0b66 files · +57 −63Browse files

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

Unified · Split

codec/encoder/core/src/svc_encode_slice.cpp+34−37
@@ -994,7 +994,7 @@ int32_t InitAllSlicesInThread (sWelsEncCtx* pCtx) { · 993 unmodified lines
994994 }
995995
996996 for( ; iTheadIdx < pCtx->iActiveThreadsNum; iTheadIdx++ ) {
997− pCurDqLayer->sSliceThreadInfo.iEncodedSliceNumInThread[iTheadIdx] = 0;
997+ pCurDqLayer->sSliceThreadInfo[iTheadIdx].iCodedSliceNum = 0;
998998 }
999999
10001000 return ENC_RETURN_SUCCESS;
@@ -1006,11 +1006,11 @@ int32_t InitOneSliceInThread (sWelsEncCtx* pCtx, · 5 unmodified lines
10061006 const int32_t kiDlayerIdx,
10071007 const int32_t kiSliceIdx) {
10081008 SDqLayer* pDqLayer = pCtx->pCurDqLayer;
1009− const int32_t kiCodedNumInThread = pDqLayer->sSliceThreadInfo.iEncodedSliceNumInThread[kiThreadIdx];
1009+ const int32_t kiCodedNumInThread = pDqLayer->sSliceThreadInfo[kiThreadIdx].iCodedSliceNum;
10101010
1011− assert(kiCodedNumInThread < pDqLayer->sSliceThreadInfo.iMaxSliceNumInThread[kiThreadIdx] -1 );
1011+ assert(kiCodedNumInThread < pDqLayer->sSliceThreadInfo[kiThreadIdx].iMaxSliceNum -1 );
10121012
1013− pSlice = &pDqLayer->sSliceThreadInfo.pSliceInThread [kiThreadIdx][kiCodedNumInThread];
1013+ pSlice = &pDqLayer->sSliceThreadInfo [kiThreadIdx].pSliceInThread[kiCodedNumInThread];
10141014 pSlice->iSliceIdx = kiSliceIdx;
10151015 pSlice->uiThreadIdx = kiThreadIdx;
10161016
@@ -1026,8 +1026,6 @@ int32_t InitSliceThreadInfo (sWelsEncCtx* pCtx, · 9 unmodified lines
10261026 SDqLayer* pDqLayer,
10271027 const int32_t kiDlayerIndex,
10281028 CMemoryAlign* pMa) {
1029−
1030− SSliceThreadInfo* pSliceThreadInfo = &pDqLayer->sSliceThreadInfo;
10311029 int32_t iThreadNum = pCtx->pSvcParam->iMultipleThreadIdc;
10321030 int32_t iMaxSliceNumInThread = 0;
10331031 int32_t iIdx = 0;
@@ -1036,17 +1034,17 @@ int32_t InitSliceThreadInfo (sWelsEncCtx* pCtx, · 2 unmodified lines
10361034 assert (iThreadNum > 0);
10371035 iMaxSliceNumInThread = pDqLayer->iMaxSliceNum;
10381036 while (iIdx < iThreadNum) {
1039− pSliceThreadInfo->iMaxSliceNumInThread[iIdx] = iMaxSliceNumInThread;
1040− pSliceThreadInfo->iEncodedSliceNumInThread[iIdx] = 0;
1041− pSliceThreadInfo->pSliceInThread[iIdx] = (SSlice*)pMa->WelsMallocz (sizeof (SSlice) * iMaxSliceNumInThread, "pSliceInThread");
1042− if (NULL == pSliceThreadInfo->pSliceInThread[iIdx]) {
1037+ pDqLayer->sSliceThreadInfo[iIdx].iMaxSliceNum = iMaxSliceNumInThread;
1038+ pDqLayer->sSliceThreadInfo[iIdx].iCodedSliceNum = 0;
1039+ pDqLayer->sSliceThreadInfo[iIdx].pSliceInThread = (SSlice*)pMa->WelsMallocz (sizeof (SSlice) * iMaxSliceNumInThread, "pSliceInThread");
1040+ if (NULL == pDqLayer->sSliceThreadInfo[iIdx].pSliceInThread) {
10431041 WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR,
10441042 "CWelsH264SVCEncoder::InitSliceThreadInfo: pSliceThreadInfo->pSliceInThread[iIdx] is NULL");
10451043 return ENC_RETURN_MEMALLOCERR;
10461044 }
10471045 iRet = InitSliceList (pCtx,
10481046 pDqLayer,
1049− pSliceThreadInfo->pSliceInThread[iIdx],
1047+ pDqLayer->sSliceThreadInfo[iIdx].pSliceInThread,
10501048 iMaxSliceNumInThread,
10511049 kiDlayerIndex,
10521050 pMa);
@@ -1057,9 +1055,9 @@ int32_t InitSliceThreadInfo (sWelsEncCtx* pCtx, · 4 unmodified lines
10571055 }
10581056
10591057 for (; iIdx < MAX_THREADS_NUM; iIdx++) {
1060− pSliceThreadInfo->iMaxSliceNumInThread[iIdx] = 0;
1061− pSliceThreadInfo->iEncodedSliceNumInThread[iIdx] = 0;
1062− pSliceThreadInfo->pSliceInThread[iIdx] = NULL;
1058+ pDqLayer->sSliceThreadInfo[iIdx].iMaxSliceNum = 0;
1059+ pDqLayer->sSliceThreadInfo[iIdx].iCodedSliceNum = 0;
1060+ pDqLayer->sSliceThreadInfo[iIdx].pSliceInThread = NULL;
10631061 }
10641062 return ENC_RETURN_SUCCESS;
10651063 }
@@ -1084,7 +1082,7 @@ int32_t InitSliceInLayer (sWelsEncCtx* pCtx, · 18 unmodified lines
10841082
10851083 pDqLayer->iMaxSliceNum = 0;
10861084 for(iThreadIdx = 0; iThreadIdx < pCtx->iActiveThreadsNum; iThreadIdx++ ) {
1087− pDqLayer->iMaxSliceNum += pDqLayer->sSliceThreadInfo.iMaxSliceNumInThread[iThreadIdx];
1085+ pDqLayer->iMaxSliceNum += pDqLayer->sSliceThreadInfo[iThreadIdx].iMaxSliceNum;
10881086 }
10891087
10901088 pDqLayer->ppSliceInLayer = (SSlice**)pMa->WelsMallocz (sizeof (SSlice*) * pDqLayer->iMaxSliceNum, "ppSliceInLayer");
@@ -1112,11 +1110,11 @@ int32_t InitSliceInLayer (sWelsEncCtx* pCtx, · 21 unmodified lines
11121110
11131111 iStartIdx = 0;
11141112 for(iThreadIdx = 0; iThreadIdx < pCtx->iActiveThreadsNum; iThreadIdx++ ) {
1115− for (iSliceIdx = 0; iSliceIdx < pDqLayer->sSliceThreadInfo.iMaxSliceNumInThread[iThreadIdx]; iSliceIdx++) {
1116− pDqLayer->ppSliceInLayer[iStartIdx + iSliceIdx] = pDqLayer->sSliceThreadInfo.pSliceInThread[iThreadIdx] + iSliceIdx;
1113+ for (iSliceIdx = 0; iSliceIdx < pDqLayer->sSliceThreadInfo[iThreadIdx].iMaxSliceNum; iSliceIdx++ ) {
1114+ pDqLayer->ppSliceInLayer[iStartIdx + iSliceIdx] = pDqLayer->sSliceThreadInfo[iThreadIdx].pSliceInThread+ iSliceIdx;
11171115 }
11181116
1119− iStartIdx += pDqLayer->sSliceThreadInfo.iMaxSliceNumInThread[iThreadIdx];
1117+ iStartIdx += pDqLayer->sSliceThreadInfo[iThreadIdx].iMaxSliceNum;
11201118 }
11211119
11221120 return ENC_RETURN_SUCCESS;
@@ -1257,7 +1255,6 @@ int32_t ReallocateSliceList (sWelsEncCtx* pCtx, · 134 unmodified lines
12571255 pSliceList = pNewSliceList;
12581256
12591257 return ENC_RETURN_SUCCESS;
1260−
12611258 }
12621259
12631260 int32_t CalculateNewSliceNum (SDqLayer* pDqLayer,
@@ -1286,10 +1283,10 @@ int32_t ReallocateSliceInThread (sWelsEncCtx* pCtx, · 22 unmodified lines
12861283 const int32_t kiDlayerIdx,
12871284 const int32_t kiThreadIndex) {
12881285
1289− int32_t iMaxSliceNumInThread = pDqLayer->sSliceThreadInfo.iMaxSliceNumInThread[kiThreadIndex];
1286+ int32_t iMaxSliceNumInThread = pDqLayer->sSliceThreadInfo[kiThreadIndex].iMaxSliceNum;
12901287 int32_t iMaxSliceNumUpdate = 0;
12911288 int32_t iRet = 0;
1292− SSlice* pLastCodedSlice = pDqLayer->sSliceThreadInfo.pSliceInThread[kiThreadIndex] + (iMaxSliceNumInThread - 1);
1289+ SSlice* pLastCodedSlice = pDqLayer->sSliceThreadInfo[kiThreadIndex].pSliceInThread + (iMaxSliceNumInThread - 1);
12931290 SSliceArgument* pSliceArgument = & pCtx->pSvcParam->sSpatialLayers[kiDlayerIdx].sSliceArgument;
12941291
12951292 iRet = CalculateNewSliceNum (pDqLayer,
@@ -1303,14 +1300,14 @@ int32_t ReallocateSliceInThread (sWelsEncCtx* pCtx, · 7 unmodified lines
13031300
13041301 iRet = ReallocateSliceList (pCtx,
13051302 pSliceArgument,
1306− pDqLayer->sSliceThreadInfo.pSliceInThread[kiThreadIndex],
1303+ pDqLayer->sSliceThreadInfo[kiThreadIndex].pSliceInThread,
13071304 iMaxSliceNumInThread,
13081305 iMaxSliceNumUpdate);
13091306 if (ENC_RETURN_SUCCESS != iRet) {
13101307 return iRet;
13111308 }
13121309
1313− pDqLayer->sSliceThreadInfo.iMaxSliceNumInThread[kiThreadIndex] = iMaxSliceNumUpdate;
1310+ pDqLayer->sSliceThreadInfo[kiThreadIndex].iMaxSliceNum = iMaxSliceNumUpdate;
13141311
13151312 return ENC_RETURN_SUCCESS;
13161313 }
@@ -1361,14 +1358,14 @@ int32_t ExtendLayerBuffer(sWelsEncCtx* pCtx, · 44 unmodified lines
13611358 int32_t ReallocSliceBuffer (sWelsEncCtx* pCtx) {
13621359
13631360 SDqLayer* pCurLayer = pCtx->pCurDqLayer;
1364− int32_t iMaxSliceNumOld = pCurLayer->sSliceThreadInfo.iMaxSliceNumInThread[0];
1361+ int32_t iMaxSliceNumOld = pCurLayer->sSliceThreadInfo[0].iMaxSliceNum;
13651362 int32_t iMaxSliceNumNew = 0;
13661363 int32_t iRet = 0;
13671364 int32_t iSliceIdx = 0;
13681365 int32_t iThreadIdx = 0;
13691366 int32_t iStartIdx = 0;
13701367 const int32_t kiCurDid = pCtx->uiDependencyId;
1371− SSlice* pLastCodedSlice = pCurLayer->sSliceThreadInfo.pSliceInThread[0] + (iMaxSliceNumOld - 1);
1368+ SSlice* pLastCodedSlice = pCurLayer->sSliceThreadInfo[0].pSliceInThread + (iMaxSliceNumOld - 1);
13721369 SSliceArgument* pSliceArgument = & pCtx->pSvcParam->sSpatialLayers[kiCurDid].sSliceArgument;
13731370 iRet = CalculateNewSliceNum (pCurLayer,
13741371 pLastCodedSlice,
@@ -1381,18 +1378,18 @@ int32_t ReallocSliceBuffer (sWelsEncCtx* pCtx) { · 6 unmodified lines
13811378
13821379 iRet = ReallocateSliceList (pCtx,
13831380 pSliceArgument,
1384− pCurLayer->sSliceThreadInfo.pSliceInThread[0],
1381+ pCurLayer->sSliceThreadInfo[0].pSliceInThread,
13851382 iMaxSliceNumOld,
13861383 iMaxSliceNumNew);
13871384 if (ENC_RETURN_SUCCESS != iRet) {
13881385 return iRet;
13891386 }
13901387
1391− pCurLayer->sSliceThreadInfo.iMaxSliceNumInThread[0] = iMaxSliceNumNew;
1388+ pCurLayer->sSliceThreadInfo[0].iMaxSliceNum = iMaxSliceNumNew;
13921389
13931390 iMaxSliceNumNew = 0;
13941391 for(iThreadIdx = 0; iThreadIdx < pCtx->iActiveThreadsNum; iThreadIdx++ ) {
1395− iMaxSliceNumNew += pCurLayer->sSliceThreadInfo.iMaxSliceNumInThread[iThreadIdx];
1392+ iMaxSliceNumNew += pCurLayer->sSliceThreadInfo[iThreadIdx].iMaxSliceNum;
13961393 }
13971394
13981395 iRet = ExtendLayerBuffer(pCtx, pCurLayer->iMaxSliceNum, iMaxSliceNumNew);
@@ -1401,10 +1398,10 @@ int32_t ReallocSliceBuffer (sWelsEncCtx* pCtx) { · 2 unmodified lines
14011398 }
14021399
14031400 for(iThreadIdx = 0; iThreadIdx < pCtx->iActiveThreadsNum; iThreadIdx++ ) {
1404− for (iSliceIdx = 0; iSliceIdx < pCurLayer->sSliceThreadInfo.iMaxSliceNumInThread[iThreadIdx]; iSliceIdx++) {
1405− pCurLayer->ppSliceInLayer[iStartIdx + iSliceIdx] = pCurLayer->sSliceThreadInfo.pSliceInThread[iThreadIdx] + iSliceIdx;
1401+ for (iSliceIdx = 0; iSliceIdx < pCurLayer->sSliceThreadInfo[iThreadIdx].iMaxSliceNum; iSliceIdx++) {
1402+ pCurLayer->ppSliceInLayer[iStartIdx + iSliceIdx] = pCurLayer->sSliceThreadInfo[iThreadIdx].pSliceInThread + iSliceIdx;
14061403 }
1407− iStartIdx += pCurLayer->sSliceThreadInfo.iMaxSliceNumInThread[iThreadIdx];
1404+ iStartIdx += pCurLayer->sSliceThreadInfo[iThreadIdx].iMaxSliceNum;
14081405 }
14091406
14101407 pCurLayer->iMaxSliceNum = iMaxSliceNumNew;
@@ -1463,10 +1460,10 @@ int32_t ReOrderSliceInLayer (sWelsEncCtx* pCtx, · 52 unmodified lines
14631460 //before encode all slices in layer, slices' index are init with -1
14641461 //pSliceInThread->iSliceIdx will be set to actual slice index when encode one slice
14651462 for (iThreadIdx = 0; iThreadIdx < kiThreadNum; iThreadIdx++) {
1466− iSliceNumInThread = pCurLayer->sSliceThreadInfo.iMaxSliceNumInThread[iThreadIdx];
1463+ iSliceNumInThread = pCurLayer->sSliceThreadInfo[iThreadIdx].iMaxSliceNum;
14671464
14681465 for(iSliceIdx =0; iSliceIdx < iSliceNumInThread; iSliceIdx++) {
1469− pSliceInThread = pCurLayer->sSliceThreadInfo.pSliceInThread[iThreadIdx] + iSliceIdx;
1466+ pSliceInThread = pCurLayer->sSliceThreadInfo[iThreadIdx].pSliceInThread + iSliceIdx;
14701467 if (NULL == pSliceInThread) {
14711468 return ENC_RETURN_UNEXPECTED;
14721469 }
@@ -1568,7 +1565,7 @@ int32_t SliceLayerInfoUpdate (sWelsEncCtx* pCtx, · 95 unmodified lines
15681565 int32_t iRet = 0;
15691566
15701567 for ( int32_t iThreadIdx = 0; iThreadIdx < pCtx->iActiveThreadsNum; iThreadIdx++) {
1571− iMaxSliceNum += pCtx->pCurDqLayer->sSliceThreadInfo.iMaxSliceNumInThread[iThreadIdx];
1568+ iMaxSliceNum += pCtx->pCurDqLayer->sSliceThreadInfo[iThreadIdx].iMaxSliceNum;
15721569 }
15731570
15741571 //reallocate ppSliceInLayer if total encoded slice num exceed max slice num
@@ -1661,8 +1658,8 @@ void UpdateMbNeighbourInfoForNextSlice (SDqLayer* pCurDq, · 86 unmodified lines
16611658 void AddSliceBoundary (sWelsEncCtx* pEncCtx, SSlice* pCurSlice, SSliceCtx* pSliceCtx, SMB* pCurMb,
16621659 int32_t iFirstMbIdxOfNextSlice, const int32_t kiLastMbIdxInPartition) {
16631660 SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
1664− SSlice* pSliceInThread = pCurLayer->sSliceThreadInfo.pSliceInThread[pCurSlice->uiThreadIdx];
1665− int32_t iCodedSliceNum = pCurLayer->sSliceThreadInfo.iEncodedSliceNumInThread[pCurSlice->uiThreadIdx];
1661+ SSlice* pSliceInThread = pCurLayer->sSliceThreadInfo[pCurSlice->uiThreadIdx].pSliceInThread;
1662+ int32_t iCodedSliceNum = pCurLayer->sSliceThreadInfo[pCurSlice->uiThreadIdx].iCodedSliceNum;
16661663 int32_t iCurMbIdx = pCurMb->iMbXY;
16671664 uint16_t iCurSliceIdc = pSliceCtx->pOverallMbMap[ iCurMbIdx ];
16681665 const int32_t kiSliceIdxStep = pEncCtx->iActiveThreadsNum;
@@ -1708,7 +1705,7 @@ bool DynSlcJudgeSliceBoundaryStepBack (void* pCtx, void* pSlice, SSliceCtx* pSli · 39 unmodified lines
17081705 const int32_t kiActiveThreadsNum = pEncCtx->iActiveThreadsNum;
17091706 const int32_t kiPartitaionId = pCurSlice->iSliceIdx % kiActiveThreadsNum;
17101707 const int32_t kiEndMbIdxOfPartition = pEncCtx->pCurDqLayer->EndMbIdxOfPartition[kiPartitaionId];
1711− const int32_t kiMaxSliceNum = pEncCtx->pCurDqLayer->sSliceThreadInfo.iMaxSliceNumInThread[pCurSlice->uiThreadIdx];
1708+ const int32_t kiMaxSliceNum = pEncCtx->pCurDqLayer->sSliceThreadInfo[pCurSlice->uiThreadIdx].iMaxSliceNum;
17121709 const bool kbCurMbNotFirstMbOfCurSlice = ((iCurMbIdx > 0) && (pSliceCtx->pOverallMbMap[iCurMbIdx] ==
17131710 pSliceCtx->pOverallMbMap[iCurMbIdx - 1]));
17141711 const bool kbCurMbNotLastMbOfCurPartition = iCurMbIdx < kiEndMbIdxOfPartition;

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