Showing the changes to test/encoder/EncUT_EncoderExt.cpp (1 of 7 files). Show all
Unified · Split
| @@ -85,11 +85,11 @@ void EncoderInterfaceTest::PrepareOneSrcFrame() { · 84 unmodified lines | ||
| 85 | 85 | pSrcPic->iPicHeight = pParamExt->iPicHeight; |
| 86 | 86 | |
| 87 | 87 | pYUV[0] = rand() % 256; |
| 88 | − for (int i = 1; i < m_iPicResSize; i++){ | |
| 89 | − if((i%256) == 0) | |
| 88 | + for (int i = 1; i < m_iPicResSize; i++) { | |
| 89 | + if ((i % 256) == 0) | |
| 90 | 90 | pYUV[i] = rand() % 256; |
| 91 | 91 | else |
| 92 | − pYUV[i] = WELS_CLIP3(pYUV[i-1]+(rand()%3)-1,0,255); | |
| 92 | + pYUV[i] = WELS_CLIP3 (pYUV[i - 1] + (rand() % 3) - 1, 0, 255); | |
| 93 | 93 | } |
| 94 | 94 | pSrcPic->iStride[0] = m_iWidth; |
| 95 | 95 | pSrcPic->iStride[1] = pSrcPic->iStride[2] = pSrcPic->iStride[0] >> 1; |
| @@ -153,7 +153,7 @@ TEST_F (EncoderInterfaceTest, EncoderAdditionalOptionSetTest) { · 57 unmodified lines | ||
| 153 | 153 | iValue = rand() % 256; |
| 154 | 154 | iResult = pPtrEnc->SetOption (eOptionId, &iValue); |
| 155 | 155 | |
| 156 | − if (iValue ==0) | |
| 156 | + if (iValue == 0) | |
| 157 | 157 | EXPECT_EQ (iResult, static_cast<int> (cmInitParaError)); |
| 158 | 158 | else |
| 159 | 159 | EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); |
| @@ -186,9 +186,9 @@ TEST_F (EncoderInterfaceTest, EncoderAdditionalOptionSetTest) { · 26 unmodified lines | ||
| 186 | 186 | fValue = static_cast<int> (rand() % 60 - 5); |
| 187 | 187 | iResult = pPtrEnc->SetOption (eOptionId, &fValue); |
| 188 | 188 | |
| 189 | − if (fValue <=0) | |
| 189 | + if (fValue <= 0) | |
| 190 | 190 | EXPECT_EQ (iResult, static_cast<int> (cmInitParaError)); |
| 191 | − else{ | |
| 191 | + else { | |
| 192 | 192 | EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); |
| 193 | 193 | |
| 194 | 194 | iResult = pPtrEnc->GetOption (eOptionId, &fReturn); |
| @@ -201,15 +201,15 @@ TEST_F (EncoderInterfaceTest, EncoderAdditionalOptionSetTest) { · 6 unmodified lines | ||
| 201 | 201 | pSrcPic->uiTimeStamp += 30; |
| 202 | 202 | |
| 203 | 203 | eOptionId = ENCODER_OPTION_BITRATE; |
| 204 | − SBitrateInfo sInfo,sReturn; | |
| 204 | + SBitrateInfo sInfo, sReturn; | |
| 205 | 205 | sInfo.iBitrate = rand() % 100000 - 100; |
| 206 | − sInfo.iLayer = static_cast<LAYER_NUM>(pParamExt->iSpatialLayerNum); | |
| 206 | + sInfo.iLayer = static_cast<LAYER_NUM> (pParamExt->iSpatialLayerNum); | |
| 207 | 207 | iResult = pPtrEnc->SetOption (eOptionId, &sInfo); |
| 208 | − if (sInfo.iBitrate <=0) | |
| 208 | + if (sInfo.iBitrate <= 0) | |
| 209 | 209 | EXPECT_EQ (iResult, static_cast<int> (cmInitParaError)); |
| 210 | − else{ | |
| 210 | + else { | |
| 211 | 211 | EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); |
| 212 | − sReturn.iLayer = static_cast<LAYER_NUM>(pParamExt->iSpatialLayerNum); | |
| 212 | + sReturn.iLayer = static_cast<LAYER_NUM> (pParamExt->iSpatialLayerNum); | |
| 213 | 213 | iResult = pPtrEnc->GetOption (eOptionId, &sReturn); |
| 214 | 214 | EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); |
| 215 | 215 | EXPECT_EQ (WELS_CLIP3 (sInfo.iBitrate, 1, 2147483647), sReturn.iBitrate); |
| @@ -221,13 +221,13 @@ TEST_F (EncoderInterfaceTest, EncoderAdditionalOptionSetTest) { · 5 unmodified lines | ||
| 221 | 221 | |
| 222 | 222 | eOptionId = ENCODER_OPTION_MAX_BITRATE; |
| 223 | 223 | sInfo.iBitrate = rand() % 100000 - 100; |
| 224 | − sInfo.iLayer = static_cast<LAYER_NUM>(pParamExt->iSpatialLayerNum); | |
| 224 | + sInfo.iLayer = static_cast<LAYER_NUM> (pParamExt->iSpatialLayerNum); | |
| 225 | 225 | iResult = pPtrEnc->SetOption (eOptionId, &sInfo); |
| 226 | − if (sInfo.iBitrate <=0) | |
| 226 | + if (sInfo.iBitrate <= 0) | |
| 227 | 227 | EXPECT_EQ (iResult, static_cast<int> (cmInitParaError)); |
| 228 | − else{ | |
| 228 | + else { | |
| 229 | 229 | EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); |
| 230 | − sReturn.iLayer = static_cast<LAYER_NUM>(pParamExt->iSpatialLayerNum); | |
| 230 | + sReturn.iLayer = static_cast<LAYER_NUM> (pParamExt->iSpatialLayerNum); | |
| 231 | 231 | iResult = pPtrEnc->GetOption (eOptionId, &sReturn); |
| 232 | 232 | EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); |
| 233 | 233 | EXPECT_EQ (WELS_CLIP3 (sInfo.iBitrate, 1, 2147483647), sReturn.iBitrate); |
| @@ -261,8 +261,8 @@ TEST_F (EncoderInterfaceTest, TemporalLayerSettingTest) { · 27 unmodified lines | ||
| 261 | 261 | pParamExt->iTemporalLayerNum = 1; |
| 262 | 262 | pParamExt->iSpatialLayerNum = 1; |
| 263 | 263 | |
| 264 | − for(int i = 0; i < 2; i++){ | |
| 265 | − pParamExt->iUsageType = (( i == 0 ) ? SCREEN_CONTENT_REAL_TIME : CAMERA_VIDEO_REAL_TIME); | |
| 264 | + for (int i = 0; i < 2; i++) { | |
| 265 | + pParamExt->iUsageType = ((i == 0) ? SCREEN_CONTENT_REAL_TIME : CAMERA_VIDEO_REAL_TIME); | |
| 266 | 266 | int iResult = pPtrEnc->InitializeExt (pParamExt); |
| 267 | 267 | EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); |
| 268 | 268 | |
| @@ -328,9 +328,9 @@ TEST_F (EncoderInterfaceTest, TemporalLayerSettingTest) { · 59 unmodified lines | ||
| 328 | 328 | ENCODER_OPTION eOptionId = ENCODER_OPTION_SVC_ENCODE_PARAM_EXT; |
| 329 | 329 | memcpy (pOption, pParamExt, sizeof (SEncParamExt)); |
| 330 | 330 | |
| 331 | − for(int i = 0; i < kiFrameNumber; i ++){ | |
| 332 | − if ((i%7) == 0){ | |
| 333 | − if (pOption->iTemporalLayerNum<4){ | |
| 331 | + for (int i = 0; i < kiFrameNumber; i ++) { | |
| 332 | + if ((i % 7) == 0) { | |
| 333 | + if (pOption->iTemporalLayerNum < 4) { | |
| 334 | 334 | pOption->iTemporalLayerNum++; |
| 335 | 335 | } else { |
| 336 | 336 | pOption->iTemporalLayerNum--; |
| @@ -371,7 +371,7 @@ TEST_F (EncoderInterfaceTest, MemoryCheckTest) { · 34 unmodified lines | ||
| 371 | 371 | pYUV = new unsigned char [m_iPicResSize]; |
| 372 | 372 | PrepareOneSrcFrame(); |
| 373 | 373 | |
| 374 | − for(int i = 0; i < kiFrameNumber; i ++){ | |
| 374 | + for (int i = 0; i < kiFrameNumber; i ++) { | |
| 375 | 375 | int iStartX = rand() % (m_iPicResSize >> 1); |
| 376 | 376 | int iEndX = (iStartX + (rand() % MEM_VARY_SIZE)) % m_iPicResSize; |
| 377 | 377 | for (int j = iStartX; j < iEndX; j++) |
| @@ -400,7 +400,7 @@ TEST_F (EncoderInterfaceTest, MemoryCheckTest) { · 22 unmodified lines | ||
| 400 | 400 | iResult = pPtrEnc->SetOption (eOptionId, pOption); |
| 401 | 401 | EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); |
| 402 | 402 | |
| 403 | − for(int i = 0; i < kiFrameNumber; i ++){ | |
| 403 | + for (int i = 0; i < kiFrameNumber; i ++) { | |
| 404 | 404 | int iStartX = rand() % (m_iPicResSize >> 1); |
| 405 | 405 | int iEndX = (iStartX + (rand() % MEM_VARY_SIZE)) % m_iPicResSize; |
| 406 | 406 | for (int j = iStartX; j < iEndX; j++) |
| @@ -415,7 +415,7 @@ TEST_F (EncoderInterfaceTest, MemoryCheckTest) { · 8 unmodified lines | ||
| 415 | 415 | iResult = pPtrEnc->SetOption (eOptionId, pOption); |
| 416 | 416 | EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); |
| 417 | 417 | |
| 418 | − for(int i = 0; i < kiFrameNumber; i ++){ | |
| 418 | + for (int i = 0; i < kiFrameNumber; i ++) { | |
| 419 | 419 | int iStartX = rand() % (m_iPicResSize >> 1); |
| 420 | 420 | int iEndX = (iStartX + (rand() % MEM_VARY_SIZE)) % m_iPicResSize; |
| 421 | 421 | for (int j = iStartX; j < iEndX; j++) |
| @@ -434,8 +434,8 @@ void GetValidEncParamBase (SEncParamBase* pEncParamBase) { · 12 unmodified lines | ||
| 434 | 434 | pEncParamBase->iUsageType = CAMERA_VIDEO_REAL_TIME; |
| 435 | 435 | pEncParamBase->iPicWidth = 2 + ((rand() % ((MAX_WIDTH >> 1) - 1)) << 1); |
| 436 | 436 | pEncParamBase->iPicHeight = 2 + ((rand() % ((MAX_HEIGHT >> 1) - 1)) << 1); |
| 437 | − pEncParamBase->iPicWidth = VALID_SIZE(pEncParamBase->iPicWidth); | |
| 438 | − pEncParamBase->iPicHeight = VALID_SIZE(pEncParamBase->iPicHeight); | |
| 437 | + pEncParamBase->iPicWidth = VALID_SIZE (pEncParamBase->iPicWidth); | |
| 438 | + pEncParamBase->iPicHeight = VALID_SIZE (pEncParamBase->iPicHeight); | |
| 439 | 439 | pEncParamBase->iTargetBitrate = rand() + 1; //!=0 |
| 440 | 440 | pEncParamBase->iRCMode = RC_BITRATE_MODE; //-1, 0, 1, 2 |
| 441 | 441 | pEncParamBase->fMaxFrameRate = rand() + 0.5f; //!=0 |