Showing the changes to codec/encoder/core/src/slice_multi_threading.cpp (1 of 3 files). Show all
Unified · Split
| @@ -334,11 +334,9 @@ int32_t RequestMtResource (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPara · 333 unmodified lines | |||
| 334 | pSmt->pThreadBsBuffer[iIdx] = NULL; | 334 | pSmt->pThreadBsBuffer[iIdx] = NULL; |
| 335 | } | 335 | } |
| 336 | 336 | ||
| 337 | //previous conflict | ||
| 338 | WelsSnprintf (name, SEM_NAME_MAX, "scm%s", pSmt->eventNamespace); | 337 | WelsSnprintf (name, SEM_NAME_MAX, "scm%s", pSmt->eventNamespace); |
| 339 | err = WelsEventOpen (&pSmt->pSliceCodedMasterEvent, name); | 338 | err = WelsEventOpen (&pSmt->pSliceCodedMasterEvent, name); |
| 340 | MT_TRACE_LOG (*ppCtx, WELS_LOG_INFO, "[MT] Open pSliceCodedMasterEvent named(%s) ret%d err%d", name, err, errno); | 339 | MT_TRACE_LOG (*ppCtx, WELS_LOG_INFO, "[MT] Open pSliceCodedMasterEvent named(%s) ret%d err%d", name, err, errno); |
| 341 | //previous conflict ends | ||
| 342 | 340 | ||
| 343 | iReturn = WelsMutexInit (&pSmt->mutexSliceNumUpdate); | 341 | iReturn = WelsMutexInit (&pSmt->mutexSliceNumUpdate); |
| 344 | WELS_VERIFY_RETURN_PROC_IF (1, (WELS_THREAD_ERROR_OK != iReturn), FreeMemorySvc (ppCtx)) | 342 | WELS_VERIFY_RETURN_PROC_IF (1, (WELS_THREAD_ERROR_OK != iReturn), FreeMemorySvc (ppCtx)) |