Showing the changes to codec/encoder/core/src/slice_multi_threading.cpp (1 of 5 files). Show all
Unified · Split
| @@ -688,7 +688,6 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 687 unmodified lines | ||
| 688 | 688 | WelsEventSignal ( |
| 689 | 689 | &pEncPEncCtx->pSliceThreading->pSliceCodedMasterEvent); |
| 690 | 690 | } else { // for SM_SIZELIMITED_SLICE parallelization |
| 691 | − SSliceCtx* pSliceCtx = &pCurDq->sSliceEncCtx; | |
| 692 | 691 | const int32_t kiPartitionId = iThreadIdx; |
| 693 | 692 | const int32_t kiSliceIdxStep = pEncPEncCtx->iActiveThreadsNum; |
| 694 | 693 | const int32_t kiFirstMbInPartition = pCurDq->pFirstMbIdxOfPartition[kiPartitionId]; |
| @@ -702,14 +701,14 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 7 unmodified lines | ||
| 702 | 701 | pCurDq->pLastCodedMbIdxOfPartition[kiPartitionId] = 0; |
| 703 | 702 | |
| 704 | 703 | while (iAnyMbLeftInPartition > 0) { |
| 705 | − if (iSliceIdx >= pSliceCtx->iMaxSliceNumConstraint) { | |
| 704 | + if (iSliceIdx >= pCurDq->iMaxSliceNum) { | |
| 706 | 705 | // TODO: need exception handler for not large enough of MAX_SLICES_NUM related memory usage |
| 707 | 706 | // No idea about its solution due MAX_SLICES_NUM is fixed lenght in relevent pData structure |
| 708 | 707 | uiThrdRet = 1; |
| 709 | 708 | WelsLog (&pEncPEncCtx->sLogCtx, WELS_LOG_WARNING, |
| 710 | − "[MT] CodingSliceThreadProc Too many slices: coding_idx %d, iSliceIdx %d, pSliceCtx->iMaxSliceNumConstraint %d", | |
| 709 | + "[MT] CodingSliceThreadProc Too many slices: coding_idx %d, iSliceIdx %d, pCurDq->iMaxSliceNum %d", | |
| 711 | 710 | pParamInternal->iCodingIndex, |
| 712 | − iSliceIdx, pSliceCtx->iMaxSliceNumConstraint); | |
| 711 | + iSliceIdx, pCurDq->iMaxSliceNum); | |
| 713 | 712 | WELS_THREAD_SIGNAL_AND_BREAK (pEncPEncCtx->pSliceThreading->pSliceCodedEvent, |
| 714 | 713 | pEncPEncCtx->pSliceThreading->pSliceCodedMasterEvent, |
| 715 | 714 | iEventIdx); |