shithub: openh264

Info  •  Files  •  Log  •  Branches

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

--- a/codec/encoder/core/inc/svc_enc_slice_segment.h

+++ b/codec/encoder/core/inc/svc_enc_slice_segment.h

@@ -196,7 +196,7 @@

 bool CheckRasterMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg);

 bool CheckRowMbMultiSliceSetting (const int32_t kiMbWidth,  SSliceArgument* pSliceArg);

-void GomValidCheckSliceNum (const int32_t kiMbWidth, const int32_t kiMbHeight, int32_t* pSliceNum);

+void GomValidCheckSliceNum (const int32_t kiMbWidth, const int32_t kiMbHeight, uint32_t* pSliceNum);

 void GomValidCheckSliceMbNum (const int32_t kiMbWidth, const int32_t kiMbHeight,  SSliceArgument* pSliceArg);

 //end of checking valid para

--- a/codec/encoder/core/src/encoder_ext.cpp

+++ b/codec/encoder/core/src/encoder_ext.cpp

@@ -267,7 +267,7 @@

       }

       if (pCodingParam->bEnableRc) {	// multiple slices verify with gom

         //check uiSliceNum

-        GomValidCheckSliceNum (iMbWidth, iMbHeight, (int32_t*)&fDlp->sSliceCfg.sSliceArgument.uiSliceNum);

+        GomValidCheckSliceNum (iMbWidth, iMbHeight, &fDlp->sSliceCfg.sSliceArgument.uiSliceNum);

         assert (fDlp->sSliceCfg.sSliceArgument.uiSliceNum > 1);

         //set uiSliceMbNum with current uiSliceNum

         GomValidCheckSliceMbNum (iMbWidth, iMbHeight, &fDlp->sSliceCfg.sSliceArgument);

--- a/codec/encoder/core/src/svc_enc_slice_segment.cpp

+++ b/codec/encoder/core/src/svc_enc_slice_segment.cpp

@@ -209,7 +209,7 @@

 // GOM based RC related for uiSliceNum decision, only used at SM_FIXEDSLCNUM_SLICE

-void GomValidCheckSliceNum (const int32_t kiMbWidth, const int32_t kiMbHeight, int32_t* pSliceNum) {

+void GomValidCheckSliceNum (const int32_t kiMbWidth, const int32_t kiMbHeight, uint32_t* pSliceNum) {

   const int32_t kiCountNumMb	= kiMbWidth * kiMbHeight;

   int32_t iSliceNum			= *pSliceNum;

   int32_t iGomSize;