1, update the max-nal-size setting in UT and param check since we are using a larger input check 2, fix potential overflow (will change bs but little impact on bs)

Sijia Chen committed 11 years ago

Commit 431bcee1 parent 7d055ca10 files · +7711 −7708Browse files

Showing the changes to codec/processing/interface (1 of 10 files). Show all

Unified · Split

@@ -163,7 +163,7 @@ typedef struct { · 162 unmodified lines
163	163	typedef struct {
164	164	ESceneChangeIdc eSceneChangeIdc; // SIMILAR_SCENE, MEDIUM_CHANGED_SCENE, LARGE_CHANGED_SCENE
165	165	int iMotionBlockNum; // Number of motion blocks
166		− int iFrameComplexity; // frame complexity
	166	+ long long iFrameComplexity; // frame complexity
167	167	unsigned char* pStaticBlockIdc; // static block idc
168	168	SScrollDetectionParam sScrollResult; //results from scroll detection
169	169	} SSceneChangeResult;
@@ -222,7 +222,7 @@ typedef struct { · 52 unmodified lines
222	222	int iComplexityAnalysisMode;
223	223	int iCalcBgd;
224	224	int iMbNumInGom;
225		− int iFrameComplexity;
	225	+ long long iFrameComplexity;
226	226	int* pGomComplexity;
227	227	int* pGomForegroundBlockNum;
228	228	signed char* pBackgroundMbFlag;
@@ -234,7 +234,7 @@ typedef struct { · 5 unmodified lines
234	234	int iMbRowInGom;
235	235	int* pGomComplexity;
236	236	int iGomNumInFrame;
237		− int iFrameComplexity;
	237	+ long long iFrameComplexity; //255255(MaxMbSAD)36864(MaxFS) make the highest bit of 32-bit integer 1
238	238	int iIdrFlag;
239	239	SScrollDetectionParam sScrollResult;
240	240	} SComplexityAnalysisScreenParam;

Keyboard shortcuts