Showing the changes to codec/encoder/core/src/slice_multi_threading.cpp (1 of 6 files). Show all
Unified · Split
| @@ -569,7 +569,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 568 unmodified lines | |||
| 569 | int64_t iSliceStart = 0; | 569 | int64_t iSliceStart = 0; |
| 570 | bool bDsaFlag = false; | 570 | bool bDsaFlag = false; |
| 571 | iSliceIdx = pPrivateData->iSliceIndex; | 571 | iSliceIdx = pPrivateData->iSliceIndex; |
| 572 | pSlice = &pCurDq->sSliceThreadInfo.pSliceInThread[iThreadIdx][iSliceIdx]; | 572 | pSlice = &pCurDq->sSliceThreadInfo[iThreadIdx].pSliceInThread[iSliceIdx]; |
| 573 | pSliceBs = &pSlice->sSliceBs; | 573 | pSliceBs = &pSlice->sSliceBs; |
| 574 | 574 | ||
| 575 | bDsaFlag = ((pParamD->sSliceArgument.uiSliceMode == SM_FIXEDSLCNUM_SLICE) && | 575 | bDsaFlag = ((pParamD->sSliceArgument.uiSliceMode == SM_FIXEDSLCNUM_SLICE) && |
| @@ -675,7 +675,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 99 unmodified lines | |||
| 675 | int32_t iAnyMbLeftInPartition = kiEndMbIdxInPartition - kiFirstMbInPartition + 1; | 675 | int32_t iAnyMbLeftInPartition = kiEndMbIdxInPartition - kiFirstMbInPartition + 1; |
| 676 | SSpatialLayerInternal *pParamInternal = &pCodingParam->sDependencyLayers[kiCurDid]; | 676 | SSpatialLayerInternal *pParamInternal = &pCodingParam->sDependencyLayers[kiCurDid]; |
| 677 | iSliceIdx = pPrivateData->iSliceIndex; | 677 | iSliceIdx = pPrivateData->iSliceIndex; |
| 678 | SSlice* pStartSlice = &pCurDq->sSliceThreadInfo.pSliceInThread[iThreadIdx][iSliceIdx]; | 678 | SSlice* pStartSlice = &pCurDq->sSliceThreadInfo[iThreadIdx].pSliceInThread[iSliceIdx]; |
| 679 | pStartSlice->sSliceHeaderExt.sSliceHeader.iFirstMbInSlice = kiFirstMbInPartition; | 679 | pStartSlice->sSliceHeaderExt.sSliceHeader.iFirstMbInSlice = kiFirstMbInPartition; |
| 680 | while (iAnyMbLeftInPartition > 0) { | 680 | while (iAnyMbLeftInPartition > 0) { |
| 681 | if (iSliceIdx >= pCurDq->iMaxSliceNum) { | 681 | if (iSliceIdx >= pCurDq->iMaxSliceNum) { |
| @@ -690,7 +690,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 8 unmodified lines | |||
| 690 | pEncPEncCtx->pSliceThreading->pSliceCodedMasterEvent, | 690 | pEncPEncCtx->pSliceThreading->pSliceCodedMasterEvent, |
| 691 | iEventIdx); | 691 | iEventIdx); |
| 692 | } | 692 | } |
| 693 | pSlice = &pCurDq->sSliceThreadInfo.pSliceInThread[iThreadIdx][iSliceIdx]; | 693 | pSlice = &pCurDq->sSliceThreadInfo[iThreadIdx].pSliceInThread[iSliceIdx]; |
| 694 | pSliceBs = &pSlice->sSliceBs; | 694 | pSliceBs = &pSlice->sSliceBs; |
| 695 | pSliceBs->uiBsPos = 0; | 695 | pSliceBs->uiBsPos = 0; |
| 696 | pSliceBs->iNalIndex = 0; | 696 | pSliceBs->iNalIndex = 0; |