Showing the changes to test/encoder/EncUT_EncoderExt.cpp (1 of 2 files). Show all
Unified · Split
| @@ -195,7 +195,7 @@ TEST_F (EncoderInterfaceTest, EncoderOptionSetTest) { · 194 unmodified lines | |||
| 195 | pSrcPic->uiTimeStamp += 30; | 195 | pSrcPic->uiTimeStamp += 30; |
| 196 | 196 | ||
| 197 | eOptionId = ENCODER_OPTION_FRAME_RATE; | 197 | eOptionId = ENCODER_OPTION_FRAME_RATE; |
| 198 | fValue = static_cast<float> (rand() % 60 - 5); | 198 | fValue = static_cast<float> (rand() % 100 - 5); |
| 199 | iResult = pPtrEnc->SetOption (eOptionId, &fValue); | 199 | iResult = pPtrEnc->SetOption (eOptionId, &fValue); |
| 200 | 200 | ||
| 201 | if (fValue <= 0) | 201 | if (fValue <= 0) |
| @@ -205,7 +205,7 @@ TEST_F (EncoderInterfaceTest, EncoderOptionSetTest) { · 3 unmodified lines | |||
| 205 | 205 | ||
| 206 | iResult = pPtrEnc->GetOption (eOptionId, &fReturn); | 206 | iResult = pPtrEnc->GetOption (eOptionId, &fReturn); |
| 207 | EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); | 207 | EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); |
| 208 | EXPECT_EQ (WELS_CLIP3 (fValue, 1, 30), fReturn); | 208 | EXPECT_EQ (WELS_CLIP3 (fValue, 1, 60), fReturn); |
| 209 | } | 209 | } |
| 210 | PrepareOneSrcFrame(); | 210 | PrepareOneSrcFrame(); |
| 211 | iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi); | 211 | iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi); |
| @@ -599,21 +599,21 @@ TEST_F (EncoderInterfaceTest, BasicInitializeTestAutoAdjustment) { · 387 unmodified lines | |||
| 599 | GetValidEncParamBase (&sEncParamBase); | 599 | GetValidEncParamBase (&sEncParamBase); |
| 600 | sEncParamBase.fMaxFrameRate = 50000; | 600 | sEncParamBase.fMaxFrameRate = 50000; |
| 601 | EncodeOneFrame (&sEncParamBase); | 601 | EncodeOneFrame (&sEncParamBase); |
| 602 | EXPECT_LE (sEncParamBase.fMaxFrameRate, 30.0); | 602 | EXPECT_LE (sEncParamBase.fMaxFrameRate, 60.0); |
| 603 | EXPECT_GE (sEncParamBase.fMaxFrameRate, 1.0); | 603 | EXPECT_GE (sEncParamBase.fMaxFrameRate, 1.0); |
| 604 | 604 | ||
| 605 | // fMaxFrameRate = 0 | 605 | // fMaxFrameRate = 0 |
| 606 | GetValidEncParamBase (&sEncParamBase); | 606 | GetValidEncParamBase (&sEncParamBase); |
| 607 | sEncParamBase.fMaxFrameRate = 0; | 607 | sEncParamBase.fMaxFrameRate = 0; |
| 608 | EncodeOneFrame (&sEncParamBase); | 608 | EncodeOneFrame (&sEncParamBase); |
| 609 | EXPECT_LE (sEncParamBase.fMaxFrameRate, 30.0); | 609 | EXPECT_LE (sEncParamBase.fMaxFrameRate, 60.0); |
| 610 | EXPECT_GE (sEncParamBase.fMaxFrameRate, 1.0); | 610 | EXPECT_GE (sEncParamBase.fMaxFrameRate, 1.0); |
| 611 | 611 | ||
| 612 | // fMaxFrameRate = -1 | 612 | // fMaxFrameRate = -1 |
| 613 | GetValidEncParamBase (&sEncParamBase); | 613 | GetValidEncParamBase (&sEncParamBase); |
| 614 | sEncParamBase.fMaxFrameRate = -1; | 614 | sEncParamBase.fMaxFrameRate = -1; |
| 615 | EncodeOneFrame (&sEncParamBase); | 615 | EncodeOneFrame (&sEncParamBase); |
| 616 | EXPECT_LE (sEncParamBase.fMaxFrameRate, 30.0); | 616 | EXPECT_LE (sEncParamBase.fMaxFrameRate, 60.0); |
| 617 | EXPECT_GE (sEncParamBase.fMaxFrameRate, 1.0); | 617 | EXPECT_GE (sEncParamBase.fMaxFrameRate, 1.0); |
| 618 | } | 618 | } |
| 619 | 619 | ||