Get rid of an unnecessary cast by declaring the right pointer type

Martin Storsjö committed 12 years ago

Commit ce7b00e1 parent 09b45e33 files · +3 −3Browse files

Unified · Split

3 files

codec/encoder/core/inc/svc_enc_slice_segment.h +1 −1
codec/encoder/core/src/encoder_ext.cpp +1 −1
codec/encoder/core/src/svc_enc_slice_segment.cpp +1 −1

codec/encoder/core/inc/svc_enc_slice_segment.h+1−1

@@ -196,7 +196,7 @@ bool CheckFixedSliceNumMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceA · 195 unmodified lines
196	bool CheckRasterMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg);	196	bool CheckRasterMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg);
197	bool CheckRowMbMultiSliceSetting (const int32_t kiMbWidth, SSliceArgument* pSliceArg);	197	bool CheckRowMbMultiSliceSetting (const int32_t kiMbWidth, SSliceArgument* pSliceArg);
198		198
199	void GomValidCheckSliceNum (const int32_t kiMbWidth, const int32_t kiMbHeight, int32_t* pSliceNum);	199	void GomValidCheckSliceNum (const int32_t kiMbWidth, const int32_t kiMbHeight, uint32_t* pSliceNum);
200	void GomValidCheckSliceMbNum (const int32_t kiMbWidth, const int32_t kiMbHeight, SSliceArgument* pSliceArg);	200	void GomValidCheckSliceMbNum (const int32_t kiMbWidth, const int32_t kiMbHeight, SSliceArgument* pSliceArg);
201	//end of checking valid para	201	//end of checking valid para
202		202

codec/encoder/core/src/encoder_ext.cpp+1−1

@@ -267,7 +267,7 @@ int32_t ParamValidationExt (SWelsSvcCodingParam* pCodingParam) { · 266 unmodified lines
267	}	267	}
268	if (pCodingParam->bEnableRc) { // multiple slices verify with gom	268	if (pCodingParam->bEnableRc) { // multiple slices verify with gom
269	//check uiSliceNum	269	//check uiSliceNum
270	GomValidCheckSliceNum (iMbWidth, iMbHeight, (int32_t*)&fDlp->sSliceCfg.sSliceArgument.uiSliceNum);	270	GomValidCheckSliceNum (iMbWidth, iMbHeight, &fDlp->sSliceCfg.sSliceArgument.uiSliceNum);
271	assert (fDlp->sSliceCfg.sSliceArgument.uiSliceNum > 1);	271	assert (fDlp->sSliceCfg.sSliceArgument.uiSliceNum > 1);
272	//set uiSliceMbNum with current uiSliceNum	272	//set uiSliceMbNum with current uiSliceNum
273	GomValidCheckSliceMbNum (iMbWidth, iMbHeight, &fDlp->sSliceCfg.sSliceArgument);	273	GomValidCheckSliceMbNum (iMbWidth, iMbHeight, &fDlp->sSliceCfg.sSliceArgument);

codec/encoder/core/src/svc_enc_slice_segment.cpp+1−1

@@ -209,7 +209,7 @@ bool CheckRasterMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* · 208 unmodified lines
209		209
210		210
211	// GOM based RC related for uiSliceNum decision, only used at SM_FIXEDSLCNUM_SLICE	211	// GOM based RC related for uiSliceNum decision, only used at SM_FIXEDSLCNUM_SLICE
212	void GomValidCheckSliceNum (const int32_t kiMbWidth, const int32_t kiMbHeight, int32_t* pSliceNum) {	212	void GomValidCheckSliceNum (const int32_t kiMbWidth, const int32_t kiMbHeight, uint32_t* pSliceNum) {
213	const int32_t kiCountNumMb = kiMbWidth * kiMbHeight;	213	const int32_t kiCountNumMb = kiMbWidth * kiMbHeight;
214	int32_t iSliceNum = *pSliceNum;	214	int32_t iSliceNum = *pSliceNum;
215	int32_t iGomSize;	215	int32_t iGomSize;