Showing the changes to codec/encoder/core/src/slice_multi_threading.cpp (1 of 7 files). Show all
Unified · Split
| @@ -374,7 +374,8 @@ int32_t RequestMtResource (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPara · 373 unmodified lines | |||
| 374 | pSmt->pSliceComplexRatio[iIdx] = NULL; | 374 | pSmt->pSliceComplexRatio[iIdx] = NULL; |
| 375 | } | 375 | } |
| 376 | 376 | ||
| 377 | if ( pMso->uiSliceMode == SM_FIXEDSLCNUM_SLICE || pMso->uiSliceMode == SM_RASTER_SLICE || pMso->uiSliceMode == SM_ROWMB_SLICE) { | 377 | if ( pMso->uiSliceMode == SM_FIXEDSLCNUM_SLICE || pMso->uiSliceMode == SM_RASTER_SLICE |
| 378 | || pMso->uiSliceMode == SM_ROWMB_SLICE || pMso->uiSliceMode == SM_AUTO_SLICE) { | ||
| 378 | bWillUseTaskManage = true; | 379 | bWillUseTaskManage = true; |
| 379 | } | 380 | } |
| 380 | ++ iIdx; | 381 | ++ iIdx; |
| @@ -441,7 +442,6 @@ int32_t RequestMtResource (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPara · 60 unmodified lines | |||
| 441 | MT_TRACE_LOG (*ppCtx, WELS_LOG_INFO, "[MT] Open pSliceCodedMasterEvent named(%s) ret%d err%d", name, err, errno); | 442 | MT_TRACE_LOG (*ppCtx, WELS_LOG_INFO, "[MT] Open pSliceCodedMasterEvent named(%s) ret%d err%d", name, err, errno); |
| 442 | //previous conflict ends | 443 | //previous conflict ends |
| 443 | 444 | ||
| 444 | |||
| 445 | iReturn = SetMultiSliceBuffer (ppCtx, pMa, pSmt, iMaxSliceNum, | 445 | iReturn = SetMultiSliceBuffer (ppCtx, pMa, pSmt, iMaxSliceNum, |
| 446 | iMaxSliceBufferSize, | 446 | iMaxSliceBufferSize, |
| 447 | iCountBsLen, | 447 | iCountBsLen, |
| @@ -884,6 +884,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 436 unmodified lines | |||
| 884 | } | 884 | } |
| 885 | } | 885 | } |
| 886 | 886 | ||
| 887 | |||
| 887 | WelsLoadNalForSlice (pSliceBs, eNalType, eNalRefIdc); | 888 | WelsLoadNalForSlice (pSliceBs, eNalType, eNalRefIdc); |
| 888 | 889 | ||
| 889 | iReturn = WelsCodeOneSlice (pEncPEncCtx, iSliceIdx, eNalType); | 890 | iReturn = WelsCodeOneSlice (pEncPEncCtx, iSliceIdx, eNalType); |