Showing the changes to codec/encoder/core/src/svc_encode_slice.cpp (1 of 6 files). Show all
Unified · Split
| @@ -994,7 +994,7 @@ int32_t InitAllSlicesInThread (sWelsEncCtx* pCtx) { · 993 unmodified lines | ||
| 994 | 994 | } |
| 995 | 995 | |
| 996 | 996 | for( ; iTheadIdx < pCtx->iActiveThreadsNum; iTheadIdx++ ) { |
| 997 | − pCurDqLayer->sSliceThreadInfo.iEncodedSliceNumInThread[iTheadIdx] = 0; | |
| 997 | + pCurDqLayer->sSliceThreadInfo[iTheadIdx].iCodedSliceNum = 0; | |
| 998 | 998 | } |
| 999 | 999 | |
| 1000 | 1000 | return ENC_RETURN_SUCCESS; |
| @@ -1006,11 +1006,11 @@ int32_t InitOneSliceInThread (sWelsEncCtx* pCtx, · 5 unmodified lines | ||
| 1006 | 1006 | const int32_t kiDlayerIdx, |
| 1007 | 1007 | const int32_t kiSliceIdx) { |
| 1008 | 1008 | SDqLayer* pDqLayer = pCtx->pCurDqLayer; |
| 1009 | − const int32_t kiCodedNumInThread = pDqLayer->sSliceThreadInfo.iEncodedSliceNumInThread[kiThreadIdx]; | |
| 1009 | + const int32_t kiCodedNumInThread = pDqLayer->sSliceThreadInfo[kiThreadIdx].iCodedSliceNum; | |
| 1010 | 1010 | |
| 1011 | − assert(kiCodedNumInThread < pDqLayer->sSliceThreadInfo.iMaxSliceNumInThread[kiThreadIdx] -1 ); | |
| 1011 | + assert(kiCodedNumInThread < pDqLayer->sSliceThreadInfo[kiThreadIdx].iMaxSliceNum -1 ); | |
| 1012 | 1012 | |
| 1013 | − pSlice = &pDqLayer->sSliceThreadInfo.pSliceInThread [kiThreadIdx][kiCodedNumInThread]; | |
| 1013 | + pSlice = &pDqLayer->sSliceThreadInfo [kiThreadIdx].pSliceInThread[kiCodedNumInThread]; | |
| 1014 | 1014 | pSlice->iSliceIdx = kiSliceIdx; |
| 1015 | 1015 | pSlice->uiThreadIdx = kiThreadIdx; |
| 1016 | 1016 | |
| @@ -1026,8 +1026,6 @@ int32_t InitSliceThreadInfo (sWelsEncCtx* pCtx, · 9 unmodified lines | ||
| 1026 | 1026 | SDqLayer* pDqLayer, |
| 1027 | 1027 | const int32_t kiDlayerIndex, |
| 1028 | 1028 | CMemoryAlign* pMa) { |
| 1029 | − | |
| 1030 | − SSliceThreadInfo* pSliceThreadInfo = &pDqLayer->sSliceThreadInfo; | |
| 1031 | 1029 | int32_t iThreadNum = pCtx->pSvcParam->iMultipleThreadIdc; |
| 1032 | 1030 | int32_t iMaxSliceNumInThread = 0; |
| 1033 | 1031 | int32_t iIdx = 0; |
| @@ -1036,17 +1034,17 @@ int32_t InitSliceThreadInfo (sWelsEncCtx* pCtx, · 2 unmodified lines | ||
| 1036 | 1034 | assert (iThreadNum > 0); |
| 1037 | 1035 | iMaxSliceNumInThread = pDqLayer->iMaxSliceNum; |
| 1038 | 1036 | 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) { | |
| 1043 | 1041 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, |
| 1044 | 1042 | "CWelsH264SVCEncoder::InitSliceThreadInfo: pSliceThreadInfo->pSliceInThread[iIdx] is NULL"); |
| 1045 | 1043 | return ENC_RETURN_MEMALLOCERR; |
| 1046 | 1044 | } |
| 1047 | 1045 | iRet = InitSliceList (pCtx, |
| 1048 | 1046 | pDqLayer, |
| 1049 | − pSliceThreadInfo->pSliceInThread[iIdx], | |
| 1047 | + pDqLayer->sSliceThreadInfo[iIdx].pSliceInThread, | |
| 1050 | 1048 | iMaxSliceNumInThread, |
| 1051 | 1049 | kiDlayerIndex, |
| 1052 | 1050 | pMa); |
| @@ -1057,9 +1055,9 @@ int32_t InitSliceThreadInfo (sWelsEncCtx* pCtx, · 4 unmodified lines | ||
| 1057 | 1055 | } |
| 1058 | 1056 | |
| 1059 | 1057 | 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; | |
| 1063 | 1061 | } |
| 1064 | 1062 | return ENC_RETURN_SUCCESS; |
| 1065 | 1063 | } |
| @@ -1084,7 +1082,7 @@ int32_t InitSliceInLayer (sWelsEncCtx* pCtx, · 18 unmodified lines | ||
| 1084 | 1082 | |
| 1085 | 1083 | pDqLayer->iMaxSliceNum = 0; |
| 1086 | 1084 | for(iThreadIdx = 0; iThreadIdx < pCtx->iActiveThreadsNum; iThreadIdx++ ) { |
| 1087 | − pDqLayer->iMaxSliceNum += pDqLayer->sSliceThreadInfo.iMaxSliceNumInThread[iThreadIdx]; | |
| 1085 | + pDqLayer->iMaxSliceNum += pDqLayer->sSliceThreadInfo[iThreadIdx].iMaxSliceNum; | |
| 1088 | 1086 | } |
| 1089 | 1087 | |
| 1090 | 1088 | pDqLayer->ppSliceInLayer = (SSlice**)pMa->WelsMallocz (sizeof (SSlice*) * pDqLayer->iMaxSliceNum, "ppSliceInLayer"); |
| @@ -1112,11 +1110,11 @@ int32_t InitSliceInLayer (sWelsEncCtx* pCtx, · 21 unmodified lines | ||
| 1112 | 1110 | |
| 1113 | 1111 | iStartIdx = 0; |
| 1114 | 1112 | 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; | |
| 1117 | 1115 | } |
| 1118 | 1116 | |
| 1119 | − iStartIdx += pDqLayer->sSliceThreadInfo.iMaxSliceNumInThread[iThreadIdx]; | |
| 1117 | + iStartIdx += pDqLayer->sSliceThreadInfo[iThreadIdx].iMaxSliceNum; | |
| 1120 | 1118 | } |
| 1121 | 1119 | |
| 1122 | 1120 | return ENC_RETURN_SUCCESS; |
| @@ -1257,7 +1255,6 @@ int32_t ReallocateSliceList (sWelsEncCtx* pCtx, · 134 unmodified lines | ||
| 1257 | 1255 | pSliceList = pNewSliceList; |
| 1258 | 1256 | |
| 1259 | 1257 | return ENC_RETURN_SUCCESS; |
| 1260 | − | |
| 1261 | 1258 | } |
| 1262 | 1259 | |
| 1263 | 1260 | int32_t CalculateNewSliceNum (SDqLayer* pDqLayer, |
| @@ -1286,10 +1283,10 @@ int32_t ReallocateSliceInThread (sWelsEncCtx* pCtx, · 22 unmodified lines | ||
| 1286 | 1283 | const int32_t kiDlayerIdx, |
| 1287 | 1284 | const int32_t kiThreadIndex) { |
| 1288 | 1285 | |
| 1289 | − int32_t iMaxSliceNumInThread = pDqLayer->sSliceThreadInfo.iMaxSliceNumInThread[kiThreadIndex]; | |
| 1286 | + int32_t iMaxSliceNumInThread = pDqLayer->sSliceThreadInfo[kiThreadIndex].iMaxSliceNum; | |
| 1290 | 1287 | int32_t iMaxSliceNumUpdate = 0; |
| 1291 | 1288 | int32_t iRet = 0; |
| 1292 | − SSlice* pLastCodedSlice = pDqLayer->sSliceThreadInfo.pSliceInThread[kiThreadIndex] + (iMaxSliceNumInThread - 1); | |
| 1289 | + SSlice* pLastCodedSlice = pDqLayer->sSliceThreadInfo[kiThreadIndex].pSliceInThread + (iMaxSliceNumInThread - 1); | |
| 1293 | 1290 | SSliceArgument* pSliceArgument = & pCtx->pSvcParam->sSpatialLayers[kiDlayerIdx].sSliceArgument; |
| 1294 | 1291 | |
| 1295 | 1292 | iRet = CalculateNewSliceNum (pDqLayer, |
| @@ -1303,14 +1300,14 @@ int32_t ReallocateSliceInThread (sWelsEncCtx* pCtx, · 7 unmodified lines | ||
| 1303 | 1300 | |
| 1304 | 1301 | iRet = ReallocateSliceList (pCtx, |
| 1305 | 1302 | pSliceArgument, |
| 1306 | − pDqLayer->sSliceThreadInfo.pSliceInThread[kiThreadIndex], | |
| 1303 | + pDqLayer->sSliceThreadInfo[kiThreadIndex].pSliceInThread, | |
| 1307 | 1304 | iMaxSliceNumInThread, |
| 1308 | 1305 | iMaxSliceNumUpdate); |
| 1309 | 1306 | if (ENC_RETURN_SUCCESS != iRet) { |
| 1310 | 1307 | return iRet; |
| 1311 | 1308 | } |
| 1312 | 1309 | |
| 1313 | − pDqLayer->sSliceThreadInfo.iMaxSliceNumInThread[kiThreadIndex] = iMaxSliceNumUpdate; | |
| 1310 | + pDqLayer->sSliceThreadInfo[kiThreadIndex].iMaxSliceNum = iMaxSliceNumUpdate; | |
| 1314 | 1311 | |
| 1315 | 1312 | return ENC_RETURN_SUCCESS; |
| 1316 | 1313 | } |
| @@ -1361,14 +1358,14 @@ int32_t ExtendLayerBuffer(sWelsEncCtx* pCtx, · 44 unmodified lines | ||
| 1361 | 1358 | int32_t ReallocSliceBuffer (sWelsEncCtx* pCtx) { |
| 1362 | 1359 | |
| 1363 | 1360 | SDqLayer* pCurLayer = pCtx->pCurDqLayer; |
| 1364 | − int32_t iMaxSliceNumOld = pCurLayer->sSliceThreadInfo.iMaxSliceNumInThread[0]; | |
| 1361 | + int32_t iMaxSliceNumOld = pCurLayer->sSliceThreadInfo[0].iMaxSliceNum; | |
| 1365 | 1362 | int32_t iMaxSliceNumNew = 0; |
| 1366 | 1363 | int32_t iRet = 0; |
| 1367 | 1364 | int32_t iSliceIdx = 0; |
| 1368 | 1365 | int32_t iThreadIdx = 0; |
| 1369 | 1366 | int32_t iStartIdx = 0; |
| 1370 | 1367 | const int32_t kiCurDid = pCtx->uiDependencyId; |
| 1371 | − SSlice* pLastCodedSlice = pCurLayer->sSliceThreadInfo.pSliceInThread[0] + (iMaxSliceNumOld - 1); | |
| 1368 | + SSlice* pLastCodedSlice = pCurLayer->sSliceThreadInfo[0].pSliceInThread + (iMaxSliceNumOld - 1); | |
| 1372 | 1369 | SSliceArgument* pSliceArgument = & pCtx->pSvcParam->sSpatialLayers[kiCurDid].sSliceArgument; |
| 1373 | 1370 | iRet = CalculateNewSliceNum (pCurLayer, |
| 1374 | 1371 | pLastCodedSlice, |
| @@ -1381,18 +1378,18 @@ int32_t ReallocSliceBuffer (sWelsEncCtx* pCtx) { · 6 unmodified lines | ||
| 1381 | 1378 | |
| 1382 | 1379 | iRet = ReallocateSliceList (pCtx, |
| 1383 | 1380 | pSliceArgument, |
| 1384 | − pCurLayer->sSliceThreadInfo.pSliceInThread[0], | |
| 1381 | + pCurLayer->sSliceThreadInfo[0].pSliceInThread, | |
| 1385 | 1382 | iMaxSliceNumOld, |
| 1386 | 1383 | iMaxSliceNumNew); |
| 1387 | 1384 | if (ENC_RETURN_SUCCESS != iRet) { |
| 1388 | 1385 | return iRet; |
| 1389 | 1386 | } |
| 1390 | 1387 | |
| 1391 | − pCurLayer->sSliceThreadInfo.iMaxSliceNumInThread[0] = iMaxSliceNumNew; | |
| 1388 | + pCurLayer->sSliceThreadInfo[0].iMaxSliceNum = iMaxSliceNumNew; | |
| 1392 | 1389 | |
| 1393 | 1390 | iMaxSliceNumNew = 0; |
| 1394 | 1391 | for(iThreadIdx = 0; iThreadIdx < pCtx->iActiveThreadsNum; iThreadIdx++ ) { |
| 1395 | − iMaxSliceNumNew += pCurLayer->sSliceThreadInfo.iMaxSliceNumInThread[iThreadIdx]; | |
| 1392 | + iMaxSliceNumNew += pCurLayer->sSliceThreadInfo[iThreadIdx].iMaxSliceNum; | |
| 1396 | 1393 | } |
| 1397 | 1394 | |
| 1398 | 1395 | iRet = ExtendLayerBuffer(pCtx, pCurLayer->iMaxSliceNum, iMaxSliceNumNew); |
| @@ -1401,10 +1398,10 @@ int32_t ReallocSliceBuffer (sWelsEncCtx* pCtx) { · 2 unmodified lines | ||
| 1401 | 1398 | } |
| 1402 | 1399 | |
| 1403 | 1400 | 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; | |
| 1406 | 1403 | } |
| 1407 | − iStartIdx += pCurLayer->sSliceThreadInfo.iMaxSliceNumInThread[iThreadIdx]; | |
| 1404 | + iStartIdx += pCurLayer->sSliceThreadInfo[iThreadIdx].iMaxSliceNum; | |
| 1408 | 1405 | } |
| 1409 | 1406 | |
| 1410 | 1407 | pCurLayer->iMaxSliceNum = iMaxSliceNumNew; |
| @@ -1463,10 +1460,10 @@ int32_t ReOrderSliceInLayer (sWelsEncCtx* pCtx, · 52 unmodified lines | ||
| 1463 | 1460 | //before encode all slices in layer, slices' index are init with -1 |
| 1464 | 1461 | //pSliceInThread->iSliceIdx will be set to actual slice index when encode one slice |
| 1465 | 1462 | for (iThreadIdx = 0; iThreadIdx < kiThreadNum; iThreadIdx++) { |
| 1466 | − iSliceNumInThread = pCurLayer->sSliceThreadInfo.iMaxSliceNumInThread[iThreadIdx]; | |
| 1463 | + iSliceNumInThread = pCurLayer->sSliceThreadInfo[iThreadIdx].iMaxSliceNum; | |
| 1467 | 1464 | |
| 1468 | 1465 | for(iSliceIdx =0; iSliceIdx < iSliceNumInThread; iSliceIdx++) { |
| 1469 | − pSliceInThread = pCurLayer->sSliceThreadInfo.pSliceInThread[iThreadIdx] + iSliceIdx; | |
| 1466 | + pSliceInThread = pCurLayer->sSliceThreadInfo[iThreadIdx].pSliceInThread + iSliceIdx; | |
| 1470 | 1467 | if (NULL == pSliceInThread) { |
| 1471 | 1468 | return ENC_RETURN_UNEXPECTED; |
| 1472 | 1469 | } |
| @@ -1568,7 +1565,7 @@ int32_t SliceLayerInfoUpdate (sWelsEncCtx* pCtx, · 95 unmodified lines | ||
| 1568 | 1565 | int32_t iRet = 0; |
| 1569 | 1566 | |
| 1570 | 1567 | for ( int32_t iThreadIdx = 0; iThreadIdx < pCtx->iActiveThreadsNum; iThreadIdx++) { |
| 1571 | − iMaxSliceNum += pCtx->pCurDqLayer->sSliceThreadInfo.iMaxSliceNumInThread[iThreadIdx]; | |
| 1568 | + iMaxSliceNum += pCtx->pCurDqLayer->sSliceThreadInfo[iThreadIdx].iMaxSliceNum; | |
| 1572 | 1569 | } |
| 1573 | 1570 | |
| 1574 | 1571 | //reallocate ppSliceInLayer if total encoded slice num exceed max slice num |
| @@ -1661,8 +1658,8 @@ void UpdateMbNeighbourInfoForNextSlice (SDqLayer* pCurDq, · 86 unmodified lines | ||
| 1661 | 1658 | void AddSliceBoundary (sWelsEncCtx* pEncCtx, SSlice* pCurSlice, SSliceCtx* pSliceCtx, SMB* pCurMb, |
| 1662 | 1659 | int32_t iFirstMbIdxOfNextSlice, const int32_t kiLastMbIdxInPartition) { |
| 1663 | 1660 | 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; | |
| 1666 | 1663 | int32_t iCurMbIdx = pCurMb->iMbXY; |
| 1667 | 1664 | uint16_t iCurSliceIdc = pSliceCtx->pOverallMbMap[ iCurMbIdx ]; |
| 1668 | 1665 | const int32_t kiSliceIdxStep = pEncCtx->iActiveThreadsNum; |
| @@ -1708,7 +1705,7 @@ bool DynSlcJudgeSliceBoundaryStepBack (void* pCtx, void* pSlice, SSliceCtx* pSli · 39 unmodified lines | ||
| 1708 | 1705 | const int32_t kiActiveThreadsNum = pEncCtx->iActiveThreadsNum; |
| 1709 | 1706 | const int32_t kiPartitaionId = pCurSlice->iSliceIdx % kiActiveThreadsNum; |
| 1710 | 1707 | 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; | |
| 1712 | 1709 | const bool kbCurMbNotFirstMbOfCurSlice = ((iCurMbIdx > 0) && (pSliceCtx->pOverallMbMap[iCurMbIdx] == |
| 1713 | 1710 | pSliceCtx->pOverallMbMap[iCurMbIdx - 1])); |
| 1714 | 1711 | const bool kbCurMbNotLastMbOfCurPartition = iCurMbIdx < kiEndMbIdxOfPartition; |