Showing the changes to codec/encoder/core/src/slice_multi_threading.cpp (1 of 13 files). Show all
Unified · Split
| @@ -679,7 +679,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 678 unmodified lines | ||
| 679 | 679 | const int32_t kiFirstMbInPartition = pPrivateData->iStartMbIndex; // inclusive |
| 680 | 680 | const int32_t kiEndMbInPartition = pPrivateData->iEndMbIndex; // exclusive |
| 681 | 681 | int32_t iAnyMbLeftInPartition = kiEndMbInPartition - kiFirstMbInPartition; |
| 682 | − | |
| 682 | + SSpatialLayerInternal *pParamInternal = &pCodingParam->sDependencyLayers[kiCurDid]; | |
| 683 | 683 | iSliceIdx = pPrivateData->iSliceIndex; |
| 684 | 684 | SSliceHeaderExt* pStartSliceHeaderExt = &pCurDq->sLayerInfo.pSliceInLayer[iSliceIdx].sSliceHeaderExt; |
| 685 | 685 | pStartSliceHeaderExt->sSliceHeader.iFirstMbInSlice = kiFirstMbInPartition; |
| @@ -695,7 +695,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 9 unmodified lines | ||
| 695 | 695 | uiThrdRet = 1; |
| 696 | 696 | WelsLog (&pEncPEncCtx->sLogCtx, WELS_LOG_WARNING, |
| 697 | 697 | "[MT] CodingSliceThreadProc Too many slices: coding_idx %d, iSliceIdx %d, pSliceCtx->iMaxSliceNumConstraint %d", |
| 698 | − pEncPEncCtx->iCodingIndex, | |
| 698 | + pParamInternal->iCodingIndex, | |
| 699 | 699 | iSliceIdx, pSliceCtx->iMaxSliceNumConstraint); |
| 700 | 700 | WELS_THREAD_SIGNAL_AND_BREAK (pEncPEncCtx->pSliceThreading->pSliceCodedEvent, |
| 701 | 701 | pEncPEncCtx->pSliceThreading->pSliceCodedMasterEvent, |
| @@ -740,7 +740,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 38 unmodified lines | ||
| 740 | 740 | uiThrdRet = iReturn; |
| 741 | 741 | WelsLog (&pEncPEncCtx->sLogCtx, WELS_LOG_WARNING, |
| 742 | 742 | "[MT] CodingSliceThreadProc, WriteSliceBs not successful: coding_idx %d, iSliceIdx %d, BufferSize %d, m_iSliceSize %d, iPayloadSize %d", |
| 743 | − pEncPEncCtx->iCodingIndex, | |
| 743 | + pParamInternal->iCodingIndex, | |
| 744 | 744 | iSliceIdx, pSliceBs->uiSize, iSliceSize, pSliceBs->sNalList[0].iPayloadSize); |
| 745 | 745 | |
| 746 | 746 | WELS_THREAD_SIGNAL_AND_BREAK (pEncPEncCtx->pSliceThreading->pSliceCodedEvent, |