Showing the changes to codec/encoder/core/src/slice_multi_threading.cpp (1 of 16 files). Show all
Unified · Split
| @@ -38,7 +38,6 @@ · 37 unmodified lines | |||
| 38 | ************************************************************************************* | 38 | ************************************************************************************* |
| 39 | */ | 39 | */ |
| 40 | 40 | ||
| 41 | #if defined(MT_ENABLED) | ||
| 42 | 41 | ||
| 43 | #include <assert.h> | 42 | #include <assert.h> |
| 44 | #if !defined(_WIN32) | 43 | #if !defined(_WIN32) |
| @@ -144,7 +143,6 @@ void CalcSliceComplexRatio (void* pRatio, SSliceCtx* pSliceCtx, uint32_t* pSlice · 99 unmodified lines | |||
| 144 | } | 143 | } |
| 145 | } | 144 | } |
| 146 | 145 | ||
| 147 | #if defined(MT_ENABLED) | ||
| 148 | int32_t NeedDynamicAdjust (void* pConsumeTime, const int32_t iSliceNum) { | 146 | int32_t NeedDynamicAdjust (void* pConsumeTime, const int32_t iSliceNum) { |
| 149 | uint32_t* pSliceConsume = (uint32_t*)pConsumeTime; | 147 | uint32_t* pSliceConsume = (uint32_t*)pConsumeTime; |
| 150 | uint32_t uiTotalConsume = 0; | 148 | uint32_t uiTotalConsume = 0; |
| @@ -190,7 +188,6 @@ int32_t NeedDynamicAdjust (void* pConsumeTime, const int32_t iSliceNum) { · 39 unmodified lines | |||
| 190 | 188 | ||
| 191 | return iNeedAdj; | 189 | return iNeedAdj; |
| 192 | } | 190 | } |
| 193 | #endif | ||
| 194 | 191 | ||
| 195 | void DynamicAdjustSlicing (sWelsEncCtx* pCtx, | 192 | void DynamicAdjustSlicing (sWelsEncCtx* pCtx, |
| 196 | SDqLayer* pCurDqLayer, | 193 | SDqLayer* pCurDqLayer, |
| @@ -1029,7 +1026,6 @@ int32_t DynamicDetectCpuCores() { · 832 unmodified lines | |||
| 1029 | return info.ProcessorCount; | 1026 | return info.ProcessorCount; |
| 1030 | } | 1027 | } |
| 1031 | 1028 | ||
| 1032 | #if defined(MT_ENABLED) | ||
| 1033 | int32_t AdjustBaseLayer (sWelsEncCtx* pCtx) { | 1029 | int32_t AdjustBaseLayer (sWelsEncCtx* pCtx) { |
| 1034 | SDqLayer* pCurDq = pCtx->ppDqLayerList[0]; | 1030 | SDqLayer* pCurDq = pCtx->ppDqLayerList[0]; |
| 1035 | int32_t iNeedAdj = 1; | 1031 | int32_t iNeedAdj = 1; |
| @@ -1105,9 +1101,7 @@ int32_t AdjustEnhanceLayer (sWelsEncCtx* pCtx, int32_t iCurDid) { · 69 unmodified lines | |||
| 1105 | return iNeedAdj; | 1101 | return iNeedAdj; |
| 1106 | } | 1102 | } |
| 1107 | 1103 | ||
| 1108 | #endif//#if defined(MT_ENABLED) | ||
| 1109 | 1104 | ||
| 1110 | #if defined(MT_ENABLED) | ||
| 1111 | 1105 | ||
| 1112 | #if defined(MT_DEBUG) | 1106 | #if defined(MT_DEBUG) |
| 1113 | void TrackSliceComplexities (sWelsEncCtx* pCtx, const int32_t iCurDid) { | 1107 | void TrackSliceComplexities (sWelsEncCtx* pCtx, const int32_t iCurDid) { |
| @@ -1166,7 +1160,5 @@ void TrackSliceConsumeTime (sWelsEncCtx* pCtx, int32_t* pDidList, const int32_t · 52 unmodified lines | |||
| 1166 | } | 1160 | } |
| 1167 | #endif//#if defined(MT_DEBUG) | 1161 | #endif//#if defined(MT_DEBUG) |
| 1168 | 1162 | ||
| 1169 | #endif//MT_ENABLED | ||
| 1170 | } | 1163 | } |
| 1171 | #endif//MT_ENABLED | ||
| 1172 | 1164 | ||