generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Remove accidental double semicolons
This commit is contained in:
sijchen 2015-02-02 18:15:02 +08:00
commit 5fdd01ec0c
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codec/console/enc/src/welsenc.cpp
View File

@ -707,7 +707,7 @@ int ProcessEncoding (ISVCEncoder* pPtrEnc, int argc, char** argv, bool bConfigFi
FILE* fpGolden = NULL; FILE* fpGolden = NULL;
#endif #endif
#if defined ( STICK_STREAM_SIZE ) #if defined ( STICK_STREAM_SIZE )
FILE* fTrackStream = fopen ("coding_size.stream", "wb");; FILE* fTrackStream = fopen ("coding_size.stream", "wb");
#endif #endif
SFilesSet fs; SFilesSet fs;
// for configuration file // for configuration file

2
codec/decoder/core/src/deblocking.cpp
View File

@ -633,7 +633,7 @@ void FilteringEdgeChromaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, in
} }
pFilter->iChromaQP[0] = pCurQp[0]; pFilter->iChromaQP[0] = pCurQp[0];
pFilter->iChromaQP[1] = pCurQp[1];; pFilter->iChromaQP[1] = pCurQp[1];
if (pFilter->iChromaQP[0] == pFilter->iChromaQP[1]) { if (pFilter->iChromaQP[0] == pFilter->iChromaQP[1]) {
GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP[0], pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha, GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP[0], pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
iBeta); iBeta);

2
codec/decoder/core/src/error_concealment.cpp
View File

@ -125,7 +125,7 @@ void DoErrorConSliceCopy (PWelsDecoderContext pCtx) {
if (pSrcPic != NULL) { if (pSrcPic != NULL) {
iSrcStride = pSrcPic->iLinesize[0]; iSrcStride = pSrcPic->iLinesize[0];
//Y component //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; pSrcData = pSrcPic->pData[0] + iMbY * 16 * iSrcStride + iMbX * 16;
pCtx->sCopyFunc.pCopyLumaFunc (pDstData, iDstStride, pSrcData, iSrcStride); pCtx->sCopyFunc.pCopyLumaFunc (pDstData, iDstStride, pSrcData, iSrcStride);
//U component //U component

2
codec/encoder/core/src/ratectl.cpp
View File

@ -564,7 +564,7 @@ void RcInitGomParameters (sWelsEncCtx* pEncCtx) {
const int32_t kiGlobalQp = pEncCtx->iGlobalQp; const int32_t kiGlobalQp = pEncCtx->iGlobalQp;
pWelsSvcRc->iAverageFrameQp = 0; pWelsSvcRc->iAverageFrameQp = 0;
pWelsSvcRc->iMinFrameQp = 51;; pWelsSvcRc->iMinFrameQp = 51;
pWelsSvcRc->iMaxFrameQp = 0; pWelsSvcRc->iMaxFrameQp = 0;
for (int32_t i = 0; i < kiSliceNum; ++i) { for (int32_t i = 0; i < kiSliceNum; ++i) {
pSOverRc->iComplexityIndexSlice = 0; pSOverRc->iComplexityIndexSlice = 0;

2
codec/processing/src/complexityanalysis/ComplexityAnalysis.cpp
View File

@ -322,7 +322,7 @@ EResult CComplexityAnalysisScreen::Process (int32_t nType, SPixMap* pSrc, SPixMa
} else if (!bScrollFlag || ((iScrollMvX == 0) && (iScrollMvY == 0))) { } else if (!bScrollFlag || ((iScrollMvX == 0) && (iScrollMvY == 0))) {
GomComplexityAnalysisInter (pSrc, pRef, 0); GomComplexityAnalysisInter (pSrc, pRef, 0);
} else { } else {
GomComplexityAnalysisInter (pSrc, pRef, 1);; GomComplexityAnalysisInter (pSrc, pRef, 1);
} }
return RET_SUCCESS; return RET_SUCCESS;

4
test/api/encode_decode_api_test.cpp
View File

@ -3023,7 +3023,7 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_SPS_PPS_LISTING3) {
TEST_F (EncodeDecodeTestAPI, SimulcastSVC) { TEST_F (EncodeDecodeTestAPI, SimulcastSVC) {
#define LAYER_NUM (4) #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 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); int iHeight = WelsClip3 ((((rand() % MAX_HEIGHT) >> 1) + 1) << 1, 1 << iSpatialLayerNum, MAX_HEIGHT);
float fFrameRate = rand() + 0.5f; float fFrameRate = rand() + 0.5f;
@ -3137,7 +3137,7 @@ TEST_F (EncodeDecodeTestAPI, SimulcastSVC) {
TEST_F (EncodeDecodeTestAPI, SimulcastAVC) { TEST_F (EncodeDecodeTestAPI, SimulcastAVC) {
//#define DEBUG_FILE_SAVE3 //#define DEBUG_FILE_SAVE3
#define LAYER_NUM (4) #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 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); int iHeight = WelsClip3 ((((rand() % MAX_HEIGHT) >> 1) + 1) << 1, 1 << iSpatialLayerNum, MAX_HEIGHT);
float fFrameRate = rand() + 0.5f; float fFrameRate = rand() + 0.5f;

4
test/decoder/DecUT_ParseSyntax.cpp
View File

@ -250,9 +250,9 @@ void DecoderParseSyntaxTest::TestScalingList() {
Init(); Init();
DecodeBs ("res/BA_MW_D.264"); DecodeBs ("res/BA_MW_D.264");
ASSERT_TRUE (m_pCtx->sSpsBuffer[0].bSeqScalingMatrixPresentFlag == false); 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); 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(); Uninit();
//Scalinglist value just written into sps and pps //Scalinglist value just written into sps and pps
Init(); Init();

2
test/encoder/EncUT_MotionEstimate.cpp
View File

@ -278,7 +278,7 @@ TEST_F (MotionEstimateRangeTest, TestWelsMotionCrossSearch) {
sMe.iCurMeBlockPixX = (iMbx << 4); sMe.iCurMeBlockPixX = (iMbx << 4);
sMe.iCurMeBlockPixY = (iMby << 4); sMe.iCurMeBlockPixY = (iMby << 4);
sMe.pRefMb = pRef + sMe.iCurMeBlockPixX + sMe.iCurMeBlockPixY * m_iWidthExt; 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.uiSadCost = sMe.uiSatdCost = kiMaxBlock16Sad;
sMe.pColoRefMb = sMe.pRefMb; sMe.pColoRefMb = sMe.pRefMb;
WelsMotionCrossSearch (&sFuncList, &sMe, &sSlice, m_iWidth, m_iWidthExt); WelsMotionCrossSearch (&sFuncList, &sMe, &sSlice, m_iWidth, m_iWidthExt);