ref: fb4f677f779904b23475a2e972642729006eaa50
parent: 06fbf808db2fc928cd36ab20b1dbef1cfeeeddc6
parent: 656e4c5c358c4c68e2eb901e8321a86a4377abfc
author: Ethan Hugg <[email protected]>
date: Fri Mar 7 04:18:52 EST 2014
Merge pull request #446 from mstorsjo/remove-unnecessary-public-param Move the iCountThreadsNum field to SWelsSvcCodingParam
--- a/codec/api/svc/codec_app_def.h
+++ b/codec/api/svc/codec_app_def.h
@@ -230,7 +230,6 @@
/* 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
--- a/codec/encoder/core/inc/param_svc.h
+++ b/codec/encoder/core/inc/param_svc.h
@@ -125,6 +125,8 @@
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 @@
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
@@ -210,6 +211,8 @@
pCurPath = NULL; // record current lib path such as:/pData/pData/com.wels.enc/lib/
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