History

clean multi-threading macro

volvet committed 12 years ago

Commit 9f50e0c1 parent cad753d16 files · +12 −258Browse files

Showing the changes to codec/encoder/core/src/slice_multi_threading.cpp (1 of 16 files). Show all

Unified · Split

codec/encoder/core/src/slice_multi_threading.cpp+0−8
@@ -38,7 +38,6 @@ · 37 unmodified lines
3838 *************************************************************************************
3939 */
4040
41−#if defined(MT_ENABLED)
4241
4342 #include <assert.h>
4443 #if !defined(_WIN32)
@@ -144,7 +143,6 @@ void CalcSliceComplexRatio (void* pRatio, SSliceCtx* pSliceCtx, uint32_t* pSlice · 99 unmodified lines
144143 }
145144 }
146145
147−#if defined(MT_ENABLED)
148146 int32_t NeedDynamicAdjust (void* pConsumeTime, const int32_t iSliceNum) {
149147 uint32_t* pSliceConsume = (uint32_t*)pConsumeTime;
150148 uint32_t uiTotalConsume = 0;
@@ -190,7 +188,6 @@ int32_t NeedDynamicAdjust (void* pConsumeTime, const int32_t iSliceNum) { · 39 unmodified lines
190188
191189 return iNeedAdj;
192190 }
193−#endif
194191
195192 void DynamicAdjustSlicing (sWelsEncCtx* pCtx,
196193 SDqLayer* pCurDqLayer,
@@ -1029,7 +1026,6 @@ int32_t DynamicDetectCpuCores() { · 832 unmodified lines
10291026 return info.ProcessorCount;
10301027 }
10311028
1032−#if defined(MT_ENABLED)
10331029 int32_t AdjustBaseLayer (sWelsEncCtx* pCtx) {
10341030 SDqLayer* pCurDq = pCtx->ppDqLayerList[0];
10351031 int32_t iNeedAdj = 1;
@@ -1105,9 +1101,7 @@ int32_t AdjustEnhanceLayer (sWelsEncCtx* pCtx, int32_t iCurDid) { · 69 unmodified lines
11051101 return iNeedAdj;
11061102 }
11071103
1108−#endif//#if defined(MT_ENABLED)
11091104
1110−#if defined(MT_ENABLED)
11111105
11121106 #if defined(MT_DEBUG)
11131107 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
11661160 }
11671161 #endif//#if defined(MT_DEBUG)
11681162
1169−#endif//MT_ENABLED
11701163 }
1171−#endif//MT_ENABLED
11721164

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t