The astyle cleanup keeps trailing whitespace within comments, but the whitespace here is not significant nor intentional and thus should be removed.
Showing the changes to codec/encoder/core/src/slice_multi_threading.cpp (1 of 17 files). Show all
Unified · Split
| @@ -498,7 +498,7 @@ int32_t RequestMtResource (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPara · 497 unmodified lines | |||
| 498 | #ifdef PACKING_ONE_SLICE_PER_LAYER | 498 | #ifdef PACKING_ONE_SLICE_PER_LAYER |
| 499 | pSmt->pCountBsSizeInPartition = (uint32_t*)pMa->WelsMalloc (sizeof (uint32_t) * iThreadNum, "pCountBsSizeInPartition"); | 499 | pSmt->pCountBsSizeInPartition = (uint32_t*)pMa->WelsMalloc (sizeof (uint32_t) * iThreadNum, "pCountBsSizeInPartition"); |
| 500 | WELS_VERIFY_RETURN_PROC_IF (1, (NULL == pSmt->pCountBsSizeInPartition), FreeMemorySvc (ppCtx)) | 500 | WELS_VERIFY_RETURN_PROC_IF (1, (NULL == pSmt->pCountBsSizeInPartition), FreeMemorySvc (ppCtx)) |
| 501 | #endif//PACKING_ONE_SLICE_PER_LAYER | 501 | #endif//PACKING_ONE_SLICE_PER_LAYER |
| 502 | 502 | ||
| 503 | WelsMutexInit (&pSmt->mutexSliceNumUpdate); | 503 | WelsMutexInit (&pSmt->mutexSliceNumUpdate); |
| 504 | 504 | ||
| @@ -592,7 +592,7 @@ void ReleaseMtResource (sWelsEncCtx** ppCtx) { · 87 unmodified lines | |||
| 592 | ename[used_len] = '\0'; | 592 | ename[used_len] = '\0'; |
| 593 | WelsEventClose (pSmt->pFinUpdateMbListEvent[iIdx], ename); | 593 | WelsEventClose (pSmt->pFinUpdateMbListEvent[iIdx], ename); |
| 594 | #endif//DYNAMIC_SLICE_ASSIGN && TRY_SLICING_BALANCE | 594 | #endif//DYNAMIC_SLICE_ASSIGN && TRY_SLICING_BALANCE |
| 595 | #endif//_WIN32 | 595 | #endif//_WIN32 |
| 596 | 596 | ||
| 597 | ++ iIdx; | 597 | ++ iIdx; |
| 598 | } | 598 | } |
| @@ -930,7 +930,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 331 unmodified lines | |||
| 930 | pEventsList[iEventCount++] = pEncPEncCtx->pSliceThreading->pExitEncodeEvent[iEventIdx]; | 930 | pEventsList[iEventCount++] = pEncPEncCtx->pSliceThreading->pExitEncodeEvent[iEventIdx]; |
| 931 | #if defined(DYNAMIC_SLICE_ASSIGN) && defined(TRY_SLICING_BALANCE) | 931 | #if defined(DYNAMIC_SLICE_ASSIGN) && defined(TRY_SLICING_BALANCE) |
| 932 | pEventsList[iEventCount++] = pEncPEncCtx->pSliceThreading->pUpdateMbListEvent[iEventIdx]; | 932 | pEventsList[iEventCount++] = pEncPEncCtx->pSliceThreading->pUpdateMbListEvent[iEventIdx]; |
| 933 | #endif//#if defined(DYNAMIC_SLICE_ASSIGN) && defined(TRY_SLICING_BALANCE) | 933 | #endif//#if defined(DYNAMIC_SLICE_ASSIGN) && defined(TRY_SLICING_BALANCE) |
| 934 | #endif//_WIN32 | 934 | #endif//_WIN32 |
| 935 | 935 | ||
| 936 | do { | 936 | do { |
| @@ -945,7 +945,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 8 unmodified lines | |||
| 945 | iEventIdx, (void*) (pEncPEncCtx->pReadySliceCodingEvent[iEventIdx]), (void*)pEncPEncCtx); | 945 | iEventIdx, (void*) (pEncPEncCtx->pReadySliceCodingEvent[iEventIdx]), (void*)pEncPEncCtx); |
| 946 | #endif | 946 | #endif |
| 947 | iWaitRet = WelsEventWait (pEncPEncCtx->pSliceThreading->pReadySliceCodingEvent[iEventIdx]); | 947 | iWaitRet = WelsEventWait (pEncPEncCtx->pSliceThreading->pReadySliceCodingEvent[iEventIdx]); |
| 948 | #endif//WIN32 | 948 | #endif//WIN32 |
| 949 | if (WELS_THREAD_ERROR_WAIT_OBJECT_0 == iWaitRet) { // start pSlice coding signal waited | 949 | if (WELS_THREAD_ERROR_WAIT_OBJECT_0 == iWaitRet) { // start pSlice coding signal waited |
| 950 | SLayerBSInfo* pLbi = pPrivateData->pLayerBs; | 950 | SLayerBSInfo* pLbi = pPrivateData->pLayerBs; |
| 951 | const int32_t kiCurDid = pEncPEncCtx->uiDependencyId; | 951 | const int32_t kiCurDid = pEncPEncCtx->uiDependencyId; |
| @@ -1052,7 +1052,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 100 unmodified lines | |||
| 1052 | eNalRefIdc, | 1052 | eNalRefIdc, |
| 1053 | iSliceSize | 1053 | iSliceSize |
| 1054 | ); | 1054 | ); |
| 1055 | #endif//SLICE_INFO_OUTPUT | 1055 | #endif//SLICE_INFO_OUTPUT |
| 1056 | 1056 | ||
| 1057 | #if MT_DEBUG_BS_WR | 1057 | #if MT_DEBUG_BS_WR |
| 1058 | pSliceBs->bSliceCodedFlag = TRUE; | 1058 | pSliceBs->bSliceCodedFlag = TRUE; |
| @@ -1063,7 +1063,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 4 unmodified lines | |||
| 1063 | &pEncPEncCtx->pSliceThreading->pSliceCodedEvent[iEventIdx]); // mean finished coding current pSlice | 1063 | &pEncPEncCtx->pSliceThreading->pSliceCodedEvent[iEventIdx]); // mean finished coding current pSlice |
| 1064 | #else | 1064 | #else |
| 1065 | WelsEventSignal (pEncPEncCtx->pSliceThreading->pSliceCodedEvent[iEventIdx]); // mean finished coding current pSlice | 1065 | WelsEventSignal (pEncPEncCtx->pSliceThreading->pSliceCodedEvent[iEventIdx]); // mean finished coding current pSlice |
| 1066 | #endif//WIN32 | 1066 | #endif//WIN32 |
| 1067 | } else { // for SM_DYN_SLICE parallelization | 1067 | } else { // for SM_DYN_SLICE parallelization |
| 1068 | #ifdef PACKING_ONE_SLICE_PER_LAYER | 1068 | #ifdef PACKING_ONE_SLICE_PER_LAYER |
| 1069 | SLayerBSInfo* pLbiPacking = NULL; | 1069 | SLayerBSInfo* pLbiPacking = NULL; |
| @@ -1158,7 +1158,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 88 unmodified lines | |||
| 1158 | eNalRefIdc, | 1158 | eNalRefIdc, |
| 1159 | iSliceSize | 1159 | iSliceSize |
| 1160 | ); | 1160 | ); |
| 1161 | #endif//SLICE_INFO_OUTPUT | 1161 | #endif//SLICE_INFO_OUTPUT |
| 1162 | 1162 | ||
| 1163 | #if defined(ENABLE_TRACE_MT) | 1163 | #if defined(ENABLE_TRACE_MT) |
| 1164 | WelsLog (pEncPEncCtx, WELS_LOG_INFO, | 1164 | WelsLog (pEncPEncCtx, WELS_LOG_INFO, |
| @@ -1196,7 +1196,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 31 unmodified lines | |||
| 1196 | &pEncPEncCtx->pSliceThreading->pFinUpdateMbListEvent[iEventIdx]); // mean finished update pMb list for this pSlice | 1196 | &pEncPEncCtx->pSliceThreading->pFinUpdateMbListEvent[iEventIdx]); // mean finished update pMb list for this pSlice |
| 1197 | } | 1197 | } |
| 1198 | #endif//#if defined(DYNAMIC_SLICE_ASSIGN) && defined(TRY_SLICING_BALANCE) | 1198 | #endif//#if defined(DYNAMIC_SLICE_ASSIGN) && defined(TRY_SLICING_BALANCE) |
| 1199 | #endif//WIN32 | 1199 | #endif//WIN32 |
| 1200 | else { // WELS_THREAD_ERROR_WAIT_TIMEOUT, or WELS_THREAD_ERROR_WAIT_FAILED | 1200 | else { // WELS_THREAD_ERROR_WAIT_TIMEOUT, or WELS_THREAD_ERROR_WAIT_FAILED |
| 1201 | WelsLog (pEncPEncCtx, WELS_LOG_WARNING, | 1201 | WelsLog (pEncPEncCtx, WELS_LOG_WARNING, |
| 1202 | "[MT] CodingSliceThreadProc(), waiting pReadySliceCodingEvent[%d] failed(%d) and thread%d terminated!\n", iEventIdx, | 1202 | "[MT] CodingSliceThreadProc(), waiting pReadySliceCodingEvent[%d] failed(%d) and thread%d terminated!\n", iEventIdx, |