Showing the changes to codec/encoder/core/src/slice_multi_threading.cpp (1 of 14 files). Show all
Unified · Split
| @@ -940,7 +940,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 939 unmodified lines | |||
| 940 | WelsEventSignal ( | 940 | WelsEventSignal ( |
| 941 | &pEncPEncCtx->pSliceThreading->pFinUpdateMbListEvent[iEventIdx]); // mean finished update pMb list for this pSlice | 941 | &pEncPEncCtx->pSliceThreading->pFinUpdateMbListEvent[iEventIdx]); // mean finished update pMb list for this pSlice |
| 942 | } else { // WELS_THREAD_ERROR_WAIT_TIMEOUT, or WELS_THREAD_ERROR_WAIT_FAILED | 942 | } else { // WELS_THREAD_ERROR_WAIT_TIMEOUT, or WELS_THREAD_ERROR_WAIT_FAILED |
| 943 | WelsLog (pEncPEncCtx, WELS_LOG_WARNING, | 943 | WelsLog (&(pEncPEncCtx->sLogCtx), WELS_LOG_WARNING, |
| 944 | "[MT] CodingSliceThreadProc(), waiting pReadySliceCodingEvent[%d] failed(%d) and thread%d terminated!\n", iEventIdx, | 944 | "[MT] CodingSliceThreadProc(), waiting pReadySliceCodingEvent[%d] failed(%d) and thread%d terminated!\n", iEventIdx, |
| 945 | iWaitRet, iThreadIdx); | 945 | iWaitRet, iThreadIdx); |
| 946 | uiThrdRet = 1; | 946 | uiThrdRet = 1; |
| @@ -978,7 +978,7 @@ int32_t FiredSliceThreads (sWelsEncCtx* pCtx, SSliceThreadPrivateData* pPriData, · 31 unmodified lines | |||
| 978 | const int32_t kiEventCnt = uiNumThreads; | 978 | const int32_t kiEventCnt = uiNumThreads; |
| 979 | 979 | ||
| 980 | if (pPriData == NULL || pLbi == NULL || kiEventCnt <= 0 || pEventsList == NULL) { | 980 | if (pPriData == NULL || pLbi == NULL || kiEventCnt <= 0 || pEventsList == NULL) { |
| 981 | WelsLog (pCtx, WELS_LOG_ERROR, | 981 | WelsLog (&(pCtx->sLogCtx), WELS_LOG_ERROR, |
| 982 | "FiredSliceThreads(), fail due pPriData == %p || pLbi == %p || iEventCnt(%d) <= 0 || pEventsList == %p!!\n", | 982 | "FiredSliceThreads(), fail due pPriData == %p || pLbi == %p || iEventCnt(%d) <= 0 || pEventsList == %p!!\n", |
| 983 | (void*)pPriData, (void*)pLbi, uiNumThreads, (void*)pEventsList); | 983 | (void*)pPriData, (void*)pLbi, uiNumThreads, (void*)pEventsList); |
| 984 | return 1; | 984 | return 1; |