shithub: openh264

Info  •  Files  •  Log  •  Branches

Use WelsThreadJoin on windows as well

This avoids using a separate event just for signalling that
a thread has finished running.

--- a/codec/encoder/core/inc/mt_defs.h

+++ b/codec/encoder/core/inc/mt_defs.h

@@ -100,9 +100,6 @@

 WELS_EVENT					pFinUpdateMbListEvent[MAX_THREADS_NUM];	// signal to indicate finish updating mb list

 WELS_EVENT					pExitEncodeEvent[MAX_THREADS_NUM];			// event for exit encoding event

 WELS_EVENT					pThreadMasterEvent[MAX_THREADS_NUM];	// event for indicating that some event has been signalled to the thread

-#ifdef _WIN32

-WELS_EVENT					pFinSliceCodingEvent[MAX_THREADS_NUM];	// notify slice coding thread is done

-#endif//_WIN32

 WELS_MUTEX					mutexSliceNumUpdate;	// for dynamic slicing mode MT

--- a/codec/encoder/core/src/encoder_ext.cpp

+++ b/codec/encoder/core/src/encoder_ext.cpp

@@ -2158,10 +2158,9 @@

         if ((*ppCtx)->pSliceThreading->pThreadHandles[iThreadIdx] != NULL)	// iThreadIdx is already created successfully

           WelsEventSignal (& (*ppCtx)->pSliceThreading->pExitEncodeEvent[iThreadIdx]);

           WelsEventSignal (& (*ppCtx)->pSliceThreading->pThreadMasterEvent[iThreadIdx]);

+          WelsThreadJoin ((*ppCtx)->pSliceThreading->pThreadHandles[iThreadIdx]);	// waiting thread exit

         ++ iThreadIdx;

       } while (iThreadIdx < iThreadCount);

-

-      WelsMultipleEventsWaitAllBlocking (iThreadCount, & (*ppCtx)->pSliceThreading->pFinSliceCodingEvent[0]);

     }

 #else

--- a/codec/encoder/core/src/slice_multi_threading.cpp

+++ b/codec/encoder/core/src/slice_multi_threading.cpp

@@ -362,11 +362,6 @@

     pSmt->pThreadPEncCtx[iIdx].iThreadIndex	= iIdx;

     pSmt->pThreadHandles[iIdx]				= 0;

-#ifdef _WIN32

-    WelsSnprintf (name, SEM_NAME_MAX, "fs%d%s", iIdx, pSmt->eventNamespace);

-    err = WelsEventOpen (&pSmt->pFinSliceCodingEvent[iIdx], name);

-    MT_TRACE_LOG ((*ppCtx), WELS_LOG_INFO, "[MT] Open pFinSliceCodingEvent%d named(%s) ret%d err%d\n", iIdx, name, err, errno);

-#endif//_WIN32

     WelsSnprintf (name, SEM_NAME_MAX, "ee%d%s", iIdx, pSmt->eventNamespace);

     err = WelsEventOpen (&pSmt->pExitEncodeEvent[iIdx], name);

     MT_TRACE_LOG ((*ppCtx), WELS_LOG_INFO, "[MT] Open pExitEncodeEvent%d named(%s) ret%d err%d\n", iIdx, name, err, errno);

@@ -460,8 +455,6 @@

     if (pSmt->pThreadHandles != NULL && pSmt->pThreadHandles[iIdx] != NULL)

       WelsThreadDestroy (&pSmt->pThreadHandles[iIdx]);

-    WelsSnprintf (ename, SEM_NAME_MAX, "fs%d%s", iIdx, pSmt->eventNamespace);

-    WelsEventClose (&pSmt->pFinSliceCodingEvent[iIdx], ename);

 #endif//_WIN32

     WelsSnprintf (ename, SEM_NAME_MAX, "ee%d%s", iIdx, pSmt->eventNamespace);

     WelsEventClose (&pSmt->pExitEncodeEvent[iIdx], ename);

@@ -956,10 +949,6 @@

       break;

     }

   } while (1);

-

-#ifdef _WIN32

-  WelsEventSignal (&pEncPEncCtx->pSliceThreading->pFinSliceCodingEvent[iEventIdx]);	// notify to mother encoding threading

-#endif//WIN32

   //sync multi-threading error

   WelsMutexLock (&pEncPEncCtx->mutexEncoderError);