ref: 9a81260b24100925a1c63e16134aa0039dc39dae
parent: 535fd74f41998b37a8bda948c449465b67266b7a
parent: 9f50e0c91ea7b84e97fa4736cfbc6bd9eee62e5c
author: Licai Guo <[email protected]>
date: Tue Apr 1 10:50:31 EDT 2014
Merge pull request #605 from volvet/clean_mt_macro clean multi-threading macro
--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -35,7 +35,7 @@
CXX = $(TOOLCHAINPREFIX)g++
CC = $(TOOLCHAINPREFIX)gcc
AR = $(TOOLCHAINPREFIX)ar
-CFLAGS += -DLINUX -DANDROID_NDK -DMT_ENABLED -fpic --sysroot=$(SYSROOT)
+CFLAGS += -DLINUX -DANDROID_NDK -fpic --sysroot=$(SYSROOT)
CXXFLAGS += -fno-rtti -fno-exceptions
LDFLAGS += --sysroot=$(SYSROOT)
SHLDFLAGS = -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-soname,libwels.so
--- a/build/platform-darwin.mk
+++ b/build/platform-darwin.mk
@@ -1,7 +1,7 @@
include build/platform-arch.mk
SHAREDLIBSUFFIX = dylib
SHARED = -dynamiclib
-CFLAGS += -Wall -fPIC -DMACOS -DMT_ENABLED -MMD -MP
+CFLAGS += -Wall -fPIC -DMACOS -MMD -MP
LDFLAGS += -lpthread
ifeq ($(ASM_ARCH), x86)
ASMFLAGS += -DPREFIX
--- a/build/platform-freebsd.mk
+++ b/build/platform-freebsd.mk
@@ -1,6 +1,6 @@
include build/platform-arch.mk
SHAREDLIBSUFFIX = so
-CFLAGS += -fPIC -DMT_ENABLED
+CFLAGS += -fPIC
LDFLAGS += -lpthread
ifeq ($(ASM_ARCH), x86)
ifeq ($(ENABLE64BIT), Yes)
--- a/build/platform-linux.mk
+++ b/build/platform-linux.mk
@@ -1,6 +1,6 @@
include build/platform-arch.mk
SHAREDLIBSUFFIX = so
-CFLAGS += -Wall -fno-strict-aliasing -fPIC -DLINUX -DMT_ENABLED -MMD -MP
+CFLAGS += -Wall -fno-strict-aliasing -fPIC -DLINUX -MMD -MP
LDFLAGS += -lpthread
ifeq ($(ASM_ARCH), x86)
ifeq ($(ENABLE64BIT), Yes)
--- a/build/platform-mingw_nt.mk
+++ b/build/platform-mingw_nt.mk
@@ -1,6 +1,6 @@
include build/platform-x86-common.mk
SHAREDLIBSUFFIX = dll
-CFLAGS += -DMT_ENABLED -MMD -MP
+CFLAGS += -MMD -MP
LDFLAGS +=
ifeq ($(ENABLE64BIT), Yes)
ASMFLAGS += -f win64
--- a/build/platform-msvc.mk
+++ b/build/platform-msvc.mk
@@ -1,6 +1,5 @@
include build/platform-x86-common.mk
include build/platform-msvc-common.mk
-CFLAGS += -DMT_ENABLED
LDFLAGS += user32.lib
ifeq ($(ENABLE64BIT), Yes)
ASMFLAGS += -f win64
--- a/codec/common/src/WelsThreadLib.cpp
+++ b/codec/common/src/WelsThreadLib.cpp
@@ -116,9 +116,6 @@
#endif /* !_WIN32 */
-
-#ifdef MT_ENABLED
-
#ifdef _WIN32
void WelsSleep (uint32_t dwMilliseconds) {@@ -468,6 +465,4 @@
#endif
-
-#endif // MT_ENABLED
--- a/codec/console/enc/src/welsenc.cpp
+++ b/codec/console/enc/src/welsenc.cpp
@@ -68,10 +68,8 @@
#include "wels_const.h"
#include "logging.h"
-#ifdef MT_ENABLED
#include "mt_defs.h"
#include "WelsThreadLib.h"
-#endif//MT_ENABLED
#ifdef WIN32
#ifdef WINAPI_FAMILY
@@ -607,9 +605,7 @@
sParam.sSpatialLayers[iIndexLayer].iVideoHeight = 90;
sParam.sSpatialLayers[iIndexLayer].fFrameRate = 7.5f;
sParam.sSpatialLayers[iIndexLayer].iSpatialBitrate = 64000;
-#ifdef MT_ENABLED
sParam.sSpatialLayers[iIndexLayer].sSliceCfg.uiSliceMode = SM_SINGLE_SLICE;
-#endif
++ iIndexLayer;
sParam.sSpatialLayers[iIndexLayer].iVideoWidth = 320;
@@ -616,9 +612,7 @@
sParam.sSpatialLayers[iIndexLayer].iVideoHeight = 180;
sParam.sSpatialLayers[iIndexLayer].fFrameRate = 15.0f;
sParam.sSpatialLayers[iIndexLayer].iSpatialBitrate = 160000;
-#ifdef MT_ENABLED
sParam.sSpatialLayers[iIndexLayer].sSliceCfg.uiSliceMode = SM_SINGLE_SLICE;
-#endif
++ iIndexLayer;
sParam.sSpatialLayers[iIndexLayer].iVideoWidth = 640;
@@ -625,10 +619,8 @@
sParam.sSpatialLayers[iIndexLayer].iVideoHeight = 360;
sParam.sSpatialLayers[iIndexLayer].fFrameRate = 30.0f;
sParam.sSpatialLayers[iIndexLayer].iSpatialBitrate = 512000;
-#ifdef MT_ENABLED
sParam.sSpatialLayers[iIndexLayer].sSliceCfg.uiSliceMode = SM_SINGLE_SLICE;
sParam.sSpatialLayers[iIndexLayer].sSliceCfg.sSliceArgument.uiSliceNum = 1;
-#endif
++ iIndexLayer;
sParam.sSpatialLayers[iIndexLayer].iVideoWidth = 1280;
@@ -635,10 +627,8 @@
sParam.sSpatialLayers[iIndexLayer].iVideoHeight = 720;
sParam.sSpatialLayers[iIndexLayer].fFrameRate = 30.0f;
sParam.sSpatialLayers[iIndexLayer].iSpatialBitrate = 1500000;
-#ifdef MT_ENABLED
sParam.sSpatialLayers[iIndexLayer].sSliceCfg.uiSliceMode = SM_SINGLE_SLICE;
sParam.sSpatialLayers[iIndexLayer].sSliceCfg.sSliceArgument.uiSliceNum = 1;
-#endif
float fMaxFr = sParam.sSpatialLayers[sParam.iSpatialLayerNum - 1].fFrameRate;
for (int32_t i = sParam.iSpatialLayerNum - 2; i >= 0; -- i) {--- a/codec/encoder/core/inc/encoder_context.h
+++ b/codec/encoder/core/inc/encoder_context.h
@@ -54,10 +54,8 @@
#include "wels_func_ptr_def.h"
#include "crt_util_safe_x.h"
-#ifdef MT_ENABLED
#include "mt_defs.h" // for multiple threadin,
#include "WelsThreadLib.h"
-#endif//MT_ENALBED
namespace WelsSVCEnc {@@ -132,9 +130,7 @@
SStrideTables* pStrideTab; // stride tables for internal coding used
SWelsFuncPtrList* pFuncList;
-#if defined(MT_ENABLED)
SSliceThreading* pSliceThreading;
-#endif//MT_ENABLED
// SSlice context
SSliceCtx* pSliceCtxList;// slice context table for each dependency quality layer
@@ -223,9 +219,7 @@
#endif//STAT_OUTPUT
int32_t iEncoderError;
-#ifdef MT_ENABLED
WELS_MUTEX mutexEncoderError;
-#endif
} sWelsEncCtx/*, *PWelsEncCtx*/;
}
--- a/codec/encoder/core/inc/mt_defs.h
+++ b/codec/encoder/core/inc/mt_defs.h
@@ -51,7 +51,6 @@
//#define MT_DEBUG
//#define ENABLE_TRACE_MT
-#ifdef MT_ENABLED
#define DYNAMIC_DETECT_CPU_CORES
@@ -58,21 +57,6 @@
//#if defined(WIN32)
//#define BIND_CPU_CORES_TO_THREADS // if it is not defined here mean cross cpu cores load balance automatically
//#endif//WIN32
-
-#else
-
-#endif//MT_ENABLED
-
-#if !defined(MT_ENABLED)
-
-#if defined(MT_DEBUG)
-#undef MT_DEBUG
-#endif//MT_DEBUG
-#if defined(ENABLE_TRACE_MT)
-#undef ENABLE_TRACE_MT
-#endif//ENABLE_TRACE_MT
-
-#endif//!MT_ENABLED
#define THRESHOLD_RMSE_CORE8 0.0320f // v1.1: 0.0320f; v1.0: 0.02f
#define THRESHOLD_RMSE_CORE4 0.0215f // v1.1: 0.0215f; v1.0: 0.03f
--- a/codec/encoder/core/inc/param_svc.h
+++ b/codec/encoder/core/inc/param_svc.h
@@ -150,12 +150,7 @@
param.iTargetBitrate = 0; // overall target bitrate introduced in RC module
param.iMaxBitrate = MAX_BIT_RATE;
-#ifdef MT_ENABLED
- param.iMultipleThreadIdc = 0; // auto to detect cpu cores inside
-#else
- param.iMultipleThreadIdc =
- 1; // 1 # 0: auto(dynamic imp. internal encoder); 1: multiple threads imp. disabled; > 1: count number of threads;
-#endif//MT_ENABLED
+ param.iMultipleThreadIdc = 1;
param.iLTRRefNum = 0;
param.iLtrMarkPeriod = 30; //the min distance of two int32_t references
@@ -317,10 +312,8 @@
/* Deblocking loop filter */
iLoopFilterDisableIdc = pCodingParam.iLoopFilterDisableIdc; // 0: on, 1: off, 2: on except for slice boundaries,
-#ifdef MT_ENABLED
if (iLoopFilterDisableIdc == 0) // Loop filter requested to be enabled
- iLoopFilterDisableIdc = 2; // Disable loop filter on slice boundaries since that's not possible with multithreading
-#endif
+ iLoopFilterDisableIdc = 2; // Disable loop filter on slice boundaries since that's not allowed with multithreading
iLoopFilterAlphaC0Offset = 0; // AlphaOffset: valid range [-6, 6], default 0
iLoopFilterBetaOffset = 0; // BetaOffset: valid range [-6, 6], default 0
--- a/codec/encoder/core/inc/slice_multi_threading.h
+++ b/codec/encoder/core/inc/slice_multi_threading.h
@@ -40,7 +40,6 @@
#ifndef SVC_SLICE_MULTIPLE_THREADING_H__
#define SVC_SLICE_MULTIPLE_THREADING_H__
-#if defined(MT_ENABLED)
#include "typedefs.h"
#include "codec_app_def.h"
@@ -58,9 +57,7 @@
void CalcSliceComplexRatio (void* pRatio, SSliceCtx* pSliceCtx, uint32_t* pSliceConsume);
-#if defined(MT_ENABLED)
int32_t NeedDynamicAdjust (void* pConsumeTime, const int32_t kiSliceNum);
-#endif
void DynamicAdjustSlicing (sWelsEncCtx* pCtx,
SDqLayer* pCurDqLayer,
@@ -88,14 +85,11 @@
int32_t DynamicDetectCpuCores();
-#if defined(MT_ENABLED)
int32_t AdjustBaseLayer (sWelsEncCtx* pCtx);
int32_t AdjustEnhanceLayer (sWelsEncCtx* pCtx, int32_t iCurDid);
-#endif//MT_ENABLED
-#if defined(MT_ENABLED)
#if defined(MT_DEBUG)
void TrackSliceComplexities (sWelsEncCtx* pCtx, const int32_t kiCurDid);
@@ -104,9 +98,7 @@
void TrackSliceConsumeTime (sWelsEncCtx* pCtx, int32_t* pDidList, const int32_t kiSpatialNum);
#endif//defined(MT_DEBUG)
-#endif//MT_ENABLED
}
-#endif//MT_ENABLED
#endif//SVC_SLICE_MULTIPLE_THREADING_H__
--- a/codec/encoder/core/src/encoder.cpp
+++ b/codec/encoder/core/src/encoder.cpp
@@ -51,9 +51,7 @@
#include "svc_base_layer_md.h"
#include "set_mb_syn_cavlc.h"
#include "crt_util_safe_x.h" // Safe CRT routines like utils for cross_platforms
-#ifdef MT_ENABLED
#include "slice_multi_threading.h"
-#endif//MT_ENABLED
// global function pointers definition
namespace WelsSVCEnc {--- a/codec/encoder/core/src/encoder_ext.cpp
+++ b/codec/encoder/core/src/encoder_ext.cpp
@@ -51,9 +51,7 @@
#include "ref_list_mgr_svc.h"
#include "ls_defines.h"
#include "crt_util_safe_x.h" // Safe CRT routines like utils for cross platforms
-#if defined(MT_ENABLED)
#include "slice_multi_threading.h"
-#endif//MT_ENABLED
#include "measure_time.h"
namespace WelsSVCEnc {@@ -161,7 +159,6 @@
}
-#ifdef MT_ENABLED
//about iMultipleThreadIdc, bDeblockingParallelFlag, iLoopFilterDisableIdc, & uiSliceMode
// (1) Single Thread
// if (THREAD==1)//single thread
@@ -173,9 +170,6 @@
} else {pCodingParam->bDeblockingParallelFlag = true;
}
-#else
- pCodingParam->bDeblockingParallelFlag = false;
-#endif//MT_ENABLED
for (i = 0; i < pCodingParam->iSpatialLayerNum; ++ i) {SDLayerParam* fDlp = &pCodingParam->sDependencyLayers[i];
@@ -291,11 +285,9 @@
fDlp->sSliceCfg.uiSliceMode = SM_SINGLE_SLICE;
break;
}
-#ifdef MT_ENABLED
if (pCodingParam->bEnableRc && fDlp->sSliceCfg.sSliceArgument.uiSliceNum > 1) {WelsLog (pCtx, WELS_LOG_ERROR, "ParamValidationExt(), WARNING: GOM based RC do not support SM_RASTER_SLICE!\n");
}
-#endif
// considering the coding efficient and performance, iCountMbNum constraint by MIN_NUM_MB_PER_SLICE condition of multi-pSlice mode settting
if (iMbNumInFrame <= MIN_NUM_MB_PER_SLICE) {fDlp->sSliceCfg.uiSliceMode = SM_SINGLE_SLICE;
@@ -501,19 +493,11 @@
iCountNumLayers; // plus iCountNumLayers for reserved application
// to check number of layers / nals / slices dependencies, 12/8/2010
-#if !defined(MT_ENABLED)
if (iCountNumLayers > MAX_LAYER_NUM_OF_FRAME) {WelsLog (*ppCtx, WELS_LOG_ERROR, "AcquireLayersNals(), iCountNumLayers(%d) > MAX_LAYER_NUM_OF_FRAME(%d)!",
iCountNumLayers, MAX_LAYER_NUM_OF_FRAME);
return 1;
}
-#else//MT_ENABLED
- if (iCountNumLayers > MAX_LAYER_NUM_OF_FRAME) {- WelsLog (*ppCtx, WELS_LOG_ERROR, "AcquireLayersNals(), iCountNumLayers(%d) > MAX_LAYER_NUM_OF_FRAME(%d)!",
- iCountNumLayers, MAX_LAYER_NUM_OF_FRAME);
- return 1;
- }
-#endif//!MT_ENABLED
if (NULL != pCountLayers)
*pCountLayers = iCountNumLayers;
@@ -777,31 +761,6 @@
pDqLayer->iMbWidth = kiMbW;
pDqLayer->iMbHeight = kiMbH;
-#ifndef MT_ENABLED
- if (SM_DYN_SLICE == pDlayer->sSliceCfg.uiSliceMode) { //wmalloc pSliceInLayer- SSlice* pSlice = NULL;
- int32_t iSliceIdx = 0;
- //wmalloc AVERSLICENUM_CONSTANT of pDqLayer->sLayerInfo.pSliceInLayer,
- //wmalloc AVERSLICENUM_CONSTANT num of pSlice as initialization
- //only set value for the first pSlice
- pDqLayer->sLayerInfo.pSliceInLayer = (SSlice*)pMa->WelsMallocz (sizeof (SSlice) * iMaxSliceNum, "pSliceInLayer");
-
- WELS_VERIFY_RETURN_PROC_IF (1, (NULL == pDqLayer->sLayerInfo.pSliceInLayer), FreeMemorySvc (ppCtx)) {- pSlice = &pDqLayer->sLayerInfo.pSliceInLayer[0];
- pSlice->uiSliceIdx = 0;
- pSlice->pSliceBsa = & (*ppCtx)->pOut->sBsWrite;
- }
-
- while (iSliceIdx < iMaxSliceNum) {- pSlice = &pDqLayer->sLayerInfo.pSliceInLayer[iSliceIdx];
- if (AllocMbCacheAligned (&pSlice->sMbCacheInfo, pMa)) {- FreeMemorySvc (ppCtx);
- return 1;
- }
- ++ iSliceIdx;
- }
- } else
-#endif//!MT_ENABLED
{int32_t iSliceIdx = 0;
pDqLayer->sLayerInfo.pSliceInLayer = (SSlice*)pMa->WelsMallocz (sizeof (SSlice) * iMaxSliceNum, "pSliceInLayer");
@@ -811,14 +770,10 @@
while (iSliceIdx < iMaxSliceNum) {SSlice* pSlice = &pDqLayer->sLayerInfo.pSliceInLayer[iSliceIdx];
pSlice->uiSliceIdx = iSliceIdx;
-#ifdef MT_ENABLED
if (pParam->iMultipleThreadIdc > 1)
pSlice->pSliceBsa = & (*ppCtx)->pSliceBs[iSliceIdx].sBsWrite;
else
pSlice->pSliceBsa = & (*ppCtx)->pOut->sBsWrite;
-#else
- pSlice->pSliceBsa = & (*ppCtx)->pOut->sBsWrite;
-#endif//MT_ENABLED
if (AllocMbCacheAligned (&pSlice->sMbCacheInfo, pMa)) {FreeMemorySvc (ppCtx);
return 1;
@@ -856,11 +811,9 @@
pDqLayer->bDeblockingParallelFlag = false;
} else {//multi-pSlice
-#ifdef MT_ENABLED
if (0 == pDqLayer->iLoopFilterDisableIdc) {pDqLayer->bDeblockingParallelFlag = false;
}
-#endif
}
(*ppCtx)->ppDqLayerList[iDlayerIndex] = pDqLayer;
@@ -1227,9 +1180,7 @@
const uint32_t kuiMvdCacheAlignedSize = kuiMvdInterTableSize * sizeof (uint16_t);
int32_t iVclLayersBsSizeCount = 0;
int32_t iNonVclLayersBsSizeCount = 0;
-#if defined(MT_ENABLED)
int32_t iTargetSpatialBsSize = 0;
-#endif//MT_ENABLED
if (kiNumDependencyLayers < 1 || kiNumDependencyLayers > MAX_DEPENDENCY_LAYER) {WelsLog (*ppCtx, WELS_LOG_WARNING, "RequestMemorySvc() failed due to invalid iNumDependencyLayers(%d)!\n",
@@ -1273,9 +1224,7 @@
iVclLayersBsSizeCount += iLayerBsSize;
++ iIndex;
}
-#if defined(MT_ENABLED)
iTargetSpatialBsSize = iLayerBsSize;
-#endif//MT_ENABLED
iCountBsLen = iNonVclLayersBsSizeCount + iVclLayersBsSizeCount;
pParam->iNumRefFrame = WELS_CLIP3 (pParam->iNumRefFrame, MIN_REF_PIC_COUNT, MAX_REFERENCE_PICTURE_COUNT_NUM);
@@ -1291,7 +1240,6 @@
(*ppCtx)->pOut->iCountNals = iCountNals;
(*ppCtx)->pOut->iNalIndex = 0;
-#ifdef MT_ENABLED
if (pParam->iMultipleThreadIdc > 1) {const int32_t iTotalLength = iCountBsLen + (iTargetSpatialBsSize * ((*ppCtx)->iMaxSliceCount - 1));
(*ppCtx)->pFrameBs = (uint8_t*)pMa->WelsMalloc (iTotalLength, "pFrameBs");
@@ -1298,7 +1246,6 @@
WELS_VERIFY_RETURN_PROC_IF (1, (NULL == (*ppCtx)->pFrameBs), FreeMemorySvc (ppCtx))
(*ppCtx)->iFrameBsSize = iTotalLength;
} else
-#endif//MT_ENABLED
{(*ppCtx)->pFrameBs = (uint8_t*)pMa->WelsMalloc (iCountBsLen, "pFrameBs");
WELS_VERIFY_RETURN_PROC_IF (1, (NULL == (*ppCtx)->pFrameBs), FreeMemorySvc (ppCtx))
@@ -1306,7 +1253,6 @@
}
(*ppCtx)->iPosBsBuffer = 0;
-#ifdef MT_ENABLED
// for pSlice bs buffers
if (pParam->iMultipleThreadIdc > 1 && RequestMtResource (ppCtx, pParam, iCountBsLen, iTargetSpatialBsSize)) {WelsLog (*ppCtx, WELS_LOG_WARNING, "RequestMemorySvc(), RequestMtResource failed!");
@@ -1313,7 +1259,6 @@
FreeMemorySvc (ppCtx);
return 1;
}
-#endif
(*ppCtx)->pIntra4x4PredModeBlocks = static_cast<int8_t*>
(pMa->WelsMallocz (iCountMaxMbNum * INTRA_4x4_MODE_NUM, "pIntra4x4PredModeBlocks"));
@@ -1481,10 +1426,8 @@
pCtx->pOut = NULL;
}
-#ifdef MT_ENABLED
if (pParam != NULL && pParam->iMultipleThreadIdc > 1)
ReleaseMtResource (ppCtx);
-#endif//MT_ENABLED
// frame bitstream pBuffer
if (NULL != pCtx->pFrameBs) {@@ -1722,9 +1665,7 @@
switch (pMso->uiSliceMode) {case SM_DYN_SLICE:
iMaxSliceCount = AVERSLICENUM_CONSTRAINT;
-//#ifndef MT_ENABLED
- break; // go through for MT_ENABLED & SM_DYN_SLICE?
-//#endif//MT_ENABLED
+ break; // go through for SM_DYN_SLICE?
case SM_FIXEDSLCNUM_SLICE:
if (iSliceNum > iMaxSliceCount)
iMaxSliceCount = iSliceNum;
@@ -1788,13 +1729,8 @@
++ iSpatialIdx;
} while (iSpatialIdx < iSpatialNum);
-#ifdef MT_ENABLED
pCodingParam->iCountThreadsNum = WELS_MIN (kiCpuCores, iMaxSliceCount);
pCodingParam->iMultipleThreadIdc = pCodingParam->iCountThreadsNum;
-#else
- pCodingParam->iMultipleThreadIdc = 1;
- pCodingParam->iCountThreadsNum = 1;
-#endif//MT_ENABLED
#ifndef WELS_TESTBED // for product release and non-SGE testing
@@ -1903,7 +1839,7 @@
#ifndef WELS_TESTBED
-#if defined(MT_ENABLED) && defined(DYNAMIC_DETECT_CPU_CORES)
+#if defined(DYNAMIC_DETECT_CPU_CORES)
if (pCodingParam->iMultipleThreadIdc > 0)
uiCpuCores = pCodingParam->iMultipleThreadIdc;
else {@@ -1917,7 +1853,7 @@
else if (uiCpuCores < 1) // just for safe
uiCpuCores = 1;
}
-#endif//MT_ENABLED && DYNAMIC_DETECT_CPU_CORES
+#endif//DYNAMIC_DETECT_CPU_CORES
#else//WELS_TESTBED
@@ -1979,10 +1915,8 @@
return iRet;
}
-#ifdef MT_ENABLED
if (pCodingParam->iMultipleThreadIdc > 1)
iRet = CreateSliceThreads (pCtx);
-#endif
WelsRcInitModule (pCtx, pCtx->pSvcParam->bEnableRc ? WELS_RC_GOM : WELS_RC_DISABLE);
@@ -2108,7 +2042,6 @@
StatOverallEncodingExt (*ppCtx);
#endif
-#if defined(MT_ENABLED)
if ((*ppCtx)->pSvcParam->iMultipleThreadIdc > 1 && (*ppCtx)->pSliceThreading != NULL) {const int32_t iThreadCount = (*ppCtx)->pSvcParam->iCountThreadsNum;
int32_t iThreadIdx = 0;
@@ -2128,7 +2061,6 @@
}
}
}
-#endif//MT_ENABLED
if ((*ppCtx)->pVpp) {(*ppCtx)->pVpp->FreeSpatialPictures(*ppCtx);
@@ -2201,7 +2133,6 @@
*/
int32_t PicPartitionNumDecision (sWelsEncCtx* pCtx) {int32_t iPartitionNum = 1;
-#ifdef MT_ENABLED
if (pCtx->pSvcParam->iMultipleThreadIdc > 1) {iPartitionNum = pCtx->pSvcParam->iCountThreadsNum;
if (P_SLICE == pCtx->eSliceType)
@@ -2208,12 +2139,8 @@
iPartitionNum = 1;
}
return iPartitionNum;
-#else
- return iPartitionNum;
-#endif//MT_ENABLED
}
-#if defined(MT_ENABLED)
void WelsInitCurrentQBLayerMltslc (sWelsEncCtx* pCtx) {//pData init
SDqLayer* pCurDq = pCtx->pCurDqLayer;
@@ -2304,84 +2231,7 @@
WelsInitCurrentQBLayerMltslc (pCtx);
}
-#else
-void WelsInitCurrentQBLayerMltslc (sWelsEncCtx* pCtx) {- //pData init
- SDqLayer* pCurDq = pCtx->pCurDqLayer;
- SSliceCtx* pSliceCtx = (pCurDq->pSliceEncCtx);
- SSlice* pSlice = &pCurDq->sLayerInfo.pSliceInLayer[0];
- int32_t iTtlMbNumInFrame = pSliceCtx->iMbNumInFrame;
- //pSliceCtx
- memset (pSliceCtx->pOverallMbMap, 0, iTtlMbNumInFrame * sizeof (uint8_t));
- memset (pSliceCtx->pCountMbNumInSlice, 0, pSliceCtx->iSliceNumInFrame * sizeof (int32_t));
- memset (pSliceCtx->pFirstMbInSlice, 0, pSliceCtx->iSliceNumInFrame * sizeof (int16_t));
- pSliceCtx->iSliceNumInFrame = 1;//
- pSliceCtx->pCountMbNumInSlice[0] = iTtlMbNumInFrame;
-
- //mb_neighbor
- DynslcUpdateMbNeighbourInfoListForAllSlices (pSliceCtx, pCurDq->sMbDataP);
-
- //pSlice init
- pSlice->uiSliceIdx = 0;
- pSlice->pSliceBsa = &pCtx->pOut->sBsWrite;
- pSlice->bDynamicSlicingSliceSizeCtrlFlag = false;
- pSlice->uiAssumeLog2BytePerMb = (pCtx->eSliceType == P_SLICE) ? 0 : 1;
-}
-
-void WelsInitCurrentDlayerMltslc (sWelsEncCtx* pCtx, int32_t iPartitionNum) {- SDqLayer* pCurDq = pCtx->pCurDqLayer;
- SSliceCtx* pSliceCtx = (pCurDq->pSliceEncCtx);
- int32_t iTtlMbNumInFrame = pCurDq->iMbHeight * pCurDq->iMbWidth;
-
- pSliceCtx->iMbNumInFrame
- = pSliceCtx->pCountMbNumInSlice[0] = iTtlMbNumInFrame;
-
- if (I_SLICE == pCtx->eSliceType) { //check if uiSliceSizeConstraint too small-#define byte_complexIMBat26 (60)
- uint8_t iCurDid = pCtx->uiDependencyId;
- uint32_t uiFrmByte = 0;
-
- if (pCtx->pSvcParam->bEnableRc) {- //RC case
- uiFrmByte = (
- ((uint32_t) (pCtx->pSvcParam->sDependencyLayers[iCurDid].iSpatialBitrate)
- / (uint32_t) (pCtx->pSvcParam->sDependencyLayers[iCurDid].fInputFrameRate)) >> 3);
- } else {- //fixed QP case
- int32_t iQDeltaTo26 = (26 - pCtx->pSvcParam->sDependencyLayers[iCurDid].iDLayerQp);
-
- uiFrmByte = (iTtlMbNumInFrame * byte_complexIMBat26);
- if (iQDeltaTo26 > 0) {- //smaller QP than 26
- uiFrmByte = (uint32_t) (uiFrmByte * ((float)iQDeltaTo26 / 4));
- } else if (iQDeltaTo26 < 0) {- //larger QP than 26
- iQDeltaTo26 = ((-iQDeltaTo26) >> 2); //delta mod 4
- uiFrmByte = (uiFrmByte >> (iQDeltaTo26)); //if delta 4, byte /2
- }
- }
-
- //MINPACKETSIZE_CONSTRAINT
- if (pSliceCtx->uiSliceSizeConstraint
- <
- (uint32_t) (uiFrmByte//suppose 16 byte per mb at average
- / (pSliceCtx->iMaxSliceNumConstraint))
- ) {-
- WelsLog (pCtx,
- WELS_LOG_WARNING,
- "Set-SliceConstraint(%d) too small for current resolution (MB# %d) under QP/BR!\n",
- pSliceCtx->uiSliceSizeConstraint,
- pSliceCtx->iMbNumInFrame
- );
- }
- }
-
- WelsInitCurrentQBLayerMltslc (pCtx);
-}
-#endif
-
/*!
* \brief initialize current layer
*/
@@ -2880,9 +2730,7 @@
SPicture* fsnr = NULL;
#endif//ENABLE_FRAME_DUMP || ENABLE_PSNR_CALC
SPicture* pEncPic = NULL; // to be decided later
-#if defined(MT_ENABLED)
int32_t did_list[MAX_DEPENDENCY_LAYER] = {0};-#endif//MT_ENABLED
int32_t iLayerNum = 0;
int32_t iLayerSize = 0;
int32_t iSpatialNum = 0; // available count number of spatial layers due to frame size changed in this given frame
@@ -2972,9 +2820,7 @@
iCurWidth = param_d->iFrameWidth;
iCurHeight = param_d->iFrameHeight;
-#if defined(MT_ENABLED)
did_list[iSpatialIdx] = iCurDid;
-#endif//MT_ENABLED
// Encoding this picture might mulitiple sQualityStat layers potentially be encoded as followed
@@ -2981,13 +2827,11 @@
switch (param_d->sSliceCfg.uiSliceMode) {case SM_FIXEDSLCNUM_SLICE:
case SM_AUTO_SLICE:{-#if defined(MT_ENABLED)
if ((iCurDid > 0) && (pSvcParam->iMultipleThreadIdc > 1) &&
(pSvcParam->sDependencyLayers[iCurDid].sSliceCfg.uiSliceMode == SM_FIXEDSLCNUM_SLICE
&& pSvcParam->iMultipleThreadIdc >= pSvcParam->sDependencyLayers[iCurDid].sSliceCfg.sSliceArgument.uiSliceNum)
)
AdjustEnhanceLayer (pCtx, iCurDid);
-#endif//MT_ENABLED
break;
}
case SM_DYN_SLICE: {@@ -3100,11 +2944,7 @@
pLayerBsInfo->iNalCount = ++ iNalIdxInLayer;
}
// for dynamic slicing single threading..
-#ifndef MT_ENABLED
- else if (SM_DYN_SLICE == param_d->sSliceCfg.uiSliceMode)
-#else // MT_ENABLED
else if ((SM_DYN_SLICE == param_d->sSliceCfg.uiSliceMode) && (pSvcParam->iMultipleThreadIdc <= 1))
-#endif//MT_ENABLED
{const int32_t kiLastMbInFrame = pCtx->pCurDqLayer->pSliceEncCtx->iMbNumInFrame;
pCtx->iEncoderError = WelsCodeOnePicPartition (pCtx, pLayerBsInfo, &iNalIdxInLayer, &iLayerSize, 0, kiLastMbInFrame, 0);
@@ -3111,7 +2951,6 @@
WELS_VERIFY_RETURN_IFNEQ(pCtx->iEncoderError, ENC_RETURN_SUCCESS)
} else {//other multi-slice uiSliceMode
-#if defined(MT_ENABLED)
int err = 0;
// THREAD_FULLY_FIRE_MODE/THREAD_PICK_UP_MODE for any mode of non-SM_DYN_SLICE
if ((SM_DYN_SLICE != param_d->sSliceCfg.uiSliceMode) && (pSvcParam->iMultipleThreadIdc > 1)) {@@ -3235,7 +3074,6 @@
iLayerSize = AppendSliceToFrameBs (pCtx, pLayerBsInfo, kiPartitionCnt);
} else // for non-dynamic-slicing mode single threading branch..
-#endif//MT_ENABLED
{const bool bNeedPrefix = pCtx->bNeedPrefixNalFlag;
int32_t iSliceIdx = 0;
@@ -3290,9 +3128,7 @@
// deblocking filter
if (
-#if defined(MT_ENABLED)
(!pCtx->pCurDqLayer->bDeblockingParallelFlag) &&
-#endif//MT_ENABLED
#if !defined(ENABLE_FRAME_DUMP)
((eNalRefIdc != NRI_PRI_LOWEST) && (param_d->iHighestTemporalId == 0 || iCurTid < param_d->iHighestTemporalId)) &&
#endif//!ENABLE_FRAME_DUMP
@@ -3432,7 +3268,6 @@
++ iLayerNum;
}
-#if defined(MT_ENABLED)
if ((param_d->sSliceCfg.uiSliceMode == SM_FIXEDSLCNUM_SLICE||param_d->sSliceCfg.uiSliceMode == SM_AUTO_SLICE) && pSvcParam->iMultipleThreadIdc > 1 &&
pSvcParam->iMultipleThreadIdc >= param_d->sSliceCfg.sSliceArgument.uiSliceNum) {CalcSliceComplexRatio (pCtx->pSliceThreading->pSliceComplexRatio[iCurDid], pCtx->pCurDqLayer->pSliceEncCtx,
@@ -3441,7 +3276,6 @@
TrackSliceComplexities (pCtx, iCurDid);
#endif//#if defined(MT_DEBUG)
}
-#endif//MT_ENABLED
++ iSpatialIdx;
@@ -3468,11 +3302,10 @@
}
}
-#if defined(MT_ENABLED) && defined(MT_DEBUG)
+#if defined(MT_DEBUG)
TrackSliceConsumeTime (pCtx, did_list, iSpatialNum);
-#endif//MT_ENABLED && MT_DEBUG
+#endif//MT_DEBUG
-#if defined(MT_ENABLED)
if (pSvcParam->iMultipleThreadIdc > 1 && did_list[0] == BASE_DEPENDENCY_ID
&& ((pSvcParam->sDependencyLayers[0].sSliceCfg.uiSliceMode == SM_FIXEDSLCNUM_SLICE)||(pSvcParam->sDependencyLayers[0].sSliceCfg.uiSliceMode == SM_AUTO_SLICE))
&& pSvcParam->iMultipleThreadIdc >= pSvcParam->sDependencyLayers[0].sSliceCfg.sSliceArgument.uiSliceNum
@@ -3481,7 +3314,6 @@
1]].sSliceCfg.sSliceArgument.uiSliceNum) {AdjustBaseLayer (pCtx);
}
-#endif
#ifdef ENABLE_FRAME_DUMP
DumpRecFrame (fsnr, &pSvcParam->sDependencyLayers[pSvcParam->iSpatialLayerNum -
--- a/codec/encoder/core/src/slice_multi_threading.cpp
+++ b/codec/encoder/core/src/slice_multi_threading.cpp
@@ -38,7 +38,6 @@
*************************************************************************************
*/
-#if defined(MT_ENABLED)
#include <assert.h>
#if !defined(_WIN32)
@@ -144,7 +143,6 @@
}
}
-#if defined(MT_ENABLED)
int32_t NeedDynamicAdjust (void* pConsumeTime, const int32_t iSliceNum) {uint32_t* pSliceConsume = (uint32_t*)pConsumeTime;
uint32_t uiTotalConsume = 0;
@@ -190,7 +188,6 @@
return iNeedAdj;
}
-#endif
void DynamicAdjustSlicing (sWelsEncCtx* pCtx,
SDqLayer* pCurDqLayer,
@@ -1029,7 +1026,6 @@
return info.ProcessorCount;
}
-#if defined(MT_ENABLED)
int32_t AdjustBaseLayer (sWelsEncCtx* pCtx) {SDqLayer* pCurDq = pCtx->ppDqLayerList[0];
int32_t iNeedAdj = 1;
@@ -1105,9 +1101,7 @@
return iNeedAdj;
}
-#endif//#if defined(MT_ENABLED)
-#if defined(MT_ENABLED)
#if defined(MT_DEBUG)
void TrackSliceComplexities (sWelsEncCtx* pCtx, const int32_t iCurDid) {@@ -1166,7 +1160,5 @@
}
#endif//#if defined(MT_DEBUG)
-#endif//MT_ENABLED
}
-#endif//MT_ENABLED
--- a/codec/encoder/core/src/svc_encode_slice.cpp
+++ b/codec/encoder/core/src/svc_encode_slice.cpp
@@ -823,11 +823,6 @@
pSliceCtx->pFirstMbInSlice[iNextSliceIdc] = iFirstMbIdxOfNextSlice;
-#if !defined(MT_ENABLED)
- pNextSlice->uiSliceIdx = iNextSliceIdc;
- pNextSlice->pSliceBsa = & (pEncCtx->pOut->sBsWrite);
-#endif//!MT_ENABLED
-
memset (pSliceCtx->pOverallMbMap + iFirstMbIdxOfNextSlice, (uint8_t)iNextSliceIdc,
(kiLastMbIdxInPartition - iFirstMbIdxOfNextSlice + 1)*sizeof (uint8_t));
@@ -863,10 +858,8 @@
#endif
uiLen = ((iPosBitOffset >> 3) + ((iPosBitOffset & 0x07) ? 1 : 0));
-#ifdef MT_ENABLED
if (pEncCtx->pSvcParam->iMultipleThreadIdc > 1)
WelsMutexLock (&pEncCtx->pSliceThreading->mutexSliceNumUpdate);
-#endif//MT_ENABLED
//DYNAMIC_SLICING_ONE_THREAD: judge jump_avoiding_pack_exceed
if (
@@ -874,9 +867,7 @@
&& JUMPPACKETSIZE_JUDGE (uiLen, iCurMbIdx, pSliceCtx->uiSliceSizeConstraint)) /*jump_avoiding_pack_exceed*/
&& kbCurMbNotLastMbOfCurPartition) //decide to add new pSlice
&& (kbSliceNumNotExceedConstraint
-#ifdef MT_ENABLED
&& ((pCurSlice->uiSliceIdx + kiActiveThreadsNum) < pSliceCtx->iMaxSliceNumConstraint)
-#endif//MT_ENABLED
)//able to add new pSlice
) {@@ -885,10 +876,8 @@
++ pSliceCtx->iSliceNumInFrame;
-#ifdef MT_ENABLED
if (pEncCtx->pSvcParam->iMultipleThreadIdc > 1)
WelsMutexUnlock (&pEncCtx->pSliceThreading->mutexSliceNumUpdate);
-#endif//MT_ENABLED
return true;
}
@@ -895,9 +884,7 @@
if (
(kbSliceNumReachConstraint
-#ifdef MT_ENABLED
|| ((pCurSlice->uiSliceIdx + kiActiveThreadsNum) >= pSliceCtx->iMaxSliceNumConstraint)
-#endif//MT_ENABLED
)
&& ((JUMPPACKETSIZE_JUDGE (uiLen, iCurMbIdx,
pSliceCtx->uiSliceSizeConstraint - ((kiLastMbIdxInPartition - iCurMbIdx) <<
@@ -907,10 +894,8 @@
pCurSlice->bDynamicSlicingSliceSizeCtrlFlag = true;
}
-#ifdef MT_ENABLED
if (pEncCtx->pSvcParam->iMultipleThreadIdc > 1)
WelsMutexUnlock (&pEncCtx->pSliceThreading->mutexSliceNumUpdate);
-#endif//MT_ENABLED
return false;
}