Showing the changes to codec/encoder/core/src/wels_task_encoder.cpp (1 of 5 files). Show all
Unified · Split
| @@ -237,8 +237,8 @@ WelsErrorType CWelsConstrainedSizeSlicingEncodingTask::ExecuteTask() { · 236 unmodified lines | ||
| 237 | 237 | const int32_t kiPartitionId = m_iSliceIdx % kiSliceIdxStep; |
| 238 | 238 | const int32_t kiFirstMbInPartition = pCurDq->FirstMbIdxOfPartition[kiPartitionId]; |
| 239 | 239 | const int32_t kiEndMbIdxInPartition = pCurDq->EndMbIdxOfPartition[kiPartitionId]; |
| 240 | − const int32_t kiCodedSliceNumByThread = pCurDq->sSliceThreadInfo[m_iThreadIdx].iCodedSliceNum; | |
| 241 | − m_pSlice = &pCurDq->sSliceThreadInfo[m_iThreadIdx].pSliceBuffer[kiCodedSliceNumByThread]; | |
| 240 | + const int32_t kiCodedSliceNumByThread = pCurDq->sSliceBufferInfo[m_iThreadIdx].iCodedSliceNum; | |
| 241 | + m_pSlice = &pCurDq->sSliceBufferInfo[m_iThreadIdx].pSliceBuffer[kiCodedSliceNumByThread]; | |
| 242 | 242 | m_pSlice->sSliceHeaderExt.sSliceHeader.iFirstMbInSlice = kiFirstMbInPartition; |
| 243 | 243 | int32_t iReturn = 0; |
| 244 | 244 | bool bNeedReallocate = false; |
| @@ -253,8 +253,8 @@ WelsErrorType CWelsConstrainedSizeSlicingEncodingTask::ExecuteTask() { · 8 unmodified lines | ||
| 253 | 253 | int32_t iAnyMbLeftInPartition = iDiffMbIdx + 1; |
| 254 | 254 | int32_t iLocalSliceIdx = m_iSliceIdx; |
| 255 | 255 | while (iAnyMbLeftInPartition > 0) { |
| 256 | − bNeedReallocate = (pCurDq->sSliceThreadInfo[m_iThreadIdx].iCodedSliceNum | |
| 257 | − >= pCurDq->sSliceThreadInfo[m_iThreadIdx].iMaxSliceNum -1) ? true : false; | |
| 256 | + bNeedReallocate = (pCurDq->sSliceBufferInfo[m_iThreadIdx].iCodedSliceNum | |
| 257 | + >= pCurDq->sSliceBufferInfo[m_iThreadIdx].iMaxSliceNum -1) ? true : false; | |
| 258 | 258 | if (bNeedReallocate) { |
| 259 | 259 | WelsMutexLock (&m_pCtx->pSliceThreading->mutexThreadSlcBuffReallocate); |
| 260 | 260 | //for memory statistic variable |
| @@ -316,7 +316,7 @@ WelsErrorType CWelsConstrainedSizeSlicingEncodingTask::ExecuteTask() { · 55 unmodified lines | ||
| 316 | 316 | |
| 317 | 317 | iAnyMbLeftInPartition = kiEndMbIdxInPartition - pCurDq->LastCodedMbIdxOfPartition[kiPartitionId]; |
| 318 | 318 | iLocalSliceIdx += kiSliceIdxStep; |
| 319 | − m_pCtx->pCurDqLayer->sSliceThreadInfo[m_iThreadIdx].iCodedSliceNum ++; | |
| 319 | + m_pCtx->pCurDqLayer->sSliceBufferInfo[m_iThreadIdx].iCodedSliceNum ++; | |
| 320 | 320 | } |
| 321 | 321 | |
| 322 | 322 | return ENC_RETURN_SUCCESS; |