Move the iCountThreadsNum field to SWelsSvcCodingParam

There is no point in the user setting this field, it's only used
as an internal field within the encoder.
This commit is contained in:
Martin Storsjö 2014-03-07 12:00:43 +02:00
parent 94a0eaf1e7
commit 656e4c5c35
2 changed files with 4 additions and 2 deletions

View File

@ -227,7 +227,6 @@ typedef struct TagEncParamExt
/* multi-thread settings*/
short iMultipleThreadIdc; // 1 # 0: auto(dynamic imp. internal encoder); 1: multiple threads imp. disabled; > 1: count number of threads;
short iCountThreadsNum; // # derived from disable_multiple_slice_idc (=0 or >1) means;
/* Deblocking loop filter */
int iLoopFilterDisableIdc; // 0: on, 1: off, 2: on except for slice boundaries

View File

@ -125,6 +125,8 @@ char* pCurPath; // record current lib path such as:/pData/pData/com.wels.e
bool bDeblockingParallelFlag; // deblocking filter parallelization control flag
short iCountThreadsNum; // # derived from disable_multiple_slice_idc (=0 or >1) means;
int8_t iDecompStages; // GOP size dependency
@ -153,7 +155,6 @@ static void FillDefault (SEncParamExt& param, const bool kbEnableRc) {
param.iMultipleThreadIdc =
1; // 1 # 0: auto(dynamic imp. internal encoder); 1: multiple threads imp. disabled; > 1: count number of threads;
#endif//MT_ENABLED
param.iCountThreadsNum = 1; // # derived from disable_multiple_slice_idc (=0 or >1) means;
param.iLTRRefNum = 0;
param.iLtrMarkPeriod = 30; //the min distance of two int32_t references
@ -211,6 +212,8 @@ void FillDefault (const bool kbEnableRc) {
bDeblockingParallelFlag = false; // deblocking filter parallelization control flag
iCountThreadsNum = 1; // # derived from disable_multiple_slice_idc (=0 or >1) means;
iDecompStages = 0; // GOP size dependency, unknown here and be revised later
memset(sDependencyLayers,0,sizeof(SDLayerParam)*MAX_DEPENDENCY_LAYER);