generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #446 from mstorsjo/remove-unnecessary-public-param

Browse Source 
Move the iCountThreadsNum field to SWelsSvcCodingParam
This commit is contained in:
Ethan Hugg 2014-03-07 09:18:52 -08:00
commit fb4f677f77
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
codec/api/svc/codec_app_def.h
View File

@ -230,7 +230,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

5
codec/encoder/core/inc/param_svc.h
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);