shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #1787 from mstorsjo/remove-stray-semicolon

Remove accidental double semicolons

--- a/codec/console/enc/src/welsenc.cpp

+++ b/codec/console/enc/src/welsenc.cpp

@@ -707,7 +707,7 @@

   FILE* fpGolden = NULL;

 #endif

 #if defined ( STICK_STREAM_SIZE )

-  FILE* fTrackStream = fopen ("coding_size.stream", "wb");;

+  FILE* fTrackStream = fopen ("coding_size.stream", "wb");

 #endif

   SFilesSet fs;

   // for configuration file

--- a/codec/decoder/core/src/deblocking.cpp

+++ b/codec/decoder/core/src/deblocking.cpp

@@ -633,7 +633,7 @@

   }

   pFilter->iChromaQP[0]   = pCurQp[0];

-  pFilter->iChromaQP[1]   = pCurQp[1];;

+  pFilter->iChromaQP[1]   = pCurQp[1];

   if (pFilter->iChromaQP[0] == pFilter->iChromaQP[1]) {

     GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP[0], pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,

                             iBeta);

--- a/codec/decoder/core/src/error_concealment.cpp

+++ b/codec/decoder/core/src/error_concealment.cpp

@@ -125,7 +125,7 @@

         if (pSrcPic != NULL) {

           iSrcStride = pSrcPic->iLinesize[0];

           //Y component

-          pDstData = pDstPic->pData[0] + iMbY * 16 * iDstStride + iMbX * 16;;

+          pDstData = pDstPic->pData[0] + iMbY * 16 * iDstStride + iMbX * 16;

           pSrcData = pSrcPic->pData[0] + iMbY * 16 * iSrcStride + iMbX * 16;

           pCtx->sCopyFunc.pCopyLumaFunc (pDstData, iDstStride, pSrcData, iSrcStride);

           //U component

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

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

@@ -564,7 +564,7 @@

   const int32_t kiGlobalQp			= pEncCtx->iGlobalQp;

   pWelsSvcRc->iAverageFrameQp = 0;

-  pWelsSvcRc->iMinFrameQp = 51;;

+  pWelsSvcRc->iMinFrameQp = 51;

   pWelsSvcRc->iMaxFrameQp = 0;

   for (int32_t i = 0; i < kiSliceNum; ++i) {

     pSOverRc->iComplexityIndexSlice	= 0;

--- a/codec/processing/src/complexityanalysis/ComplexityAnalysis.cpp

+++ b/codec/processing/src/complexityanalysis/ComplexityAnalysis.cpp

@@ -322,7 +322,7 @@

   } else if (!bScrollFlag || ((iScrollMvX == 0) && (iScrollMvY == 0))) {

     GomComplexityAnalysisInter (pSrc, pRef, 0);

   } else {

-    GomComplexityAnalysisInter (pSrc, pRef, 1);;

+    GomComplexityAnalysisInter (pSrc, pRef, 1);

   }

   return RET_SUCCESS;

--- a/test/api/encode_decode_api_test.cpp

+++ b/test/api/encode_decode_api_test.cpp

@@ -3023,7 +3023,7 @@

 TEST_F (EncodeDecodeTestAPI, SimulcastSVC) {

 #define LAYER_NUM (4)

-  int iSpatialLayerNum = WelsClip3 ((rand() % LAYER_NUM), 2, LAYER_NUM);;

+  int iSpatialLayerNum = WelsClip3 ((rand() % LAYER_NUM), 2, LAYER_NUM);

   int iWidth       = WelsClip3 ((((rand() % MAX_WIDTH) >> 1)  + 1) << 1, 1 << iSpatialLayerNum, MAX_WIDTH);

   int iHeight      = WelsClip3 ((((rand() % MAX_HEIGHT) >> 1)  + 1) << 1, 1 << iSpatialLayerNum, MAX_HEIGHT);

   float fFrameRate = rand() + 0.5f;

@@ -3137,7 +3137,7 @@

 TEST_F (EncodeDecodeTestAPI, SimulcastAVC) {

 //#define DEBUG_FILE_SAVE3

 #define LAYER_NUM (4)

-  int iSpatialLayerNum = WelsClip3 ((rand() % LAYER_NUM), 2, LAYER_NUM);;

+  int iSpatialLayerNum = WelsClip3 ((rand() % LAYER_NUM), 2, LAYER_NUM);

   int iWidth       = WelsClip3 ((((rand() % MAX_WIDTH) >> 1)  + 1) << 1, 1 << iSpatialLayerNum, MAX_WIDTH);

   int iHeight      = WelsClip3 ((((rand() % MAX_HEIGHT) >> 1)  + 1) << 1, 1 << iSpatialLayerNum, MAX_HEIGHT);

   float fFrameRate = rand() + 0.5f;

--- a/test/decoder/DecUT_ParseSyntax.cpp

+++ b/test/decoder/DecUT_ParseSyntax.cpp

@@ -250,9 +250,9 @@

   Init();

   DecodeBs ("res/BA_MW_D.264");

   ASSERT_TRUE (m_pCtx->sSpsBuffer[0].bSeqScalingMatrixPresentFlag == false);

-  EXPECT_EQ (0, memcmp (iScalingListPPS, m_pCtx->sSpsBuffer[0].iScalingList4x4, 6 * 16 * sizeof (uint8_t)));;

+  EXPECT_EQ (0, memcmp (iScalingListPPS, m_pCtx->sSpsBuffer[0].iScalingList4x4, 6 * 16 * sizeof (uint8_t)));

   ASSERT_TRUE (m_pCtx->sPpsBuffer[0].bPicScalingMatrixPresentFlag == false);

-  EXPECT_EQ (0, memcmp (iScalingListPPS, m_pCtx->sPpsBuffer[0].iScalingList4x4, 6 * 16 * sizeof (uint8_t)));;

+  EXPECT_EQ (0, memcmp (iScalingListPPS, m_pCtx->sPpsBuffer[0].iScalingList4x4, 6 * 16 * sizeof (uint8_t)));

   Uninit();

   //Scalinglist value just written into sps and pps

   Init();

--- a/test/encoder/EncUT_MotionEstimate.cpp

+++ b/test/encoder/EncUT_MotionEstimate.cpp

@@ -278,7 +278,7 @@

       sMe.iCurMeBlockPixX = (iMbx << 4);

       sMe.iCurMeBlockPixY = (iMby << 4);

       sMe.pRefMb = pRef + sMe.iCurMeBlockPixX + sMe.iCurMeBlockPixY * m_iWidthExt;

-      sMe.pEncMb = m_pSrc + sMe.iCurMeBlockPixX + sMe.iCurMeBlockPixY * m_iWidth;;

+      sMe.pEncMb = m_pSrc + sMe.iCurMeBlockPixX + sMe.iCurMeBlockPixY * m_iWidth;

       sMe.uiSadCost = sMe.uiSatdCost = kiMaxBlock16Sad;

       sMe.pColoRefMb = sMe.pRefMb;

       WelsMotionCrossSearch (&sFuncList, &sMe, &sSlice, m_iWidth, m_iWidthExt);